Skip to content

[ENH] Add 3dNotes in AFNI #1637

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.

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

Merged
merged 11 commits into from
Oct 5, 2016
Merged

[ENH] Add 3dNotes in AFNI #1637

merged 11 commits into from
Oct 5, 2016

Conversation

tsalo
Copy link
Member

@tsalo tsalo commented Sep 15, 2016

No description provided.

1. Add 3dNotes to preprocess. It probably belongs in a utils file.
2. Fix typos in QualityIndexOutputSpec and AutoboxOutputSpec.
3. Remove a couple of extra empty lines.
@codecov-io
Copy link

codecov-io commented Sep 15, 2016

Current coverage is 70.89% (diff: 84.84%)

Merging #1637 into master will decrease coverage by <.01%

@@             master      #1637   diff @@
==========================================
  Files          1027       1025     -2   
  Lines         51574      51562    -12   
  Methods           0          0          
  Messages          0          0          
  Branches       7309       7301     -8   
==========================================
- Hits          36564      36553    -11   
- Misses        13917      13918     +1   
+ Partials       1093       1091     -2   

Powered by Codecov. Last update 5427538...54364ec

@oesteban
Copy link
Contributor

I think you need to run make specs.

Also, you probably need to add the test file with touch nipype/testing/data/functional.HEAD and add it to the repo.

mandatory=True,
exists=True,
copyfile=False)
add = traits.Str(desc="note to add",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please, do not use Str from traits:

  1. Add import of Str from nipype.interfaces.base:
    from ..base import (..., Str)
  2. Define these inputs with the imported name:
add = Str(desc...)

>>> notes.inputs.add = "This note is added."
>>> notes.inputs.add_history = "This note is added to history."
>>> notes.cmdline #doctest: +IGNORE_UNICODE
"3dNotes -a 'This note is added.' -h 'This note is added to history.' functional.HEAD"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Result of the interface is not exactly the same, replace by:

'3dNotes -a "This note is added." -h "This note is added to history." functional.HEAD'

@@ -0,0 +1,2 @@
0.000000 10.000000 1.000000
Copy link
Contributor

@oesteban oesteban Sep 16, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file modified on purpose? Will this modification cause any side effect?

0.00495632 -0.00122923 -0.00356384 -0.336943 0.338448 -0.465876
0.00498272 -0.0012813 -0.00356384 -0.319189 0.338466 -0.465136
0.00548257 -0.00133825 -0.00385146 -0.335071 0.296729 -0.468606
-0.00848102 0.00369798 0.003424 0.31043 -0.751705 0.619666
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this file is modified?

0.048314
0.0224355
0.10331
0.0922165
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this file is modified?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These files were modified when I ran make check-before-commit. Since they were automatically generated by the tool, I assumed it served a purpose, but I can't be sure.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, let me fix that in current master. That way we keep your PR clean

Also re-run make check-before-commit, which overwrote the old 3dNotes
test.
@tsalo
Copy link
Member Author

tsalo commented Sep 30, 2016

Is there anything else I need to do? Also, is Str preferred over traits.Str for all inputs?

@oesteban
Copy link
Contributor

oesteban commented Oct 4, 2016

Hi @tsalo, it's been impossible for me to come back to you before. I updated master so your PR would be clean of unrelated changes from check-before-commit. Sorry for this inconvenience, master in nipype is usually pretty active and lately it's been through a bit bumpy road.

May you please merge with current master? Thanks very much.

@oesteban oesteban merged commit 54364ec into nipy:master Oct 5, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants