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.

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

Changes up to divest v0.8.1 #298

Merged
merged 3 commits into from
May 8, 2019

Conversation

jonclayden
Copy link
Collaborator

This PR remerges the divest codebase with the main one. It mostly adds divest-specific implementation details, but also makes some compatibility fixes and avoids calling exit(), which will quit R.

tinydir_dir dir;
int count = 0;
if (tinydir_open_sorted(&dir, path) != 0)
return -1;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It may be worth adopting this tinydir call in the mainline implementation. I have seen infinite recursion when relying on dir.has_next, because the body of the loop itself creates new files.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Added to development (rather than master) branch. Will evaluate dir.has_next for mainline.

@neurolabusc neurolabusc changed the base branch from master to development May 8, 2019 04:24
@neurolabusc neurolabusc merged commit 48e68f5 into rordenlab:development May 8, 2019
neurolabusc added a commit that referenced this pull request May 17, 2019
yarikoptic added a commit to neurodebian/dcm2niix that referenced this pull request May 6, 2020
* tag 'v1.0.20190720':
  Update dcm_qa submodule.
  Handle rare VRs (https://www.aliza-dicom-viewer.com/download/datasets)
  New default merge option "-m o" will merge CTs and segment MRIs (https://discourse.slicer.org/t/odd-dicom-import/7576)
  --progress option (rordenlab#314; rordenlab#312)
  Tune verbosity (rordenlab#312)
  GE Slice Timing From Protocol Data Block (rordenlab#311)
  Desparate guess of GE slice times from ProtocolDataBlock (clone dicm2nii, assumes TA close to TR)
  Support interleaved (rordenlab#309)
  Slice times from ucMode (rordenlab#309)
  GE number of slice discrepancy (rordenlab#306)
  Simplify slice timing code, develop stc validation (https://github.com/neurolabusc/dcm_qa_stc)
  hdr.vox_offset is a float not integer (https://www.nitrc.org/forum/message.php?msg_id=27155)
  BIDS tags for PASL fairest sequent
  Read 0019,1029 (rordenlab#296)
  Generate warning rather than error when palette colors are detected (UNFmontreal/Dcm2Bids#54)
  Update tinydir call (rordenlab#298)
  Bruker 4D datasets: correct slice ordering
  Bruker 4D datasets: Fix parametric maps grouping
  Changes up to divest v0.8.1
  Support isotropic scans for NRRD
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.

2 participants