dicom 0.8 → 0.9

data/lib/dicom/constants.rb

@@ -1,18 +1,10 @@
-#    Copyright 2010 Christoffer Lervag
-
-# This file contains module constants used by the Ruby DICOM library.
 
 module DICOM
 
-  # Ruby DICOM version string.
-  VERSION = "0.8"
-
-  # Ruby DICOM's implementation UID.
+  # Ruby DICOM's Implementation UID.
   UID = "1.2.826.0.1.3680043.8.641"
   # Ruby DICOM name & version (max 16 characters).
   NAME = "RUBY_DCM_" + DICOM::VERSION
-  # Application title.
-  SOURCE_APP_TITLE = "RUBY_DICOM"
 
   # Item tag.
   ITEM_TAG = "FFFE,E000"
@@ -115,7 +107,65 @@ module DICOM
   # System (CPU) Endianness.
   CPU_ENDIAN = endian_type[Array(x).pack("L*")]
 
+  # Custom string used for (un)packing big endian signed short.
+  CUSTOM_SS = "k*"
+  # Custom string used for (un)packing big endian signed long.
+  CUSTOM_SL = "r*"
+
   # Ruby DICOM's library (data dictionary).
   LIBRARY =  DICOM::DLibrary.new
 
-end
+  # Transfer Syntaxes
+  # Taken from DICOM Specification PS 3.5, Chapter 10
+
+  # General
+  TXS_IMPLICIT_LITTLE_ENDIAN            = '1.2.840.10008.1.2'      # also defined as IMPLICIT_LITTLE_ENDIAN, default transfer syntax
+  TXS_EXPLICIT_LITTLE_ENDIAN            = '1.2.840.10008.1.2.1'    # also defined as EXPLICIT_LITTLE_ENDIAN
+  TXS_EXPLICIT_BIG_ENDIAN               = '1.2.840.10008.1.2.2'    # also defined as EXPLICIT_BIG_ENDIAN
+
+  # TRANSFER SYNTAXES FOR ENCAPSULATION OF ENCODED PIXEL DATA
+  TXS_JPEG_BASELINE                     = '1.2.840.10008.1.2.4.50'
+  TXS_JPEG_EXTENDED                     = '1.2.840.10008.1.2.4.51'
+  TXS_JPEG_LOSSLESS_NH                  = '1.2.840.10008.1.2.4.57' # NH: non-hirarchical
+  TXS_JPEG_LOSSLESS_NH_FOP              = '1.2.840.10008.1.2.4.70' # NH: non-hirarchical, FOP: first-order prediction
+
+  TXS_JPEG_LS_LOSSLESS                  = '1.2.840.10008.1.2.4.80'
+  TXS_JPEG_LS_NEAR_LOSSLESS             = '1.2.840.10008.1.2.4.81'
+
+  TXS_JPEG_2000_PART1_LOSSLESS          = '1.2.840.10008.1.2.4.90'
+  TXS_JPEG_2000_PART1_LOSSLESS_OR_LOSSY = '1.2.840.10008.1.2.4.91'
+  TXS_JPEG_2000_PART2_LOSSLESS          = '1.2.840.10008.1.2.4.92'
+  TXS_JPEG_2000_PART2_LOSSLESS_OR_LOSSY = '1.2.840.10008.1.2.4.93'
+
+  TXS_MPEG2_MP_ML                       = '1.2.840.10008.1.2.4.100'
+  TXS_MPEG2_MP_HL                       = '1.2.840.10008.1.2.4.101'
+
+  TXS_DEFLATED_LITTLE_ENDIAN            = '1.2.840.10008.1.2.1.99'  # ZIP Compression
+
+  TXS_JPIP                              = '1.2.840.10008.1.2.4.94'
+  TXS_JPIP_DEFLATE                      = '1.2.840.10008.1.2.4.95'
+
+  TXS_RLE                               = '1.2.840.10008.1.2.5'
+
+
+  # Photometric Interpretations
+  # Taken from DICOM Specification PS 3.3 C.7.6.3.1.2 Photometric Interpretation
+
+  PI_MONOCHROME1     = 'MONOCHROME1'
+  PI_MONOCHROME2     = 'MONOCHROME2'
+  PI_PALETTE_COLOR   = 'PALETTE COLOR'
+  PI_RGB             = 'RGB'
+  PI_YBR_FULL        = 'YBR_FULL'
+  PI_YBR_FULL_422    = 'YBR_FULL_422 '
+  PI_YBR_PARTIAL_422 = 'YBR_PARTIAL_422'
+  PI_YBR_PARTIAL_420 = 'YBR_PARTIAL_420'
+  PI_YBR_ICT         = 'YBR_ICT'
+  PI_YBR_RCT         = 'YBR_RCT'
+
+  # Retired Photometric Interpretations, are those needed to be supported?
+  PI_HSV             = 'HSV'
+  PI_ARGB            = 'ARGB'
+  PI_CMYK            = 'CMYK'
+
+end
+

data/lib/dicom/d_client.rb

@@ -1,9 +1,11 @@
-#    Copyright 2009-2010 Christoffer Lervag
 
 module DICOM
 
   # This class contains code for handling the client side of DICOM TCP/IP network communication.
   #
+  # === Resources
+  #
+  # * For information regarding query, such as required/optional attributes and value matching, refer to the DICOM standard, PS3.4, C 2.2.
   #--
   # FIXME: The code which waits for incoming network packets seems to be very CPU intensive. Perhaps there is a more elegant way to wait for incoming messages?
   #
@@ -15,7 +17,7 @@ module DICOM
     attr_accessor :host_ae
     # The IP adress of the server.
     attr_accessor :host_ip
-    # The maximum allowed size of network packages (in bytes). 
+    # The maximum allowed size of network packages (in bytes).
     attr_accessor :max_package_size
     # The network port to be used.
     attr_accessor :port
@@ -44,7 +46,7 @@ module DICOM
     #
     # * <tt>:ae</tt> -- String. The name of this client (application entity).
     # * <tt>:host_ae</tt> -- String. The name of the server (application entity).
-    # * <tt>:max_package_size</tt> -- Fixnum. The maximum allowed size of network packages (in bytes). 
+    # * <tt>:max_package_size</tt> -- Fixnum. The maximum allowed size of network packages (in bytes).
     # * <tt>:timeout</tt> -- Fixnum. The maximum period the server will wait on an answer from a client before aborting the communication.
     # * <tt>:verbose</tt> -- Boolean. If set to false, the DClient instance will run silently and not output warnings and error messages to the screen. Defaults to true.
     #
@@ -73,11 +75,11 @@ module DICOM
       @association = nil # DICOM Association status
       @request_approved = nil # Status of our DICOM request
       @release = nil # Status of received, valid release response
+      @data_elements = []
       # Results from a query:
       @command_results = Array.new
       @data_results = Array.new
-      # Set default values like transfer syntax, user information, endianness:
-      set_default_values
+      # Setup the user information used in the association request::
       set_user_information_array
       # Initialize the network package handler:
       @link = Link.new(:ae => @ae, :host_ae => @host_ae, :max_package_size => @max_package_size, :timeout => @timeout)
@@ -87,34 +89,46 @@ module DICOM
     #
     def echo
       # Verification SOP Class:
-      @abstract_syntaxes = [VERIFICATION_SOP]
+      set_default_presentation_context(VERIFICATION_SOP)
       perform_echo
     end
 
-    # Queries a service class provider for images that match the specified criteria.
+    # Queries a service class provider for images (composite object instances) that match the specified criteria.
     #
     # === Parameters
     #
-    # * <tt>options</tt> -- A hash of parameters.
+    # * <tt>query_params</tt> -- A hash of query parameters.
     #
     # === Options
     #
-    # * <tt>"0008,0018"</tt> --  SOP Instance UID
-    # * <tt>"0008,0052"</tt> -- Query/Retrieve Level
-    # * <tt>"0020,000D"</tt> -- Study Instance UID
-    # * <tt>"0020,000E"</tt> -- Series Instance UID
+    # * <tt>"0008,0018"</tt> -- SOP Instance UID
     # * <tt>"0020,0013"</tt> -- Instance Number
     #
+    # === Notes
+    #
+    # * Caution: Calling this method without parameters will instruct your PACS to return info on ALL images in the database!
+    # * In addition to the above listed attributes, a number of "optional" attributes may be specified.
+    # * For a general list of optional object instance level attributes, refer to the DICOM standard, PS3.4 C.6.1.1.5, Table C.6-4.
+    #
     # === Examples
     #
     #   node.find_images("0020,000D" => "1.2.840.1145.342", "0020,000E" => "1.3.6.1.4.1.2452.6.687844")
     #
-    def find_images(options={})
+    def find_images(query_params={})
       # Study Root Query/Retrieve Information Model - FIND:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.1"]
-      # Prepare data elements for this operation:
-      set_data_fragment_find_images
-      set_data_options(options)
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.1")
+      # These query attributes will always be present in the dicom query:
+      default_query_params = {
+        "0008,0018" => "", # SOP Instance UID
+        "0008,0052" => "IMAGE", # Query/Retrieve Level: "IMAGE"
+        "0020,0013" => "" # Instance Number
+      }
+      # Raising an error if a non-tag query attribute is used:
+      query_params.keys.each do |tag|
+        raise ArgumentError, "The supplied tag (#{tag}) is not valid. It must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
+      end
+      # Set up the query parameters and carry out the C-FIND:
+      set_data_elements(default_query_params.merge(query_params))
       perform_find
       return @data_results
     end
@@ -123,7 +137,7 @@ module DICOM
     #
     # === Parameters
     #
-    # * <tt>options</tt> -- A hash of parameters.
+    # * <tt>query_params</tt> -- A hash of parameters.
     #
     # === Options
     #
@@ -133,16 +147,32 @@ module DICOM
     # * <tt>"0010,0030"</tt> -- Patient's Birth Date
     # * <tt>"0010,0040"</tt> -- Patient's Sex
     #
+    # === Notes
+    #
+    # * Caution: Calling this method without parameters will instruct your PACS to return info on ALL patients in the database!
+    # * In addition to the above listed attributes, a number of "optional" attributes may be specified.
+    # * For a general list of optional patient level attributes, refer to the DICOM standard, PS3.4 C.6.1.1.2, Table C.6-1.
+    #
     # === Examples
     #
     #   node.find_patients("0010,0010" => "James*")
     #
-    def find_patients(options={})
+    def find_patients(query_params={})
       # Patient Root Query/Retrieve Information Model - FIND:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.1.1"]
-      # Prepare data elements for this operation:
-      set_data_fragment_find_patients
-      set_data_options(options)
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.1.1")
+      # Every query attribute with a value != nil (required) will be sent in the dicom query.
+      # The query parameters with nil-value (optional) are left out unless specified.
+      default_query_params = {
+        "0008,0052" => "PATIENT", # Query/Retrieve Level: "PATIENT"
+        "0010,0010" => "", # Patient's Name
+        "0010,0020" => "" # Patient's ID
+      }
+      # Raising an error if a non-tag query attribute is used:
+      query_params.keys.each do |tag|
+        raise ArgumentError, "The supplied tag (#{tag}) is not valid. It must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
+      end
+      # Set up the query parameters and carry out the C-FIND:
+      set_data_elements(default_query_params.merge(query_params))
       perform_find
       return @data_results
     end
@@ -151,27 +181,41 @@ module DICOM
     #
     # === Parameters
     #
-    # * <tt>options</tt> -- A hash of parameters.
+    # * <tt>query_params</tt> -- A hash of query parameters.
     #
     # === Options
     #
-    # * <tt>"0008,0052"</tt> -- Query/Retrieve Level
     # * <tt>"0008,0060"</tt> -- Modality
-    # * <tt>"0008,103E"</tt> -- Series Description
-    # * <tt>"0020,000D"</tt> -- Study Instance UID
     # * <tt>"0020,000E"</tt> -- Series Instance UID
     # * <tt>"0020,0011"</tt> -- Series Number
     #
+    # === Notes
+    #
+    # * Caution: Calling this method without parameters will instruct your PACS to return info on ALL series in the database!
+    # * In addition to the above listed attributes, a number of "optional" attributes may be specified.
+    # * For a general list of optional series level attributes, refer to the DICOM standard, PS3.4 C.6.1.1.4, Table C.6-3.
+    #
     # === Examples
     #
     #   node.find_series("0020,000D" => "1.2.840.1145.342")
     #
-    def find_series(options={})
+    def find_series(query_params={})
       # Study Root Query/Retrieve Information Model - FIND:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.1"]
-      # Prepare data elements for this operation:
-      set_data_fragment_find_series
-      set_data_options(options)
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.1")
+      # Every query attribute with a value != nil (required) will be sent in the dicom query.
+      # The query parameters with nil-value (optional) are left out unless specified.
+      default_query_params = {
+        "0008,0052" => "SERIES", # Query/Retrieve Level: "SERIES"
+        "0008,0060" => "", # Modality
+        "0020,000E" => "", # Series Instance UID
+        "0020,0011" => "" # Series Number
+      }
+      # Raising an error if a non-tag query attribute is used:
+      query_params.keys.each do |tag|
+        raise ArgumentError, "The supplied tag (#{tag}) is not valid. It must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
+      end
+      # Set up the query parameters and carry out the C-FIND:
+      set_data_elements(default_query_params.merge(query_params))
       perform_find
       return @data_results
     end
@@ -180,34 +224,49 @@ module DICOM
     #
     # === Parameters
     #
-    # * <tt>options</tt> -- A hash of parameters.
+    # * <tt>query_params</tt> -- A hash of query parameters.
     #
     # === Options
     #
     # * <tt>"0008,0020"</tt> -- Study Date
     # * <tt>"0008,0030"</tt> -- Study Time
     # * <tt>"0008,0050"</tt> -- Accession Number
-    # * <tt>"0008,0052"</tt> -- Query/Retrieve Level
-    # * <tt>"0008,0090"</tt> -- Referring Physician's Name
-    # * <tt>"0008,1030"</tt> -- Study Description
-    # * <tt>"0008,1060"</tt> -- Name of Physician(s) Reading Study
     # * <tt>"0010,0010"</tt> -- Patient's Name
     # * <tt>"0010,0020"</tt> -- Patient ID
-    # * <tt>"0010,0030"</tt> -- Patient's Birth Date
-    # * <tt>"0010,0040"</tt> -- Patient's Sex
     # * <tt>"0020,000D"</tt> -- Study Instance UID
     # * <tt>"0020,0010"</tt> -- Study ID
     #
+    # === Notes
+    #
+    # * Caution: Calling this method without parameters will instruct your PACS to return info on ALL studies in the database!
+    # * In addition to the above listed attributes, a number of "optional" attributes may be specified.
+    # * For a general list of optional study level attributes, refer to the DICOM standard, PS3.4 C.6.2.1.2, Table C.6-5.
+    #
     # === Examples
     #
     #   node.find_studies("0008,0020" => "20090604-", "0010,000D" => "123456789")
     #
-    def find_studies(options={})
+    def find_studies(query_params={})
       # Study Root Query/Retrieve Information Model - FIND:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.1"]
-      # Prepare data elements for this operation:
-      set_data_fragment_find_studies
-      set_data_options(options)
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.1")
+      # Every query attribute with a value != nil (required) will be sent in the dicom query.
+      # The query parameters with nil-value (optional) are left out unless specified.
+      default_query_params = {
+        "0008,0020" => "",  # Study Date
+        "0008,0030" => "",  # Study Time
+        "0008,0050" => "",  # Accession Number
+        "0008,0052" => "STUDY", # Query/Retrieve Level:  "STUDY"
+        "0010,0010" => "",  # Patient's Name
+        "0010,0020" => "",  # Patient ID
+        "0020,000D" => "",  # Study Instance UID
+        "0020,0010" => ""  # Study ID
+      }
+      # Raising an error if a non-tag query attribute is used:
+      query_params.keys.each do |tag|
+        raise ArgumentError, "The supplied tag (#{tag}) is not valid. It must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
+      end
+      # Set up the query parameters and carry out the C-FIND:
+      set_data_elements(default_query_params.merge(query_params))
       perform_find
       return @data_results
     end
@@ -236,7 +295,7 @@ module DICOM
     #
     def get_image(path, options={})
       # Study Root Query/Retrieve Information Model - GET:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.3"]
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.3")
       # Transfer the current options to the data_elements hash:
       set_command_fragment_get
       # Prepare data elements for this operation:
@@ -269,7 +328,7 @@ module DICOM
     #
     def move_image(destination, options={})
       # Study Root Query/Retrieve Information Model - MOVE:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.2"]
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.2")
       # Transfer the current options to the data_elements hash:
       set_command_fragment_move(destination)
       # Prepare data elements for this operation:
@@ -301,7 +360,7 @@ module DICOM
     #
     def move_study(destination, options={})
       # Study Root Query/Retrieve Information Model - MOVE:
-      @abstract_syntaxes = ["1.2.840.10008.5.1.4.1.2.2.2"]
+      set_default_presentation_context("1.2.840.10008.5.1.4.1.2.2.2")
       # Transfer the current options to the data_elements hash:
       set_command_fragment_move(destination)
       # Prepare data elements for this operation:
@@ -322,12 +381,12 @@ module DICOM
     #
     def send(files)
       # Prepare the DICOM object(s):
-      objects, @abstract_syntaxes, success, message = load_files(files)
+      objects, success, message = load_files(files)
       if success
         # Open a DICOM link:
         establish_association
-        if @association
-          if @request_approved
+        if association_established?
+          if request_approved?
             # Continue with our c-store operation, since our request was accepted.
             # Handle the transmission:
             perform_send(objects)
@@ -347,11 +406,11 @@ module DICOM
       add_notice("TESTING CONNECTION...")
       success = false
       # Verification SOP Class:
-      @abstract_syntaxes = [VERIFICATION_SOP]
+      set_default_presentation_context(VERIFICATION_SOP)
       # Open a DICOM link:
       establish_association
-      if @association
-        if @request_approved
+      if association_established?
+        if request_approved?
           success = true
         end
         # Close the DICOM link:
@@ -394,6 +453,22 @@ module DICOM
       @notices << notice
     end
 
+    # Returns an array of supported transfer syntaxes for the specified transfer syntax.
+    # For compressed transfer syntaxes, we currently do not support reencoding these to other syntaxes.
+    #
+    def available_transfer_syntaxes(transfer_syntax)
+      case transfer_syntax
+      when IMPLICIT_LITTLE_ENDIAN
+        return [IMPLICIT_LITTLE_ENDIAN, EXPLICIT_LITTLE_ENDIAN]
+      when EXPLICIT_LITTLE_ENDIAN
+        return [EXPLICIT_LITTLE_ENDIAN, IMPLICIT_LITTLE_ENDIAN]
+      when EXPLICIT_BIG_ENDIAN
+        return [EXPLICIT_BIG_ENDIAN, IMPLICIT_LITTLE_ENDIAN]
+      else # Compression:
+        return [transfer_syntax]
+      end
+    end
+
     # Opens a TCP session with the server, and handles the association request as well as the response.
     #
     def establish_association
@@ -401,12 +476,12 @@ module DICOM
       @association = false
       @request_approved = false
       # Initiate the association:
-      @link.build_association_request(@application_context_uid, @abstract_syntaxes, @transfer_syntax, @user_information)
+      @link.build_association_request(@presentation_contexts, @user_information)
       @link.start_session(@host_ip, @port)
       @link.transmit
       info = @link.receive_multiple_transmissions.first
       # Interpret the results:
-      if info[:valid]
+      if info && info[:valid]
         if info[:pdu] == PDU_ASSOCIATION_ACCEPT
           # Values of importance are extracted and put into instance variables:
           @association = true
@@ -445,6 +520,14 @@ module DICOM
       @abort = false
     end
 
+    # Finds and retuns the abstract syntax that is associated with the specified context id.
+    #
+    def find_abstract_syntax(id)
+      @presentation_contexts.each_pair do |abstract_syntax, context_ids|
+        return abstract_syntax if context_ids[id]
+      end
+    end
+
     # Loads one or more DICOM files.
     # Returns an array of DObject instances, an array of unique abstract syntaxes found among the files, a status boolean and a message string.
     #
@@ -457,28 +540,54 @@ module DICOM
       message = ""
       objects = Array.new
       abstracts = Array.new
+      id = 1
+      @presentation_contexts = Hash.new
       files = [files] unless files.is_a?(Array)
       files.each do |file|
         if file.is_a?(String)
           obj = DObject.new(file, :verbose => false)
           if obj.read_success
-            # Load the DICOM object and its abstract syntax:
+            # Load the DICOM object:
             objects << obj
-            abstracts << obj.value("0008,0016")
           else
             status = false
             message = "Failed to successfully parse a DObject for the following string: #{file}"
           end
         elsif file.is_a?(DObject)
           # Load the DICOM object and its abstract syntax:
-          objects << obj
-          abstracts << obj.value("0008,0016")
+          abstracts << file.value("0008,0016")
+          objects << file
         else
           status = false
           message = "Array contains invalid object #{file}."
         end
       end
-      return objects, abstracts.uniq, status, message
+      # Extract available transfer syntaxes for the various sop classes found amongst these objects
+      syntaxes = Hash.new
+      objects.each do |obj|
+        sop_class = obj.value("0008,0016")
+        if sop_class
+          transfer_syntaxes = available_transfer_syntaxes(obj.transfer_syntax)
+          if syntaxes[sop_class]
+            syntaxes[sop_class] << transfer_syntaxes
+          else
+            syntaxes[sop_class] = transfer_syntaxes
+          end
+        else
+          status = false
+          message = "Missing SOP Class UID. Unable to transmit DICOM object"
+        end
+        # Extract the unique variations of SOP Class and syntaxes and construct the presentation context hash:
+        syntaxes.each_pair do |sop_class, ts|
+          selected_transfer_syntaxes = ts.flatten.uniq
+          @presentation_contexts[sop_class] = Hash.new
+          selected_transfer_syntaxes.each do |syntax|
+            @presentation_contexts[sop_class][id] = {:transfer_syntaxes => [syntax]}
+            id += 2
+          end
+        end
+      end
+      return objects, status, message
     end
 
     # Handles the communication involved in a DICOM C-ECHO.
@@ -488,12 +597,11 @@ module DICOM
     def perform_echo
       # Open a DICOM link:
       establish_association
-      if @association
-        if @request_approved
+      if association_established?
+        if request_approved?
           # Continue with our echo, since the request was accepted.
           # Set the query command elements array:
           set_command_fragment_echo
-          presentation_context_id = @approved_syntaxes.to_a.first[1][0] # ID of first (and only) syntax in this Hash.
           @link.build_command_fragment(PDU_DATA, presentation_context_id, COMMAND_LAST_FRAGMENT, @command_elements)
           @link.transmit
           # Listen for incoming responses and interpret them individually, until we have received the last command fragment.
@@ -513,12 +621,11 @@ module DICOM
     def perform_find
       # Open a DICOM link:
       establish_association
-      if @association
-        if @request_approved
+      if association_established?
+        if request_approved?
           # Continue with our query, since the request was accepted.
           # Set the query command elements array:
           set_command_fragment_find
-          presentation_context_id = @approved_syntaxes.to_a.first[1][0] # ID of first (and only) syntax in this Hash.
           @link.build_command_fragment(PDU_DATA, presentation_context_id, COMMAND_LAST_FRAGMENT, @command_elements)
           @link.transmit
           @link.build_data_fragment(@data_elements, presentation_context_id)
@@ -542,10 +649,9 @@ module DICOM
     def perform_get(path)
       # Open a DICOM link:
       establish_association
-      if @association
-        if @request_approved
+      if association_established?
+        if request_approved?
           # Continue with our operation, since the request was accepted.
-          presentation_context_id = @approved_syntaxes.to_a.first[1][0] # ID of first (and only) syntax in this Hash.
           @link.build_command_fragment(PDU_DATA, presentation_context_id, COMMAND_LAST_FRAGMENT, @command_elements)
           @link.transmit
           @link.build_data_fragment(@data_elements, presentation_context_id)
@@ -569,10 +675,9 @@ module DICOM
     def perform_move
       # Open a DICOM link:
       establish_association
-      if @association
-        if @request_approved
+      if association_established?
+        if request_approved?
           # Continue with our operation, since the request was accepted.
-          presentation_context_id = @approved_syntaxes.to_a.first[1][0] # ID of first (and only) syntax in this Hash.
           @link.build_command_fragment(PDU_DATA, presentation_context_id, COMMAND_LAST_FRAGMENT, @command_elements)
           @link.transmit
           @link.build_data_fragment(@data_elements, presentation_context_id)
@@ -593,22 +698,24 @@ module DICOM
     def perform_send(objects)
       objects.each_with_index do |obj, index|
         # Gather necessary information from the object (SOP Class & Instance UID):
-        modality = obj.value("0008,0016")
-        instance = obj.value("0008,0018")
-        if modality and instance
-          # Only send the image if its modality has been accepted by the receiver:
-          if @approved_syntaxes[modality]
+        sop_class = obj.value("0008,0016")
+        sop_instance = obj.value("0008,0018")
+        if sop_class and sop_instance
+          # Only send the image if its sop_class has been accepted by the receiver:
+          if @approved_syntaxes[sop_class]
             # Set the command array to be used:
             message_id = index + 1
-            set_command_fragment_store(modality, instance, message_id)
+            set_command_fragment_store(sop_class, sop_instance, message_id)
             # Find context id and transfer syntax:
-            presentation_context_id = @approved_syntaxes[modality][0]
-            selected_transfer_syntax = @approved_syntaxes[modality][1]
+            presentation_context_id = @approved_syntaxes[sop_class][0]
+            selected_transfer_syntax = @approved_syntaxes[sop_class][1]
             # Encode our DICOM object to a binary string which is split up in pieces, sufficiently small to fit within the specified maximum pdu length:
             # Set the transfer syntax of the DICOM object equal to the one accepted by the SCP:
             obj.transfer_syntax = selected_transfer_syntax
+            # Remove the Meta group, since it doesn't belong in a DICOM file transfer:
+            obj.remove_group(META_GROUP)
             max_header_length = 14
-            data_packages = obj.encode_segments(@max_pdu_length - max_header_length)
+            data_packages = obj.encode_segments(@max_pdu_length - max_header_length, selected_transfer_syntax)
             @link.build_command_fragment(PDU_DATA, presentation_context_id, COMMAND_LAST_FRAGMENT, @command_elements)
             @link.transmit
             # Transmit all but the last data strings:
@@ -643,13 +750,14 @@ module DICOM
       rejected = Hash.new
       # Reset the presentation context instance variable:
       @link.presentation_contexts = Hash.new
+      accepted_pc = 0
       presentation_contexts.each do |pc|
         # Determine what abstract syntax this particular presentation context's id corresponds to:
         id = pc[:presentation_context_id]
         raise "Error! Even presentation context ID received in the association response. This is not allowed according to the DICOM standard!" if id[0] == 0 # If even number.
-        index = (id-1)/2
-        abstract_syntax = @abstract_syntaxes[index]
+        abstract_syntax = find_abstract_syntax(id)
         if pc[:result] == 0
+          accepted_pc += 1
           @approved_syntaxes[abstract_syntax] = [id, pc[:transfer_syntax]]
           @link.presentation_contexts[id] = pc[:transfer_syntax]
         else
@@ -658,16 +766,17 @@ module DICOM
       end
       if rejected.length == 0
         @request_approved = true
-        if @approved_syntaxes.length == 1
+        if @approved_syntaxes.length == 1 and presentation_contexts.length == 1
           add_notice("The presentation context was accepted by host #{@host_ae}.")
         else
-          add_notice("All #{@approved_syntaxes.length} presentation contexts were accepted by host #{@host_ae} (#{@host_ip}).")
+          add_notice("All #{presentation_contexts.length} presentation contexts were accepted by host #{@host_ae} (#{@host_ip}).")
         end
       else
-        @request_approved = false
+        # We still consider the request 'approved' if at least one context were accepted:
+        @request_approved = true if @approved_syntaxes.length > 0
         add_error("One or more of your presentation contexts were denied by host #{@host_ae}!")
-        @approved_syntaxes.each_key {|a| add_error("APPROVED: #{LIBRARY.get_syntax_description(a)}")}
-        rejected.each_key {|r| add_error("REJECTED: #{LIBRARY.get_syntax_description(r)}")}
+        @approved_syntaxes.each_pair {|key, value| add_error("APPROVED: #{LIBRARY.get_syntax_description(key)} (#{LIBRARY.get_syntax_description(value[1])})")}
+        rejected.each_pair {|key, value| add_error("REJECTED: #{LIBRARY.get_syntax_description(key)} (#{LIBRARY.get_syntax_description(value[1])})")}
       end
     end
 
@@ -695,7 +804,7 @@ module DICOM
     #
     def set_command_fragment_echo
       @command_elements = [
-        ["0000,0002", "UI", @abstract_syntaxes.first], # Affected SOP Class UID
+        ["0000,0002", "UI", @presentation_contexts.keys.first], # Affected SOP Class UID
         ["0000,0100", "US", C_ECHO_RQ],
         ["0000,0110", "US", DEFAULT_MESSAGE_ID],
         ["0000,0800", "US", NO_DATA_SET_PRESENT]
@@ -710,7 +819,7 @@ module DICOM
     #
     def set_command_fragment_find
       @command_elements = [
-        ["0000,0002", "UI", @abstract_syntaxes.first], # Affected SOP Class UID
+        ["0000,0002", "UI", @presentation_contexts.keys.first], # Affected SOP Class UID
         ["0000,0100", "US", C_FIND_RQ],
         ["0000,0110", "US", DEFAULT_MESSAGE_ID],
         ["0000,0700", "US", 0], # Priority: 0: medium
@@ -722,7 +831,7 @@ module DICOM
     #
     def set_command_fragment_get
       @command_elements = [
-        ["0000,0002", "UI", @abstract_syntaxes.first], # Affected SOP Class UID
+        ["0000,0002", "UI", @presentation_contexts.keys.first], # Affected SOP Class UID
         ["0000,0100", "US", C_GET_RQ],
         ["0000,0600", "AE", @ae], # Destination is ourselves
         ["0000,0700", "US", 0], # Priority: 0: medium
@@ -734,7 +843,7 @@ module DICOM
     #
     def set_command_fragment_move(destination)
       @command_elements = [
-        ["0000,0002", "UI", @abstract_syntaxes.first], # Affected SOP Class UID
+        ["0000,0002", "UI", @presentation_contexts.keys.first], # Affected SOP Class UID
         ["0000,0100", "US", C_MOVE_RQ],
         ["0000,0110", "US", DEFAULT_MESSAGE_ID],
         ["0000,0600", "AE", destination],
@@ -756,63 +865,6 @@ module DICOM
       ]
     end
 
-    # Sets the data elements used in a query for the images of a particular series.
-    #
-    def set_data_fragment_find_images
-      @data_elements = [
-        ["0008,0018", ""], # SOP Instance UID
-        ["0008,0052", "IMAGE"], # Query/Retrieve Level:  "IMAGE"
-        ["0020,000D", ""], # Study Instance UID
-        ["0020,000E", ""], # Series Instance UID
-        ["0020,0013", ""] # Instance Number
-      ]
-    end
-
-    # Sets the data elements used in a query for patients.
-    #
-    def set_data_fragment_find_patients
-      @data_elements = [
-        ["0008,0052", "PATIENT"], # Query/Retrieve Level:  "PATIENT"
-        ["0010,0010", ""], # Patient's Name
-        ["0010,0020", ""], # Patient ID
-        ["0010,0030", ""], # Patient's Birth Date
-        ["0010,0040", ""] # Patient's Sex
-      ]
-    end
-
-    # Sets the data elements used in a query for the series of a particular study.
-    #
-    def set_data_fragment_find_series
-      @data_elements = [
-        ["0008,0052", "SERIES"], # Query/Retrieve Level: "SERIES"
-        ["0008,0060", ""], # Modality
-        ["0008,103E", ""], # Series Description
-        ["0020,000D", ""], # Study Instance UID
-        ["0020,000E", ""], # Series Instance UID
-        ["0020,0011", ""] # Series Number
-      ]
-    end
-
-    # Sets the data elements used in a query for studies.
-    #
-    def set_data_fragment_find_studies
-      @data_elements = [
-        ["0008,0020", ""], # Study Date
-        ["0008,0030", ""], # Study Time
-        ["0008,0050", ""], # Accession Number
-        ["0008,0052", "STUDY"], # Query/Retrieve Level:  "STUDY"
-        ["0008,0090", ""], # Referring Physician's Name
-        ["0008,1030", ""], # Study Description
-        ["0008,1060", ""], # Name of Physician(s) Reading Study
-        ["0010,0010", ""], # Patient's Name
-        ["0010,0020", ""], # Patient ID
-        ["0010,0030", ""], # Patient's Birth Date
-        ["0010,0040", ""], # Patient's Sex
-        ["0020,000D", ""], # Study Instance UID
-        ["0020,0010", ""] # Study ID
-      ]
-    end
-
     # Sets the data elements used for an image C-GET-RQ.
     #
     def set_data_fragment_get_image
@@ -845,11 +897,11 @@ module DICOM
       ]
     end
 
-    # Transfers the user query options to the @data_elements instance array.
+    # Transfers the user-specified options to the @data_elements instance array.
     #
     # === Restrictions
     #
-    # * Only tag & value pairs for tags which are predefined for the specific query type will be stored!
+    # * Only tag & value pairs for tags which are predefined for the specific request type will be stored!
     #
     def set_data_options(options)
       options.each_pair do |key, value|
@@ -861,13 +913,15 @@ module DICOM
       end
     end
 
-    # Sets the default values for proposed transfer syntaxes.
+    # Creates the presentation context used for the non-file-transmission association requests..
     #
-    def set_default_values
-      # DICOM Application Context Name (unknown if this will vary or is always the same):
-      @application_context_uid = APPLICATION_CONTEXT
-      # Transfer syntax string array (preferred syntax appearing first):
-      @transfer_syntax = [IMPLICIT_LITTLE_ENDIAN, EXPLICIT_LITTLE_ENDIAN, EXPLICIT_BIG_ENDIAN]
+    def set_default_presentation_context(abstract_syntax)
+      raise ArgumentError, "Expected String, got #{abstract_syntax.class}" unless abstract_syntax.is_a?(String)
+      id = 1
+      transfer_syntaxes = [IMPLICIT_LITTLE_ENDIAN, EXPLICIT_LITTLE_ENDIAN, EXPLICIT_BIG_ENDIAN]
+      item = {:transfer_syntaxes => transfer_syntaxes}
+      pc = {id => item}
+      @presentation_contexts = {abstract_syntax => pc}
     end
 
     # Sets the @user_information items instance array.
@@ -884,5 +938,24 @@ module DICOM
       ]
     end
 
+    def association_established?
+      @association == true
+    end
+
+    def request_approved?
+      @request_approved == true
+    end
+
+    def presentation_context_id
+      @approved_syntaxes.to_a.first[1][0] # ID of first (and only) syntax in this Hash.
+    end
+
+    def set_data_elements(options)
+      @data_elements = []
+      options.keys.sort.each do |tag|
+        @data_elements << [ tag, options[tag] ] unless options[tag].nil?
+      end
+    end
+
   end
 end