dcm_dict 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cc7004aaefe37575195ced6b44348d9947b7203
-  data.tar.gz: d5872f31f97eb5e7647c20b6cbf1dd64f6148cc3
+  metadata.gz: c197612bc95293d1a8b295442d9c3f8a7bd3816c
+  data.tar.gz: c575c6b68dc080e69e5d80142e51eb6af89e0990
 SHA512:
-  metadata.gz: 1994d7e38268dff279c6c7afe861431870168baf38849e97c3b54ad079b3ea9a88fd2ff4ddd696bd8235c51f9ef6dc2ea151b66e1a0deef6e3badd1814693829
-  data.tar.gz: bb48c78cd51e71f0f5e2b6bdc5618ac04da727d6bc1c85b26104704a72a7db66824ad3f082681d55586f6595b202520db4c7281f0e74e2b8bd79027f6bc869ac
+  metadata.gz: 62cce09ceba1eaa13122be316be380daf614385a0fbc45f9bfcf0a8eafd82a4f3de21c9b7d44c71f91adbded61a4c8023fdf5f967722694fe2e357dbcd7a09b0
+  data.tar.gz: 2b00ea365f83fd299da80e2f4d891bae7208396ad4dac56e3c2496d58b11e1a515be0bd4260b6448b5096c2cf555ce8b4e2b2ad3205f17c5ea547a1e552e88a9

data/CHANGELOG

@@ -1,3 +1,6 @@
+- v0.4.0
+Update to 2015a Base Standard
+
 - v0.3.0
 Update to 2014c Base Standard
 

data/README.md

@@ -267,7 +267,7 @@ Note: the script use the [Nokogiri][3] as XML parser if installed as gem, otherw
 Check the file for other details.
 
 ## Note
-Current library version is aligned to *DICOM Base Standard **2014c***
+Current library version is aligned to *DICOM Base Standard **2015a***
 
 ## Install
 

data/bin/dcm_dict_converter.rb

@@ -54,8 +54,8 @@ LICENSE_TEXT=<<END_LICENSE
 END_LICENSE
 
 class DcmDictConverter
-  Part6XmlUrl="http://dicom.nema.org/medical/dicom/current/source/docbook/part06/part06.xml"
-  Part7XmlUrl="http://dicom.nema.org/medical/dicom/current/source/docbook/part07/part07.xml"
+  Part6XmlUrl="ftp://medical.nema.org/medical/dicom/current/source/docbook/part06/part06.xml"
+  Part7XmlUrl="ftp://medical.nema.org/medical/dicom/current/source/docbook/part07/part07.xml"
   DataElementSource={
     Part7XmlUrl => ["table_E.1-1", "table_E.2-1"],
     Part6XmlUrl => ["table_7-1", "table_8-1", "table_6-1"]

data/lib/dcm_dict/source_data/data_elements_data.rb

@@ -196,6 +196,10 @@ HIGH = 0001H'},
       { tag_ps: '(0008,0115)', tag_name: "Coding Scheme Name", tag_key: 'CodingSchemeName', tag_vr: [:ST], tag_vm: ["1"], tag_str: '(0008,0115)', tag_sym: :coding_scheme_name, tag_ndm: '00080115', tag_ary: [0x0008,0x0115], tag_multiple: false, tag_note: ''},
       { tag_ps: '(0008,0116)', tag_name: "Coding Scheme Responsible Organization", tag_key: 'CodingSchemeResponsibleOrganization', tag_vr: [:ST], tag_vm: ["1"], tag_str: '(0008,0116)', tag_sym: :coding_scheme_responsible_organization, tag_ndm: '00080116', tag_ary: [0x0008,0x0116], tag_multiple: false, tag_note: ''},
       { tag_ps: '(0008,0117)', tag_name: "Context UID", tag_key: 'ContextUID', tag_vr: [:UI], tag_vm: ["1"], tag_str: '(0008,0117)', tag_sym: :context_uid, tag_ndm: '00080117', tag_ary: [0x0008,0x0117], tag_multiple: false, tag_note: ''},
+      { tag_ps: '(0008,0118)', tag_name: "Mapping Resource UID", tag_key: 'MappingResourceUID', tag_vr: [:UI], tag_vm: ["1"], tag_str: '(0008,0118)', tag_sym: :mapping_resource_uid, tag_ndm: '00080118', tag_ary: [0x0008,0x0118], tag_multiple: false, tag_note: ''},
+      { tag_ps: '(0008,0119)', tag_name: "Long Code Value", tag_key: 'LongCodeValue', tag_vr: [:UC], tag_vm: ["1"], tag_str: '(0008,0119)', tag_sym: :long_code_value, tag_ndm: '00080119', tag_ary: [0x0008,0x0119], tag_multiple: false, tag_note: ''},
+      { tag_ps: '(0008,0120)', tag_name: "URN Code Value", tag_key: 'URNCodeValue', tag_vr: [:UR], tag_vm: ["1"], tag_str: '(0008,0120)', tag_sym: :urn_code_value, tag_ndm: '00080120', tag_ary: [0x0008,0x0120], tag_multiple: false, tag_note: ''},
+      { tag_ps: '(0008,0121)', tag_name: "Equivalent Code Sequence", tag_key: 'EquivalentCodeSequence', tag_vr: [:SQ], tag_vm: ["1"], tag_str: '(0008,0121)', tag_sym: :equivalent_code_sequence, tag_ndm: '00080121', tag_ary: [0x0008,0x0121], tag_multiple: false, tag_note: ''},
       { tag_ps: '(0008,0201)', tag_name: "Timezone Offset From UTC", tag_key: 'TimezoneOffsetFromUTC', tag_vr: [:SH], tag_vm: ["1"], tag_str: '(0008,0201)', tag_sym: :timezone_offset_from_utc, tag_ndm: '00080201', tag_ary: [0x0008,0x0201], tag_multiple: false, tag_note: ''},
       { tag_ps: '(0008,1000)', tag_name: "Network ID", tag_key: 'NetworkID', tag_vr: [:AE], tag_vm: ["1"], tag_str: '(0008,1000)', tag_sym: :network_id, tag_ndm: '00081000', tag_ary: [0x0008,0x1000], tag_multiple: false, tag_note: 'RET'},
       { tag_ps: '(0008,1010)', tag_name: "Station Name", tag_key: 'StationName', tag_vr: [:SH], tag_vm: ["1"], tag_str: '(0008,1010)', tag_sym: :station_name, tag_ndm: '00081010', tag_ary: [0x0008,0x1010], tag_multiple: false, tag_note: ''},

data/lib/dcm_dict/source_data/uid_values_data.rb

@@ -339,6 +339,7 @@ module DcmDict
       { uid_value: '1.2.840.10008.5.1.4.45.4', uid_name: "Implant Template Group Information Model - GET", uid_type: :sop_class},
       { uid_value: '1.2.840.10008.7.1.1', uid_name: "Native DICOM Model", uid_type: :application_hosting_model},
       { uid_value: '1.2.840.10008.7.1.2', uid_name: "Abstract Multi-Dimensional Image Model", uid_type: :application_hosting_model},
+      { uid_value: '1.2.840.10008.8.1.1', uid_name: "DICOM Content Mapping Resource", uid_type: :mapping_resource},
       { uid_value: '1.2.840.10008.15.0.3.1', uid_name: "dicomDeviceName", uid_type: :ldap_oid},
       { uid_value: '1.2.840.10008.15.0.3.2', uid_name: "dicomDescription", uid_type: :ldap_oid},
       { uid_value: '1.2.840.10008.15.0.3.3', uid_name: "dicomManufacturer", uid_type: :ldap_oid},

data/lib/dcm_dict/version.rb

@@ -22,6 +22,6 @@
 #  applicable local, state, national or international regulations.
 #
 module DcmDict
-  VERSION = "0.3.0"
-  DICOM_DOC_VERSION = "2014c"
+  VERSION = "0.4.0"
+  DICOM_DOC_VERSION = "2015a"
 end

data/spec/dcm_dict/dictionary/data_element_record_spec.rb

@@ -29,18 +29,17 @@ describe DcmDict::Dictionary::DataElementRecord do
   using DcmDict::Refine::Internal::ArrayRefineInternal
 
   [
-    {tag_ps: '(0008,0010)',
-     tag_name: 'Recognition Code',
-     tag_key: 'RecognitionCode',
-     tag_vr: [:SH],
-     tag_vm: ['1'],
-     tag_note: 'RET',
-     tag_ary: [0x0008,0x0010],
-     tag_sym: :recognition_code,
-     tag_ndm: '00080010',
-     tag_str: '(0008,0010)',
-     tag_multiple: false
-    },
+    { tag_ps: '(0008,0010)',
+      tag_name: 'Recognition Code',
+      tag_key: 'RecognitionCode',
+      tag_vr: [:SH],
+      tag_vm: ['1'],
+      tag_note: 'RET',
+      tag_ary: [0x0008,0x0010],
+      tag_sym: :recognition_code,
+      tag_ndm: '00080010',
+      tag_str: '(0008,0010)',
+      tag_multiple: false},
     { tag_ps: '(0008,1190)',
       tag_name: "Retrieve URL",
       tag_key: 'RetrieveURL',
@@ -51,9 +50,20 @@ describe DcmDict::Dictionary::DataElementRecord do
       tag_ndm: '00081190',
       tag_ary: [0x0008,0x1190],
       tag_multiple: false,
+      tag_note: ''},
+    { tag_ps: '(0008,0118)',
+      tag_name: "Mapping Resource UID",
+      tag_key: 'MappingResourceUID',
+      tag_vr: [:UC],
+      tag_vm: ["1"],
+      tag_str: '(0008,0118)',
+      tag_sym: :mapping_resource_uid,
+      tag_ndm: '00080118',
+      tag_ary: [0x0008,0x0118],
+      tag_multiple: false,
       tag_note: ''}
   ].each do |data|
-    it "Handle Data Element Data correctly" do
+    it "Handle Data Element Data correctly (#{data[:tag_name].inspect}-#{data[:tag_str]}-#{data[:tag_vr]})" do
       der = DcmDict::Dictionary::DataElementRecord.new(data)
       expect(der.tag_ps).to eq(data[:tag_ps])
       expect(der.tag_name).to eq(data[:tag_name])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dcm_dict
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Enrico Rivarola
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple way to handle DICOM Data Dictionary
@@ -210,4 +210,3 @@ test_files:
 - spec/dcm_dict/xml/uid_field_data_spec.rb
 - spec/data_element_sample_spec_helper.rb
 - Rakefile
-has_rdoc: