dicom 0.9.2 → 0.9.3

data/lib/dicom/d_write.rb

@@ -6,7 +6,7 @@ module DICOM
   # === Notes
   #
   # The philosophy of the Ruby DICOM library is to feature maximum conformance to the DICOM standard.
-  # As such, the class which writes DICOM files may manipulate the meta group, remove/change group lengths and add a header signature.
+  # As such, the class which writes DICOM files may manipulate the meta group, delete/change group lengths and add a header signature.
   #
   # Therefore, the file that is written may not be an exact bitwise copy of the file that was read,
   # even if no DObject manipulation has been done on the part of the user.
@@ -32,7 +32,7 @@ module DICOM
     #
     # === Parameters
     #
-    # * <tt>obj</tt> -- A DObject instance which will be used to encode a DICOM string.
+    # * <tt>dcm</tt> -- A DObject instance which will be used to encode a DICOM string.
     # * <tt>transfer_syntax</tt> -- String. The transfer syntax used for the encoding settings of the post-meta part of the DICOM string.
     # * <tt>file_name</tt> -- A string, either specifying the path of a DICOM file to be loaded, or a binary DICOM string to be parsed.
     # * <tt>options</tt> -- A hash of parameters.
@@ -41,8 +41,8 @@ module DICOM
     #
     # * <tt>:signature</tt> -- Boolean. If set as false, the DICOM header signature will not be written to the DICOM file.
     #
-    def initialize(obj, transfer_syntax, file_name=nil, options={})
-      @obj = obj
+    def initialize(dcm, transfer_syntax, file_name=nil, options={})
+      @dcm = dcm
       @transfer_syntax = transfer_syntax
       @file_name = file_name
       # As default, signature will be written and meta header added:
@@ -75,7 +75,7 @@ module DICOM
         if body
           @stream.add_last(body)
         else
-          elements = @obj.children
+          elements = @dcm.children
           write_data_elements(elements)
         end
         # As file has been written successfully, it can be closed.
@@ -97,7 +97,7 @@ module DICOM
       init_variables
       @max_size = max_size
       @segments = Array.new
-      elements = @obj.children
+      elements = @dcm.children
       # Create a Stream instance to handle the encoding of content to
       # the binary string that will eventually be saved to file:
       @stream = Stream.new(nil, @file_endian)

data/lib/dicom/deprecated.rb

@@ -0,0 +1,73 @@
+module DICOM
+  
+  class Parent
+    include Logging
+    # Deprecated.
+    #
+    def remove(tag, options={})
+      logger.warn("Parent#remove is deprecated. Use #delete instead.")
+      delete(tag, options)
+    end
+    # Deprecated.
+    #
+    def remove_children
+      logger.warn("Parent#remove_children is deprecated. Use #delete_children instead.")
+      delete_children
+    end
+
+    # Deprecated.
+    #
+    def remove_group(group_string)
+      logger.warn("Parent#remove_group is deprecated. Use #delete_group instead.")
+      delete_group(group_string)
+    end
+
+    # Deprecated.
+    #
+    def remove_private
+      logger.warn("Parent#remove_private is deprecated. Use #delete_private instead.")
+      delete_private
+    end
+  end
+  
+  class ImageItem < Parent
+    include Logging
+    # Deprecated.
+    #
+    def remove_sequences
+      logger.warn("ImageItem#remove_sequences is deprecated. Use #delete_sequences instead.")
+      delete_sequences
+    end
+  end
+  
+  class DServer
+    # Deprecated.
+    #
+    def remove_abstract_syntax(uid)
+      logger.warn("DServer#remove_abstract_syntax is deprecated. Use #delete_abstract_syntax instead.")
+      delete_abstract_syntax(uid)
+    end
+
+    # Deprecated.
+    #
+    def remove_transfer_syntax(uid)
+      logger.warn("DServer#remove_transfer_syntax is deprecated. Use #delete_transfer_syntax instead.")
+      delete_transfer_syntax(uid)
+    end
+
+    # Deprecated.
+    #
+    def remove_all_abstract_syntaxes
+      logger.warn("DServer#remove_all_abstract_syntaxes is deprecated. Use #clear_abstract_syntaxes instead.")
+      clear_abstract_syntaxes
+    end
+
+    # Deprecated.
+    #
+    def remove_all_transfer_syntaxes
+      logger.warn("DServer#remove_all_transfer_syntaxes is deprecated. Use #clear_transfer_syntaxes instead.")
+      clear_transfer_syntaxes
+    end
+  end
+  
+end

data/lib/dicom/element.rb

@@ -35,11 +35,11 @@ module DICOM
     # === Examples
     #
     #   # Create a new data element and connect it to a DObject instance:
-    #   patient_name = Element.new("0010,0010", "John Doe", :parent => obj)
+    #   patient_name = Element.new("0010,0010", "John Doe", :parent => dcm)
     #   # Create a "Pixel Data" element and insert image data that you have already encoded elsewhere:
-    #   pixel_data = Element.new("7FE0,0010", processed_pixel_data, :encoded => true, :parent => obj)
+    #   pixel_data = Element.new("7FE0,0010", processed_pixel_data, :encoded => true, :parent => dcm)
     #   # Create a private data element:
-    #   private_data = Element.new("0011,2102", some_data, :parent => obj, :vr => "LO")
+    #   private_data = Element.new("0011,2102", some_data, :parent => dcm, :vr => "LO")
     #
     def initialize(tag, value, options={})
       raise ArgumentError, "The supplied tag (#{tag}) is not valid. The tag must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
@@ -63,7 +63,11 @@ module DICOM
           if options[:bin]
             @bin = options[:bin]
           else
-            @bin = encode(value)
+            if value == ""
+              @bin = ""
+            else
+              @bin = encode(value)
+            end
           end
         else
           # When no value is present, we set the binary as an empty string, unless the binary is specified:
@@ -81,6 +85,16 @@ module DICOM
       end
     end
 
+    # Returns true if the argument is an instance with attributes equal to self.
+    #
+    def ==(other)
+      if other.respond_to?(:to_element)
+        other.send(:state) == state
+      end
+    end
+
+    alias_method :eql?, :==
+
     # Sets the binary string of a Element.
     #
     # === Notes
@@ -95,7 +109,7 @@ module DICOM
     def bin=(new_bin)
       raise ArgumentError, "Expected String, got #{new_bin.class}." unless new_bin.is_a?(String)
       # Add a zero byte at the end if the length of the binary is odd:
-      if new_bin.length[0] == 1
+      if new_bin.length.odd?
         @bin = new_bin + stream.pad_byte[@vr]
       else
         @bin = new_bin
@@ -118,6 +132,12 @@ module DICOM
       return stream.str_endian
     end
 
+    # Generates a Fixnum hash value for this instance.
+    #
+    def hash
+      state.hash
+    end
+
     # Returns a string containing a human-readable hash representation of the Element.
     #
     def inspect
@@ -136,6 +156,12 @@ module DICOM
     def to_hash
       return {self.send(DICOM.key_representation) => value}
     end
+    
+    # Returns self.
+    #
+    def to_element
+      self
+    end
 
     # Returns a json string containing a human-readable representation of the Element.
     #
@@ -182,6 +208,12 @@ module DICOM
     def encode(formatted_value)
       return stream.encode_value(formatted_value, @vr)
     end
+    
+    # Returns the attributes of this instance in an array (for comparison purposes).
+    #
+    def state
+      [@tag, @vr, @value, @bin]
+    end
 
   end
 end

data/lib/dicom/elemental.rb

@@ -41,7 +41,7 @@ module DICOM
       return all_parents
     end
 
-    # Sets a specified parent instance as this elemental's parent, while taking care to remove this elemental from any previous parent
+    # Sets a specified parent instance as this elemental's parent, while taking care to delete this elemental from any previous parent
     # as well as adding itself to the new parent (unless new parent is nil).
     #
     # === Parameters
@@ -52,16 +52,16 @@ module DICOM
     #
     #   # Create a new Sequence and connect it to a DObject instance:
     #   structure_set_roi = Sequence.new("3006,0020")
-    #   structure_set_roi.parent = obj
+    #   structure_set_roi.parent = dcm
     #
     def parent=(new_parent)
       # First take care of 'dependencies':
       if self.parent
         # Remove ourselves from the previous parent:
         if self.is_a?(Item)
-          self.parent.remove(self.index, :no_follow => true)
+          self.parent.delete(self.index, :no_follow => true)
         else
-          self.parent.remove(self.tag, :no_follow => true)
+          self.parent.delete(self.tag, :no_follow => true)
         end
       end
       if new_parent

data/lib/dicom/file_handler.rb

@@ -32,21 +32,21 @@ module DICOM
     # === Parameters
     #
     # * <tt>path_prefix</tt> -- String. Specifies the root path of the DICOM storage.
-    # * <tt>obj</tt> -- A DObject instance which will be written to file.
+    # * <tt>dcm</tt> -- A DObject instance which will be written to file.
     # * <tt>transfer_syntax</tt> -- String. Specifies the transfer syntax that will be used to write the DICOM file.
     #
-    def self.save_file(path_prefix, obj, transfer_syntax)
+    def self.save_file(path_prefix, dcm, transfer_syntax)
       # File name is set using the SOP Instance UID:
-      file_name = obj.value("0008,0018") || "missing_SOP_UID"
+      file_name = dcm.value("0008,0018") || "missing_SOP_UID"
       extension = ".dcm"
       folders = Array.new(3)
-      folders[0] = obj.value("0010,0020") || "PatientID"
-      folders[1] = obj.value("0008,0020") || "StudyDate"
-      folders[2] = obj.value("0008,0060") || "Modality"
+      folders[0] = dcm.value("0010,0020") || "PatientID"
+      folders[1] = dcm.value("0008,0020") || "StudyDate"
+      folders[2] = dcm.value("0008,0060") || "Modality"
       local_path = folders.join(File::SEPARATOR) + File::SEPARATOR + file_name
       full_path = path_prefix + local_path + extension
       # Save the DICOM object to disk:
-      obj.write(full_path, :transfer_syntax => transfer_syntax)
+      dcm.write(full_path, :transfer_syntax => transfer_syntax)
       message = [:info, "DICOM file saved to: #{full_path}"]
       return message
     end
@@ -78,12 +78,12 @@ module DICOM
           server_level = DICOM.logger.level
           DICOM.logger.level = Logger::FATAL
           # Parse the received data string and load it to a DICOM object:
-          obj = DObject.parse(objects[i], :no_meta => true, :syntax => transfer_syntaxes[i])
+          dcm = DObject.parse(objects[i], :no_meta => true, :syntax => transfer_syntaxes[i])
           # Reset the logg threshold:
           DICOM.logger.level = server_level
-          if obj.read_success
+          if dcm.read?
             begin
-              message = self.save_file(path, obj, transfer_syntaxes[i])
+              message = self.save_file(path, dcm, transfer_syntaxes[i])
               successful += 1
             rescue
               handle_fail += 1

data/lib/dicom/image_item.rb

@@ -62,8 +62,8 @@ module DICOM
         template = template_string(bit_depth_element.value.to_i)
         pixels = stream.decode_all(template) if template
       else
-        raise "The Data Element which specifies Bit Depth is missing. Unable to decode pixel data." unless bit_depth_element
-        raise "The Data Element which specifies Pixel Representation is missing. Unable to decode pixel data." unless pixel_representation_element
+        raise "The Element specifying Bit Depth (0028,0100) is missing. Unable to decode pixel data." unless bit_depth_element
+        raise "The Element specifying Pixel Representation (0028,0103) is missing. Unable to decode pixel data." unless pixel_representation_element
       end
       return pixels
     end
@@ -86,8 +86,8 @@ module DICOM
         template = template_string(bit_depth_element.value.to_i)
         bin = stream.encode(pixels, template) if template
       else
-        raise "The Data Element which specifies Bit Depth is missing. Unable to encode pixel data." unless bit_depth_element
-        raise "The Data Element which specifies Pixel Representation is missing. Unable to encode pixel data." unless pixel_representation_element
+        raise "The Element specifying Bit Depth (0028,0100) is missing. Unable to encode the pixel data." unless bit_depth_element
+        raise "The Element specifying Pixel Representation (0028,0103) is missing. Unable to encode the pixel data." unless pixel_representation_element
       end
       return bin
     end
@@ -170,7 +170,7 @@ module DICOM
             strings.each {|string| pixel_frames << decode_rle(num_cols, num_rows, string)}
           else
             images = decompress(strings) || Array.new
-            logger.warn("Decompressing pixel values has failed (unsupported transfer syntax: '#{transfer_syntax}')") unless images
+            logger.warn("Decompressing pixel values has failed (unsupported transfer syntax: '#{transfer_syntax}' - #{LIBRARY.get_syntax_description(transfer_syntax)})") unless images.length > 0
           end
         else
           # Uncompressed: Decode to numbers.
@@ -356,7 +356,12 @@ module DICOM
             # Import the pixels to NArray and give it a proper shape:
             raise "Missing Rows and/or Columns Element. Unable to construct pixel data array." unless num_rows and num_cols
             if num_frames > 1 or options[:volume]
-              pixels = NArray.to_na(pixels).reshape!(num_frames, num_cols, num_rows)
+              # Create an empty 3D NArray. fill it with pixels frame by frame, then reassign the pixels variable to it:
+              narr = NArray.int(num_frames, num_cols, num_rows)
+              num_frames.times do |i|
+                narr[i, true, true] = NArray.to_na(pixels[(i * num_cols * num_rows)..((i + 1) * num_cols * num_rows - 1)]).reshape!(num_cols, num_rows)
+              end
+              pixels = narr
             else
               pixels = NArray.to_na(pixels).reshape!(num_cols, num_rows)
             end
@@ -434,19 +439,30 @@ module DICOM
     #
     def pixels=(values)
       raise ArgumentError, "Expected Array or NArray, got #{values.class}." unless [Array, NArray].include?(values.class)
-      # If NArray, convert to a standard Ruby Array:
-      values = values.to_a.flatten if values.is_a?(NArray)
+      if values.is_a?(NArray)
+        # When NArray, convert to a Ruby Array:
+        if values.shape.length > 2
+          # We need to take care when reshaping this 3D array so that the pixel values falls properly into place:
+          narr = NArray.int(values.shape[1] * values.shape[2], values.shape[0])
+          values.shape[0].times do |i|
+            narr[true, i] = values[i, true, true].reshape(values.shape[1] * values.shape[2])
+          end
+          values = narr.to_a
+        else
+          values = values.to_a
+        end
+      end
       # Encode the pixel data:
-      bin = encode_pixels(values)
+      bin = encode_pixels(values.flatten)
       # Write the binary data to the Pixel Data Element:
       write_pixels(bin)
     end
 
-    # Removes all Sequence instances from the DObject or Item instance.
+    # Delete all Sequence instances from the DObject or Item instance.
     #
-    def remove_sequences
+    def delete_sequences
       @tags.each_value do |element|
-        remove(element.tag) if element.is_a?(Sequence)
+        delete(element.tag) if element.is_a?(Sequence)
       end
     end
 

data/lib/dicom/item.rb

@@ -38,9 +38,9 @@ module DICOM
     # === Examples
     #
     #   # Create an empty Item and connect it to the "Structure Set ROI Sequence":
-    #   item = Item.new(:parent => obj["3006,0020"])
+    #   item = Item.new(:parent => dcm["3006,0020"])
     #   # Create a "Pixel Data Item" which carries an encapsulated image frame (a pre-encoded binary):
-    #   pixel_item = Item.new(:bin => processed_pixel_data, :parent => obj["7FE0,0010"][1])
+    #   pixel_item = Item.new(:bin => processed_pixel_data, :parent => dcm["7FE0,0010"][1])
     #
     def initialize(options={})
       # Set common parent variables:
@@ -62,6 +62,16 @@ module DICOM
       end
     end
 
+    # Returns true if the argument is an instance with attributes equal to self.
+    #
+    def ==(other)
+      if other.respond_to?(:to_item)
+        other.send(:state) == state
+      end
+    end
+
+    alias_method :eql?, :==
+
     # Sets the binary string that the Item will contain.
     #
     # === Parameters
@@ -71,12 +81,12 @@ module DICOM
     # === Examples
     #
     #   # Insert a custom jpeg in the (encapsulated) pixel data element, in it's first pixel data item:
-    #   obj["7FE0,0010"][1].children.first.bin = jpeg_binary_string
+    #   dcm["7FE0,0010"][1].children.first.bin = jpeg_binary_string
     #
     def bin=(new_bin)
       raise ArgumentError, "Invalid parameter type. String was expected, got #{new_bin.class}." unless new_bin.is_a?(String)
       # Add an empty byte at the end if the length of the binary is odd:
-      if new_bin.length[0] == 1
+      if new_bin.length.odd?
         @bin = new_bin + "\x00"
       else
         @bin = new_bin
@@ -85,5 +95,27 @@ module DICOM
       @length = @bin.length
     end
 
+    # Generates a Fixnum hash value for this instance.
+    #
+    def hash
+      state.hash
+    end
+
+    # Returns self.
+    #
+    def to_item
+      self
+    end
+
+
+    private
+
+
+    # Returns the attributes of this instance in an array (for comparison purposes).
+    #
+    def state
+      [@vr, @name, @tags]
+    end
+
   end
 end

data/lib/dicom/link.rb

@@ -57,7 +57,7 @@ module DICOM
       segments = receive_single_transmission
       info = segments.first
       if info[:pdu] != PDU_RELEASE_REQUEST
-        # For some reason we didnt get our expected release request. Determine why:
+        # For some reason we didn't get our expected release request. Determine why:
         if info[:valid]
           logger.error("Unexpected message type received (PDU: #{info[:pdu]}). Expected a release request. Closing the connection.")
           handle_abort(false)

data/lib/dicom/parent.rb

@@ -25,9 +25,9 @@ module DICOM
     # === Examples
     #
     #   # Extract the "Pixel Data" data element from the DObject instance:
-    #   pixel_data_element = obj["7FE0,0010"]
+    #   pixel_data_element = dcm["7FE0,0010"]
     #   # Extract the first Item from a Sequence:
-    #   first_item = obj["3006,0020"][1]
+    #   first_item = dcm["3006,0020"][1]
     #
     def [](tag_or_index)
       formatted = tag_or_index.is_a?(String) ? tag_or_index.upcase : tag_or_index
@@ -52,9 +52,9 @@ module DICOM
     # === Examples
     #
     #   # Set a new patient's name to the DICOM object:
-    #   obj.add(Element.new("0010,0010", "John_Doe"))
+    #   dcm.add(Element.new("0010,0010", "John_Doe"))
     #   # Add a previously defined element roi_name to the first item in the following sequence:
-    #   obj["3006,0020"][0].add(roi_name)
+    #   dcm["3006,0020"][0].add(roi_name)
     #
     def add(element, options={})
       unless element.is_a?(Item)
@@ -96,9 +96,9 @@ module DICOM
     # === Examples
     #
     #   # Add an empty Item to a specific Sequence:
-    #   obj["3006,0020"].add_item
+    #   dcm["3006,0020"].add_item
     #   # Add an existing Item at the 2nd item position/index in the specific Sequence:
-    #   obj["3006,0020"].add_item(my_item, :index => 2)
+    #   dcm["3006,0020"].add_item(my_item, :index => 2)
     #
     def add_item(item=nil, options={})
       unless self.is_a?(DObject)
@@ -160,7 +160,7 @@ module DICOM
     # === Examples
     #
     #   # Retrieve all top level data elements in a DICOM object:
-    #   top_level_elements = obj.children
+    #   top_level_elements = dcm.children
     #
     def children
       return @tags.sort.transpose[1] || Array.new
@@ -280,7 +280,7 @@ module DICOM
     #
     # === Examples
     #
-    #   process_name(obj["0010,0010"]) if obj.exists?("0010,0010")
+    #   process_name(dcm["0010,0010"]) if dcm.exists?("0010,0010")
     #
     def exists?(tag)
       if self[tag]
@@ -435,7 +435,7 @@ module DICOM
     # * Returns the element if the method name suggests an element retrieval, and the element exists.
     # * Returns nil if the method name suggests an element retrieval, but the element doesn't exist.
     # * Returns a boolean, if the method name suggests a query (?), based on whether the matched element exists or not.
-    # * When the method name suggests assignment (=), an element is created with the supplied arguments, or if the argument is nil, the element is removed.
+    # * When the method name suggests assignment (=), an element is created with the supplied arguments, or if the argument is nil, the element is deleted.
     #
     # * When a dynamic method name is not matched against a DICOM element, and the method is not defined by the parent, a NoMethodError is raised.
     #
@@ -462,7 +462,7 @@ module DICOM
               return self.add(Element.new(tag, *args))
             end
           else
-            return self.remove(tag)
+            return self.delete(tag)
           end
         else
           # Retrieval:
@@ -510,11 +510,11 @@ module DICOM
     # === Examples
     #
     #   # Print a DObject instance to screen
-    #   obj.print
-    #   # Print the obj to the screen, but specify a 25 character value cutoff to produce better-looking results:
-    #   obj.print(:value_max => 25)
+    #   dcm.print
+    #   # Print the DObject to the screen, but specify a 25 character value cutoff to produce better-looking results:
+    #   dcm.print(:value_max => 25)
     #   # Print to a text file the elements that belong to a specific Sequence:
-    #   obj["3006,0020"].print(:file => "dicom.txt")
+    #   dcm["3006,0020"].print(:file => "dicom.txt")
     #
     #--
     # FIXME: Perhaps a :children => false option would be a good idea (to avoid lengthy printouts in cases where this would be desirable)?
@@ -572,25 +572,25 @@ module DICOM
       return max_name, max_length, max_generations
     end
 
-    # Removes the specified element from this parent.
+    # Deletes the specified element from this parent.
     #
     # === Parameters
     #
-    # * <tt>tag</tt> -- A tag string which specifies the element to be removed (Exception: In the case of an Item removal, an index (Fixnum) is used instead).
+    # * <tt>tag</tt> -- A tag string which specifies the element to be deleted (Exception: In the case of an Item removal, an index (Fixnum) is used instead).
     # * <tt>options</tt> -- A hash of parameters.
     #
     # === Options
     #
-    # * <tt>:no_follow</tt> -- Boolean. If true, the method does not update the parent attribute of the child that is removed.
+    # * <tt>:no_follow</tt> -- Boolean. If true, the method does not update the parent attribute of the child that is deleted.
     #
     # === Examples
     #
-    #   # Remove a Element from a DObject instance:
-    #   obj.remove("0008,0090")
-    #   # Remove Item 1 from a specific Sequence:
-    #   obj["3006,0020"].remove(1)
+    #   # Delete an Element from a DObject instance:
+    #   dcm.delete("0008,0090")
+    #   # Delete Item 1 from a specific Sequence:
+    #   dcm["3006,0020"].delete(1)
     #
-    def remove(tag, options={})
+    def delete(tag, options={})
       if tag.is_a?(String) or tag.is_a?(Integer)
         raise ArgumentError, "Argument (#{tag}) is not a valid tag string." if tag.is_a?(String) && !tag.tag?
         raise ArgumentError, "Negative Integer argument (#{tag}) is not allowed." if tag.is_a?(Integer) && tag < 0
@@ -605,15 +605,15 @@ module DICOM
       end
     end
 
-    # Removes all child elements from this parent.
+    # Deletes all child elements from this parent.
     #
-    def remove_children
+    def delete_children
       @tags.each_key do |tag|
-        remove(tag)
+        delete(tag)
       end
     end
 
-    # Removes all data elements of the specified group from this parent.
+    # Deletes all data elements of the specified group from this parent.
     #
     # === Parameters
     #
@@ -621,30 +621,30 @@ module DICOM
     #
     # === Examples
     #
-    #   # Remove the File Meta Group of a DICOM object:
-    #   obj.remove_group("0002")
+    #   # Delete the File Meta Group of a DICOM object:
+    #   dcm.delete_group("0002")
     #
-    def remove_group(group_string)
+    def delete_group(group_string)
       group_elements = group(group_string)
       group_elements.each do |element|
-        remove(element.tag)
+        delete(element.tag)
       end
     end
 
-    # Removes all private data elements from the child elements of this parent.
+    # Deletes all private data elements from the child elements of this parent.
     #
     # === Examples
     #
-    #   # Remove all private elements from a DObject instance:
-    #   obj.remove_private
-    #   # Remove only private elements belonging to a specific Sequence:
-    #   obj["3006,0020"].remove_private
+    #   # Delete all private elements from a DObject instance:
+    #   dcm.delete_private
+    #   # Delete only private elements belonging to a specific Sequence:
+    #   dcm["3006,0020"].delete_private
     #
-    def remove_private
-      # Iterate all children, and repeat recursively if a child itself has children, to remove all private data elements:
+    def delete_private
+      # Iterate all children, and repeat recursively if a child itself has children, to delete all private data elements:
       children.each do |element|
-        remove(element.tag) if element.tag.private?
-        element.remove_private if element.children?
+        delete(element.tag) if element.tag.private?
+        element.delete_private if element.children?
       end
     end
 
@@ -751,9 +751,9 @@ module DICOM
     # === Examples
     #
     #   # Get the patient's name value:
-    #   name = obj.value("0010,0010")
+    #   name = dcm.value("0010,0010")
     #   # Get the Frame of Reference UID from the first item in the Referenced Frame of Reference Sequence:
-    #   uid = obj["3006,0010"][0].value("0020,0052")
+    #   uid = dcm["3006,0010"][0].value("0020,0052")
     #
     def value(tag)
       if tag.is_a?(String) or tag.is_a?(Integer)