Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] BOLD reports clipped IQMs after spikes_num #425

Merged
merged 2 commits into from Mar 14, 2017
Merged

[FIX] BOLD reports clipped IQMs after spikes_num #425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2d72d8
[FIX] BOLD reports clipped IQMs after spikes_num
oesteban Mar 14, 2017
dab114d
update CHANGES, version bump
oesteban Mar 14, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions CHANGES.txt
View file
Open in desktop
@@ -1,6 +1,8 @@
Release 1.0.0
=============
Release 0.9.0-1
===============

* [FIX] BOLD reports clipped IQMs after spikes_num (#425)
* [FIX] Unicode error writing group reports (#424)
* [FIX] Respect Nifi header in fMRI conform node (#415)
* [DOC] Deep revision of documentation (#411, #416)
* [ENH] Added sphinx extension to plot workflow graphs (#411)
Expand All @@ -16,15 +18,10 @@ Release 1.0.0
* [ENH] Re-enable 3dvolreg (#390)
* [ENH] Add T1w classifier (#389)

Release 0.9.0-1
Release 0.9.0-0
===============

* [FIX] Remove non-repeatable step from pipeline (#369)


Release 0.9.0
=============

* [ENH] Improve group level command line, with more informative output when no IQMs are found for a modality (#372)
* [ENH] Make group reports self-contained (#333)
* [FIX] New mosaics, based on old ones (#361, #360, #334)
Expand Down
2 changes: 1 addition & 1 deletion mriqc/info.py
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@
"""

__versionbase__ = '0.9.0'
__versionrev__ = '-0'
__versionrev__ = '-1'
__version__ = __versionbase__ + __versionrev__
__author__ = 'Oscar Esteban'
__email__ = 'code@oscaresteban.es'
Expand Down
22 changes: 12 additions & 10 deletions mriqc/reports/group.py
View file
Open in desktop
Expand Up @@ -131,21 +131,23 @@ def gen_html(csv_file, mod, csv_failed=None, out_file=None):
failed = failed_df[cols].apply(myfmt, args=(cols,), axis=1).ravel().tolist()

csv_groups = []
datacols = dataframe.columns.ravel().tolist()
for group, units in QCGROUPS[mod]:
dfdict = {'iqm': [], 'value': [], 'label': [], 'units': []}

for iqm in group:
if iqm in dataframe.columns.ravel().tolist():
if iqm in datacols:
values = dataframe[[iqm]].values.ravel().tolist()
dfdict['iqm'] += [iqm] * nPart
dfdict['units'] += [units] * nPart
dfdict['value'] += values
dfdict['label'] += dataframe[['label']].values.ravel().tolist()

csv_df = pd.DataFrame(dfdict)
csv_str = TextIO()
csv_df[['iqm', 'value', 'label', 'units']].to_csv(csv_str, index=False)
csv_groups.append(csv_str.getvalue())
if values:
dfdict['iqm'] += [iqm] * nPart
dfdict['units'] += [units] * nPart
dfdict['value'] += values
dfdict['label'] += dataframe[['label']].values.ravel().tolist()

csv_df = pd.DataFrame(dfdict)
csv_str = TextIO()
csv_df[['iqm', 'value', 'label', 'units']].to_csv(csv_str, index=False)
csv_groups.append(csv_str.getvalue())

if out_file is None:
out_file = op.abspath('group.html')
Expand Down