dcm_dict 0.26.0 → 0.31.0

data/lib/dcm_dict/version.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -22,6 +22,6 @@
 #  applicable local, state, national or international regulations.
 #
 module DcmDict
-  VERSION = "0.26.0"
-  DICOM_DOC_VERSION = "2019e"
+  VERSION = "0.31.0"
+  DICOM_DOC_VERSION = "2020e"
 end

data/lib/dcm_dict/xml/constant.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -32,7 +32,8 @@ module DcmDict
 
     UidNodeSetIdx = { uid_value: 0,
                       uid_name: 1,
-                      uid_type: 2}.freeze
+                      uid_key: 2,
+                      uid_type: 3}.freeze
 
   end
 end

data/lib/dcm_dict/xml/field_data.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/lib/dcm_dict/xml/nokogiri_tool.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/lib/dcm_dict/xml/rexml_tool.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/lib/dcm_dict/xml/tag_field_data.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/lib/dcm_dict/xml/uid_field_data.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -27,6 +27,7 @@ module DcmDict
     # Class to handle uid data
     class UidFieldData < FieldData
       using DcmDict::Refine::Internal::StringRefineInternal
+      using DcmDict::Refine::Internal::HashRefineInternal
 
       MISSING_NAME_VALUE = "(Retired)"
 
@@ -38,18 +39,27 @@ module DcmDict
       # Extract and build uid data
       def uid_data
         extract_base_data
+        @data.check_base_data_uid_field!
+        # extend_base_data
+        @data
       end
 
       private
       def extract_base_data
         value = extract_content_data(:uid_value)
         type = extract_content_data(:uid_type).uid_type_to_sym
+        key = extract_content_data(:uid_key)
         name = check_uid_name_for(extract_content_data(:uid_name), value, type)
-        { uid_value: value,
-          uid_name: name,
-          uid_type: type }
+        @data = { uid_value: value,
+                  uid_name: name,
+                  uid_type: type,
+                  uid_key: key }
       end
 
+      # def extend_base_data
+      #   @data[:uid_sym] = @data[:uid_key].tag_key_to_sym
+      # end
+
       # patch for 2016a source data ...
       def check_uid_name_for(name, value, type)
         name = "#{value} #{MISSING_NAME_VALUE}" if (name == MISSING_NAME_VALUE)

data/lib/dcm_dict/xml/xml_tool.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/data_element_sample_spec_helper.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -152,7 +152,17 @@ module DataElementSampleSpecHelper
       [0x0002,0x0027] => { tag_ps: '(0002,0027)', tag_name: "Sending Presentation Address", tag_key: 'SendingPresentationAddress',
                             tag_vr: [:UR], tag_vm: ["1"], tag_str: '(0002,0027)', tag_sym: :sending_presentation_address,
                             tag_ndm: '00020027', tag_ary: [0x0002,0x0027], tag_multiple: false,
-                            tag_note: ''}
+                            tag_note: ''},
+      [0x3010,0x0096] => { tag_ps: '(3010,0096)', tag_name: "Radiation Source Coordinate System Pitch Angle",
+                           tag_key: 'RadiationSourceCoordinateSystemPitchAngle', tag_vr: [:FD], tag_vm: ["1"], tag_str: '(3010,0096)',
+                           tag_sym: :radiation_source_coordinate_system_pitch_angle, tag_ndm: '30100096',
+                           tag_ary: [0x3010,0x0096], tag_multiple: false, tag_note: ''},
+      [0x0016,0x1002] => { tag_ps: '(0016,1002)', tag_name: "Emitter Color Temperature", tag_key: 'EmitterColorTemperature',
+                           tag_vr: [:DS], tag_vm: ["1"], tag_str: '(0016,1002)', tag_sym: :emitter_color_temperature,
+                           tag_ndm: '00161002', tag_ary: [0x0016,0x1002], tag_multiple: false, tag_note: ''},
+      [0x0072,0x0082] => { tag_ps: '(0072,0082)', tag_name: "Selector SV Value", tag_key: 'SelectorSVValue',
+                           tag_vr: [:SV], tag_vm: ["1-n"], tag_str: '(0072,0082)', tag_sym: :selector_sv_value,
+                           tag_ndm: '00720082', tag_ary: [0x0072,0x0082], tag_multiple: false, tag_note: ''},
     }
   end
 

data/spec/data_element_shared_example_spec_helper.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/dictionary/data_element_dictionary_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/dictionary/data_element_record_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/dictionary/uid_dictionary_spec.rb

@@ -24,28 +24,73 @@ require 'spec_helper'
 describe DcmDict::Dictionary::UidDictionary do
 
   include_examples "Map all source data",
-                   [:uid_value, :uid_name],
+                   [:uid_value, :uid_name, :uid_key, :uid_sym],
                    DcmDict::SourceData::UidValuesData,
                    DcmDict::Dictionary::TheUidDictionary,
                    DcmDict::Dictionary::UidRecord,
-                   [:uid_value, :uid_name, :uid_type]
+                   [:uid_value, :uid_name, :uid_key, :uid_sym, :uid_type]
 
   {
-    '1.2.3.4.5.6' => { :uid_value => '1.2.3.4.5.6',
-                       :uid_name => 'Unknown UID',
-                       :uid_type => :unknown },
+    '1.2.3.4.5.6'                   => { :uid_value => '1.2.3.4.5.6',
+                                         :uid_name  => '1.2.3.4.5.6 (Unknown UID)',
+                                         :uid_type  => :unknown,
+                                         :uid_key   => 'UID_1_2_3_4_5_6',
+                                         :uid_sym   => :uid_1_2_3_4_5_6,
+                                       },
     '1.2.840.10008.5.1.4.1.1.12.77' => { :uid_value => '1.2.840.10008.5.1.4.1.1.12.77',
-                                         :uid_name => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
-                                         :uid_type => :sop_class },
-    '1.2.840.10008.5.1.4.1.1.40' => { :uid_value => '1.2.840.10008.5.1.4.1.1.40',
-                                      :uid_name => '1.2.840.10008.5.1.4.1.1.40 (Retired)',
-                                      :uid_type => :sop_class },
-    '1.2.840.10008.5.1.4.39.3' => { :uid_value => '1.2.840.10008.5.1.4.39.3',
-                                      :uid_name => 'Color Palette Query/Retrieve Information Model - MOVE',
-                                      :uid_type => :sop_class },
-    '1.2.840.10008.5.1.4.34.6.5' => { :uid_value => '1.2.840.10008.5.1.4.34.6.5',
-                                      :uid_name => 'Unified Procedure Step - Query SOP Class',
-                                      :uid_type => :sop_class }
+                                         :uid_name  => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
+                                         :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_12_77',
+                                         :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_12_77,
+                                         :uid_type  => :sop_class
+                                       },
+    '1.2.840.10008.5.1.4.1.1.12.77 (Retired)' => { :uid_value => '1.2.840.10008.5.1.4.1.1.12.77',
+                                         :uid_name  => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
+                                         :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_12_77',
+                                         :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_12_77,
+                                         :uid_type  => :sop_class
+                                       },
+    'UID_1_2_840_10008_5_1_4_1_1_12_77' => { :uid_value => '1.2.840.10008.5.1.4.1.1.12.77',
+                                         :uid_name  => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
+                                         :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_12_77',
+                                         :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_12_77,
+                                         :uid_type  => :sop_class
+                                       },
+    :uid_1_2_840_10008_5_1_4_1_1_12_77 => { :uid_value => '1.2.840.10008.5.1.4.1.1.12.77',
+                                         :uid_name  => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
+                                         :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_12_77',
+                                         :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_12_77,
+                                         :uid_type  => :sop_class
+                                       },
+    '1.2.840.10008.5.1.4.1.1.40'    => { :uid_value => '1.2.840.10008.5.1.4.1.1.40',
+                                         :uid_name  => '1.2.840.10008.5.1.4.1.1.40 (Retired)',
+                                         :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_40',
+                                         :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_40,
+                                         :uid_type  => :sop_class
+                                       },
+    '1.2.840.10008.5.1.4.39.3'      => { :uid_value => '1.2.840.10008.5.1.4.39.3',
+                                         :uid_name  => 'Color Palette Query/Retrieve Information Model - MOVE',
+                                         :uid_key   => 'ColorPaletteQueryRetrieveInformationModelMove',
+                                         :uid_sym   => :color_palette_query_retrieve_information_model_move,
+                                         :uid_type  => :sop_class
+                                       },
+    'Color Palette Query/Retrieve Information Model - MOVE' => { :uid_value => '1.2.840.10008.5.1.4.39.3',
+                                         :uid_name  => 'Color Palette Query/Retrieve Information Model - MOVE',
+                                         :uid_key   => 'ColorPaletteQueryRetrieveInformationModelMove',
+                                         :uid_sym   => :color_palette_query_retrieve_information_model_move,
+                                         :uid_type  => :sop_class
+                                       },
+    'ColorPaletteQueryRetrieveInformationModelMove'         => { :uid_value => '1.2.840.10008.5.1.4.39.3',
+                                         :uid_name  => 'Color Palette Query/Retrieve Information Model - MOVE',
+                                         :uid_key   => 'ColorPaletteQueryRetrieveInformationModelMove',
+                                         :uid_sym   => :color_palette_query_retrieve_information_model_move,
+                                         :uid_type  => :sop_class
+                                       },
+    :color_palette_query_retrieve_information_model_move    => { :uid_value => '1.2.840.10008.5.1.4.39.3',
+                                         :uid_name  => 'Color Palette Query/Retrieve Information Model - MOVE',
+                                         :uid_key   => 'ColorPaletteQueryRetrieveInformationModelMove',
+                                         :uid_sym   => :color_palette_query_retrieve_information_model_move,
+                                         :uid_type  => :sop_class
+                                       },
   }.each do |uid, data|
     include_examples "Handle specific record", data[:uid_name],
                      uid, data, DcmDict::Dictionary::TheUidDictionary
@@ -55,7 +100,7 @@ describe DcmDict::Dictionary::UidDictionary do
     '1.2.abc.3.4', 'this string is not a valid uid', '1.2.3.04.5'
   ].each do |uid|
     include_examples "Dictionary with wrong key",
-                     uid, [:uid_value, :uid_name, :uid_type],
+                     uid, [:uid_value, :uid_name, :uid_type, :uid_key, :uid_sym],
                      DcmDict::Dictionary::TheUidDictionary
   end
 

data/spec/dcm_dict/dictionary/uid_record_spec.rb

@@ -1,5 +1,6 @@
+# coding: utf-8
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -27,14 +28,17 @@ describe DcmDict::Dictionary::UidRecord do
   [
     { uid_value: '1.2.840.10008.1.2',
       uid_name: "Implicit VR Little Endian: Default Transfer Syntax for DICOM",
+      uid_key: "ImplicitVRLittleEndian",
+      uid_sym: :implicit_vr_little_endian,
       uid_type: :transfer_syntax }
   ].each do |data|
-    it "Handle Data Element Data correctly" do
+    it "Handle Data Element Data correctly (#{data[:uid_name]})" do
       ur = DcmDict::Dictionary::UidRecord.new(data.dup)
       expect(ur.uid_value).to eq(data[:uid_value])
       expect(ur.uid).to eq(data[:uid_value])
       expect(ur.uid_name).to eq(data[:uid_name])
       expect(ur.uid_type).to eq(data[:uid_type])
+      expect(ur.uid_key).to eq(data[:uid_key])
     end
 
 
@@ -42,12 +46,12 @@ describe DcmDict::Dictionary::UidRecord do
                      DcmDict::Dictionary::UidRecord.new(data),
                      data
 
-    it "data should be not modifiable" do
+    it "data should be not modifiable (#{data[:uid_name]})" do
       uid = DcmDict::Dictionary::UidRecord.new(data.dup)
       old_value = uid.uid_value.dup
       expect{uid.uid_value << 'aaa'}.to raise_error(RuntimeError)
       expect(uid.uid_value).to eq(old_value)
     end
-
   end
+
 end

data/spec/dcm_dict/encoder/data_to_code_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -92,7 +92,7 @@ END
       XmlSampleSpecHelper.xml_uid_set.each do |xml_string, data|
       it "for uid sample as #{data[:uid_value].inspect}" do
         indent = 4
-        src_text = "#{' '*indent}{ uid_value: '#{data[:uid_value]}', uid_name: \"#{data[:uid_name]}\", uid_type: #{data[:uid_type].inspect}},"
+        src_text = "#{' '*indent}{ uid_value: '#{data[:uid_value]}', uid_name: '#{data[:uid_name]}', uid_key: '#{data[:uid_key]}', uid_sym: #{data[:uid_sym].inspect}, uid_type: #{data[:uid_type].inspect}},"
         src_line = DcmDict::Encoder::DataToCode.uid_data_to_code(data)
         expect(src_line).to eq(src_text)
         src_line = DcmDict::Encoder::DataToCode.uid_data_to_code(data, indent)

data/spec/dcm_dict/ext/object_extension_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/refine/array_refine_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/refine/internal/array_refine_internal_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/refine/internal/hash_refine_internal_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -26,6 +26,24 @@ require 'spec_helper'
 describe "Hash internal refinement" do
   using DcmDict::Refine::Internal::HashRefineInternal
 
+  {
+    '1.2.3.4.5.6' =>  { :uid_value => '1.2.3.4.5.6',
+                        :uid_name  => '1.2.3.4.5.6 (Unknown UID)',
+                        :uid_type  => :unknown,
+                        :uid_key   => 'UID_1_2_3_4_5_6',
+                        :uid_sym   => :uid_1_2_3_4_5_6,
+                      }
+  }.each do |uid_ref, expected_data|
+    it "should check base uid fields for '#{uid_ref}" do
+      data = {uid_value: uid_ref}
+      data.check_base_data_uid_field!
+      expect(data).to eq(expected_data)
+    end
+
+  end
+
+
+
   it "should check for lowercase tag_ps field" do
     h = {tag_ps: '(fffe,E000)'}
     h.check_tag_ps!

data/spec/dcm_dict/refine/internal/string_refine_internal_spec.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #

data/spec/dcm_dict/refine/string_refine_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -60,9 +60,9 @@ describe "String refinement" do
   describe "should permit access to single data uid dictionary information" do
     describe "for regular uids" do
       [
-        '1.2.840.10008.1.1', "Verification SOP Class",
-        '1.2.840.10008.1.2.1', "Explicit VR Little Endian",
-        '1.2.840.10008.5.1.4.1.2.1.1', "Patient Root Query/Retrieve Information Model - FIND",
+        '1.2.840.10008.1.1', "Verification SOP Class", 'Verification',
+        '1.2.840.10008.1.2.1', "Explicit VR Little Endian", 'ExplicitVRLittleEndian',
+        '1.2.840.10008.5.1.4.1.2.1.1', "Patient Root Query/Retrieve Information Model - FIND", 'PatientRootQueryRetrieveInformationModelFind',
         '1.2.3.4.5.6'
       ].each do |uid|
         describe "as #{uid.inspect}" do

data/spec/dcm_dict/refine/symbol_refine_spec.rb

@@ -1,5 +1,5 @@
 #
-#  Copyright (C) 2014-2019  Enrico Rivarola
+#  Copyright (C) 2014-2020  Enrico Rivarola
 #
 #  This file is part of DcmDict gem (dcm_dict).
 #
@@ -38,4 +38,29 @@ describe "Symbol refinement" do
                    [],
                    Proc.new {|tag| tag.inspect}
 
+  {
+    :uid_1_2_840_10008_5_1_4_1_1_12_77 => { :uid_value => '1.2.840.10008.5.1.4.1.1.12.77',
+                                            :uid       => '1.2.840.10008.5.1.4.1.1.12.77',
+                                            :uid_name  => '1.2.840.10008.5.1.4.1.1.12.77 (Retired)',
+                                            :uid_key   => 'UID_1_2_840_10008_5_1_4_1_1_12_77',
+                                            :uid_sym   => :uid_1_2_840_10008_5_1_4_1_1_12_77,
+                                            :uid_type  => :sop_class
+                                          },
+    :color_palette_query_retrieve_information_model_move    => { :uid_value => '1.2.840.10008.5.1.4.39.3',
+                                                                 :uid       => '1.2.840.10008.5.1.4.39.3',
+                                                                 :uid_name  => 'Color Palette Query/Retrieve Information Model - MOVE',
+                                                                 :uid_key   => 'ColorPaletteQueryRetrieveInformationModelMove',
+                                                                 :uid_sym   => :color_palette_query_retrieve_information_model_move,
+                                                                 :uid_type  => :sop_class
+                                                               },
+  }.each do |sym, sym_data|
+    it "for uid as symbol (#{sym.inspect})" do
+      DcmDict::Dictionary::UidMethod.each do |method|
+        expr = "#{sym.inspect}.#{method.to_s}"
+        expected_value = sym_data[method]
+        value = eval(expr)
+        expect(value).to eq(expected_value)
+      end
+    end
+  end
 end