rtp-connect 1.6 → 1.7

data/lib/rtp-connect/site_setup.rb

@@ -24,6 +24,9 @@ module RTP
     attr_reader :couch_longitudinal
     attr_reader :couch_angle
     attr_reader :couch_pedestal
+    attr_reader :table_top_vert_displacement
+    attr_reader :table_top_long_displacement
+    attr_reader :table_top_lat_displacement
 
     # Creates a new SiteSetup by parsing a RTPConnect string line.
     #
@@ -33,31 +36,8 @@ module RTP
     # @raise [ArgumentError] if given a string containing an invalid number of elements
     #
     def self.load(string, parent)
-      # Get the quote-less values:
-      values = string.to_s.values
-      low_limit = 5
-      high_limit = 16
-      raise ArgumentError, "Invalid argument 'string': Expected at least #{low_limit} elements, got #{values.length}." if values.length < low_limit
-      RTP.logger.warn "The number of elements (#{values.length}) for this SiteSetup record exceeds the known number of data items for this record (#{high_limit}). This may indicate an invalid record or that the RTP format has recently been expanded with new items." if values.length > high_limit
       s = self.new(parent)
-      # Assign the values to attributes:
-      s.keyword = values[0]
-      s.rx_site_name = values[1]
-      s.patient_orientation = values[2]
-      s.treatment_machine = values[3]
-      s.tolerance_table = values[4]
-      s.iso_pos_x = values[5]
-      s.iso_pos_y = values[6]
-      s.iso_pos_z = values[7]
-      s.structure_set_uid = values[8]
-      s.frame_of_ref_uid = values[9]
-      s.couch_vertical = values[10]
-      s.couch_lateral = values[11]
-      s.couch_longitudinal = values[12]
-      s.couch_angle = values[13]
-      s.couch_pedestal = values[14]
-      s.crc = values[-1]
-      return s
+      s.load(string)
     end
 
     # Creates a new SiteSetup.
@@ -65,10 +45,32 @@ module RTP
     # @param [Record] parent a record which is used to determine the proper parent of this instance
     #
     def initialize(parent)
+      super('SITE_SETUP_DEF', 5, 19)
       # Parent relation (always expecting a Prescription here):
       @parent = get_parent(parent.to_prescription, Prescription)
       @parent.add_site_setup(self)
-      @keyword = 'SITE_SETUP_DEF'
+      @attributes = [
+        # Required:
+        :keyword,
+        :rx_site_name,
+        :patient_orientation,
+        :treatment_machine,
+        # Optional:
+        :tolerance_table,
+        :iso_pos_x,
+        :iso_pos_y,
+        :iso_pos_z,
+        :structure_set_uid,
+        :frame_of_ref_uid,
+        :couch_vertical,
+        :couch_lateral,
+        :couch_longitudinal,
+        :couch_angle,
+        :couch_pedestal,
+        :table_top_vert_displacement,
+        :table_top_long_displacement,
+        :table_top_lat_displacement
+      ]
     end
 
     # Checks for equality.
@@ -105,31 +107,6 @@ module RTP
       state.hash
     end
 
-    # Collects the values (attributes) of this instance.
-    #
-    # @note The CRC is not considered part of the actual values and is excluded.
-    # @return [Array<String>] an array of attributes (in the same order as they appear in the RTP string)
-    #
-    def values
-      return [
-        @keyword,
-        @rx_site_name,
-        @patient_orientation,
-        @treatment_machine,
-        @tolerance_table,
-        @iso_pos_x,
-        @iso_pos_y,
-        @iso_pos_z,
-        @structure_set_uid,
-        @frame_of_ref_uid,
-        @couch_vertical,
-        @couch_lateral,
-        @couch_longitudinal,
-        @couch_angle,
-        @couch_pedestal
-      ]
-    end
-
     # Encodes the SiteSetup object + any hiearchy of child objects,
     # to a properly formatted RTPConnect ascii string.
     #
@@ -155,18 +132,6 @@ module RTP
       self
     end
 
-    # Sets the keyword attribute.
-    #
-    # @note Since only a specific string is accepted, this is more of an argument check than a traditional setter method
-    # @param [#to_s] value the new attribute value
-    # @raise [ArgumentError] if given an unexpected keyword
-    #
-    def keyword=(value)
-      value = value.to_s.upcase
-      raise ArgumentError, "Invalid keyword. Expected 'SITE_SETUP_DEF', got #{value}." unless value == "SITE_SETUP_DEF"
-      @keyword = value
-    end
-
     # Sets the rx_site_name attribute.
     #
     # @param [nil, #to_s] value the new attribute value
@@ -279,6 +244,30 @@ module RTP
       @couch_pedestal = value && value.to_s.strip
     end
 
+    # Sets the table_top_vert_displacement attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def table_top_vert_displacement=(value)
+      @table_top_vert_displacement = value && value.to_s.strip
+    end
+
+    # Sets the table_top_long_displacement attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def table_top_long_displacement=(value)
+      @table_top_long_displacement = value && value.to_s.strip
+    end
+
+    # Sets the table_top_lat_displacement attribute.
+    #
+    # @param [nil, #to_s] value the new attribute value
+    #
+    def table_top_lat_displacement=(value)
+      @table_top_lat_displacement = value && value.to_s.strip
+    end
+
 
     private
 

data/lib/rtp-connect/version.rb

@@ -1,6 +1,6 @@
 module RTP
 
   # The RTPConnect library version string.
-  VERSION = '1.6'
+  VERSION = '1.7'
 
 end

data/rakefile.rb

@@ -16,7 +16,6 @@ require 'yard'
 gem_spec = eval(File.read('rtp-connect.gemspec'))
 Gem::PackageTask.new(gem_spec) do |pkg|
   pkg.gem_spec = gem_spec
-  #pkg.need_tar = true
 end
 
 # RSpec 2:

data/rtp-connect.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
   s.license = 'GPLv3'
   s.description = 'RTPConnect is a file format used in radiotherapy for export & import of treatment planning data.'
   s.files = Dir["{lib}/**/*", "[A-Z]*"]
-  s.rubyforge_project = 'rtp-connect'
 
   s.required_ruby_version = '>= 1.9.3'
 
-  s.add_development_dependency('bundler', '~> 1.3')
-  s.add_development_dependency('dicom', '~> 0.9.5')
-  s.add_development_dependency('mocha', '~> 0.13')
-  s.add_development_dependency('rake', '~> 0.9.6')
-  s.add_development_dependency('rspec', '~> 2.13')
-  s.add_development_dependency('yard', '~> 0.8.5')
+  s.add_development_dependency('bundler', '~> 1.6')
+  s.add_development_dependency('dicom', '~> 0.9', '>= 0.9.6')
+  s.add_development_dependency('mocha', '~> 1.1')
+  s.add_development_dependency('rake', '~> 10.3')
+  s.add_development_dependency('redcarpet', '~> 3.1')
+  s.add_development_dependency('rspec', '~> 3.0')
+  s.add_development_dependency('yard', '~> 0.8', '>= 0.8.7')
 end

metadata

@@ -1,112 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: rtp-connect
 version: !ruby/object:Gem::Version
-  version: '1.6'
-  prerelease: 
+  version: '1.7'
 platform: ruby
 authors:
 - Christoffer Lervag
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: dicom
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0.9'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '10.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0.8'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '0.8'
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 description: RTPConnect is a file format used in radiotherapy for export & import
   of treatment planning data.
 email: chris.lervag@gmail.com
@@ -114,10 +127,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- COPYING
+- Gemfile
+- Gemfile.lock
+- README.md
+- lib/rtp-connect.rb
 - lib/rtp-connect/constants.rb
 - lib/rtp-connect/control_point.rb
 - lib/rtp-connect/dose_tracking.rb
 - lib/rtp-connect/extended_field.rb
+- lib/rtp-connect/extended_plan.rb
 - lib/rtp-connect/field.rb
 - lib/rtp-connect/logging.rb
 - lib/rtp-connect/methods.rb
@@ -130,41 +150,31 @@ files:
 - lib/rtp-connect/site_setup.rb
 - lib/rtp-connect/variables.rb
 - lib/rtp-connect/version.rb
-- lib/rtp-connect.rb
-- CHANGELOG.rdoc
-- COPYING
-- Gemfile
-- Gemfile.lock
 - rakefile.rb
-- README.rdoc
 - rtp-connect.gemspec
 homepage: https://github.com/dicom/rtp-connect
 licenses:
 - GPLv3
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -111446803
 requirements: []
-rubyforge_project: rtp-connect
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Library for handling RTPConnect files.
 test_files: []
 has_rdoc: