metamri 0.2.19 → 0.2.20

Sign up to get free protection for your applications and to get access to all the features.
Files changed (41) hide show
  1. checksums.yaml +8 -8
  2. data/.gitignore +0 -0
  3. data/.rspec +0 -0
  4. data/Gemfile +0 -0
  5. data/Manifest +0 -0
  6. data/README.rdoc +0 -0
  7. data/Rakefile +0 -0
  8. data/VERSION +0 -0
  9. data/bin/convert_visit.rb +1 -1
  10. data/lib/metamri/core_additions.rb +0 -0
  11. data/lib/metamri/dicom_additions.rb +0 -0
  12. data/lib/metamri/image_dataset_quality_check_resource.rb +0 -0
  13. data/lib/metamri/mysql_tools.rb +0 -0
  14. data/lib/metamri/nifti_builder.rb +0 -0
  15. data/lib/metamri/raw_image_dataset.rb +0 -0
  16. data/lib/metamri/raw_image_dataset_resource.rb +0 -0
  17. data/lib/metamri/raw_image_dataset_thumbnail.rb +0 -0
  18. data/lib/metamri/raw_image_file.rb +1 -1
  19. data/lib/metamri/series_description_parameters.rb +0 -0
  20. data/lib/metamri/version.rb +1 -1
  21. data/lib/metamri/visit_raw_data_directory.rb +11 -1
  22. data/lib/metamri/visit_raw_data_directory_resource.rb +0 -0
  23. data/lib/metamri.rb +0 -0
  24. data/metamri.gemspec +0 -0
  25. data/spec/helper_spec.rb +0 -0
  26. data/spec/unit/dicom_additions_spec.rb +0 -0
  27. data/spec/unit/nifti_builder_spec.rb +0 -0
  28. data/spec/unit/raw_image_dataset_spec.rb +0 -0
  29. data/spec/unit/raw_image_dataset_thumbnail_spec.rb +0 -0
  30. data/spec/unit/raw_image_file_spec.rb +0 -0
  31. data/test/fixtures/respiratory_fixtures.yaml +0 -0
  32. data/test/fixtures/s03_bravo.0156 +0 -0
  33. data/test/fixtures/s03_bravo.0156.yml +0 -0
  34. data/test/fixtures/thumbnail.png +0 -0
  35. data/test/fixtures/thumbnail_slicer.png +0 -0
  36. data/test/raw_image_dataset_test.rb +0 -0
  37. data/test/raw_image_file_test.rb +0 -0
  38. data/test/test_helper.rb +0 -0
  39. data/test/visit_duplication_test.rb +0 -0
  40. data/test/visit_test.rb +0 -0
  41. metadata +2 -2
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NjllMzg5ODliMWYyNTJkMjM1MTZlOWVmNmMyZjEwMmZkZWVjYzFjNw==
4
+ OGU4N2IwMGY5MThkODRlYTQ5NzExNjg0NTk3ZmY3MzJiZGJhNzFlYQ==
5
5
  data.tar.gz: !binary |-
6
- YmViNjY1NDc5MzZjZDZlOWRhYjE1YjA2N2FlN2MyZDMwMDQyOWZjNQ==
6
+ ZWI3ODNlZjhjYjRlMTQxZDYxMTAxMzY4Y2NmYTNmN2Y0ZDZiNGM3Mg==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MzdmYjBmM2Q2NDBkOTMyNTdjZTA0MGRhNjU2MWNiYWY0NTk3NGNmYTM5ZTkw
10
- NzYyNzFkMTE5MDI1MDJhYTJiNDI5MTgxZDZhOTBmNTkxYzg1YTkwYmYyYjIw
11
- M2IxZjYyNDc3ZDM4NzYxMTFiOGU0ZmIxMjk0ZjRjMzk3NzYxOTU=
9
+ NDUwOWJhOGVhODIyYjE3MmVhOTRhNDI4Y2ViMWFiOWIzYzM5YzFjZTc3M2Vk
10
+ NGIxY2FiZjM5NmMwMjE3NDQwY2U4Mzc2ZWMzOWZiNTk1ZDBhOTE3MGQ2YWNi
11
+ NmJiN2I2Mzc0OGQxMTQ2YmJlOTk5YzA0MTUwMjRkYWQ0ZTEyNzc=
12
12
  data.tar.gz: !binary |-
13
- NzU3NTk0YTZmNTFhN2VlZmQ3N2JiYTkwZmE1ZWQxNTM0NzlmMmY1OWEzY2Fl
14
- MDViMDQzN2I3ZDg5NzFkNWVjMTM5MDQ1ZjBhZDUyOTdhYWFjOGRkOTIyZjcz
15
- ZmRhOTJhZGI5MDc3M2NlNzhlZThjOTFkNDA5NTEwNzYxOGE4MWE=
13
+ NWU4NTljYmE0MDE4MDQzNGM1ZGQ0MmE1YjM2YTBiY2Q4N2ZhZmI4ODIwOGE3
14
+ MjRkZWZjNGVjYjRjNzRiNGZlODkwYjBkNTI0ZjRlMmNhNDM2N2MxZWVlMzdl
15
+ YTMyM2I0MTczYWM1MTE1MWM1NjNmMzgwNWRhMTg3NzZkODFhZTY=
data/.gitignore CHANGED
File without changes
data/.rspec CHANGED
File without changes
data/Gemfile CHANGED
File without changes
data/Manifest CHANGED
File without changes
data/README.rdoc CHANGED
File without changes
data/Rakefile CHANGED
File without changes
data/VERSION CHANGED
File without changes
data/bin/convert_visit.rb CHANGED
@@ -42,7 +42,7 @@ def convert_visit(raw_directory, scan_procedure_codename, output_directory = nil
42
42
  output_directory = output_directory ||= v.default_preprocess_directory
43
43
 
44
44
  begin
45
- default_options = {:ignore_patterns => [/vipr/,/$Processed-Images$/,/900$/,/901$/,/999$/]} # seems to like number , not like string
45
+ default_options = {:ignore_patterns => [/vipr/,/pfiles/,/raw/,/$Processed-Images$/,/900$/,/901$/,/999$/]} # seems to like number , not like string
46
46
  #options = default_options.merge(options)
47
47
  v.scan(default_options)
48
48
  v.to_nifti!(output_directory)
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
@@ -119,7 +119,7 @@ class RawImageFile
119
119
  # puts e.backtrace
120
120
  raise e, "Could not find required DICOM Header Meta Element: #{e}"
121
121
  rescue StandardError => e
122
- raise e, "Header import failed for file #{@filename}. #{e}"
122
+ raise e, "Header import failed for file #{@filename}. #{e} . Has the scanner software version changed? A new version of the p-file reading software (printraw or rdgehdr) might be needed. "
123
123
  end
124
124
 
125
125
  # deallocate the header data to save memory space.
File without changes
@@ -1,3 +1,3 @@
1
1
  module Metamri
2
- VERSION = "0.2.19"
2
+ VERSION = "0.2.20"
3
3
  end
@@ -188,7 +188,17 @@ Returns an array of the created nifti files.
188
188
 
189
189
  @datasets.each do |dataset|
190
190
  nifti_output_path = output_directory
191
- nifti_filename = "#{scanid}_#{dataset.series_description.escape_filename}_#{File.basename(dataset.directory).escape_filename}.nii"
191
+ v_basename =File.basename(dataset.directory).gsub(/-/,"").gsub(/_/,"").gsub(/\:/,"").gsub(/\//,"")
192
+ v_series_description = "."+dataset.series_description.gsub(/ /,"").gsub(/-/,"").gsub(/_/,"").gsub(/\:/,"").gsub(/\//,"")
193
+ if v_basename.include? v_series_description
194
+ # want the scan series number - e.g. 00001 at the end
195
+ v_tmp_filename = v_basename.gsub(v_series_description,"")
196
+ nifti_filename = "#{scanid}_#{dataset.series_description.escape_filename}_#{v_tmp_filename}.nii"
197
+ else
198
+ nifti_filename = "#{scanid}_#{dataset.series_description.escape_filename}_#{File.basename(dataset.directory).escape_filename}.nii"
199
+ end
200
+
201
+ #nifti_filename = "#{scanid}_#{dataset.series_description.escape_filename}_#{File.basename(dataset.directory).escape_filename}.nii"
192
202
 
193
203
  Pathname.new(dataset.directory).all_dicoms do |dicom_files|
194
204
  nifti_input_path = File.dirname(dicom_files.first)
File without changes
data/lib/metamri.rb CHANGED
File without changes
data/metamri.gemspec CHANGED
File without changes
data/spec/helper_spec.rb CHANGED
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
File without changes
data/test/test_helper.rb CHANGED
File without changes
File without changes
data/test/visit_test.rb CHANGED
File without changes
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metamri
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.19
4
+ version: 0.2.20
5
5
  platform: ruby
6
6
  authors:
7
7
  - Kristopher J. Kosmatka
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-11-04 00:00:00.000000000 Z
12
+ date: 2014-04-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: dicom