machine_setup 0.3.0 → 0.4.0

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.email = "robi-wan@suyu.de"
     gem.homepage = "http://github.com/robi-wan/machine_setup"
     gem.authors = ["robi-wan"]
-    gem.add_runtime_dependency "i18n", "~> 0.5"
+    gem.add_runtime_dependency "i18n", "~> 0.6"
     gem.add_runtime_dependency "inifile", "~> 0.4"
     gem.add_runtime_dependency "erubis", "~> 2.7"
     gem.add_development_dependency "shoulda"
@@ -46,7 +46,7 @@ task :test => :check_dependencies
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/examples/ssm/ssm.setup.param

@@ -10,9 +10,9 @@ SetupConfiguration :ssm, :ssm do
     max 0..0
     balance_min 700..729
     balance_max 730..759
-    machine_type :all_machines, 0, 0..999
-    machine_type :ssm_one, 1, 1000..1999
-    machine_type :ssm_two, 2, 2000..2999
+    machine_type :all_machines, 0
+    machine_type :ssm_one, 1
+    machine_type :ssm_two, 2
   end
 
   category :common do
@@ -24,6 +24,7 @@ SetupConfiguration :ssm, :ssm do
     param :grinding_point_height, 6
     param :reference_angle_grinding_drive, 7
     param :grinding_angle_drive_home_mode, 8
+    param :grinding_angle_difference, 10
     param :tooth_area, 9
   end
   

data/examples/ssm/ssm.setup.param.de.yml

@@ -91,9 +91,25 @@ de:
 
                 Achtung: Bei Wechsel des Referenzmodus auch den Parameter 'Referenzwinkel Schleifwinkelmotor' anpassen.
 
+  grinding_angle_difference:
+    name:       "Abweichung Schleifwinkel"
+    comment:    |
+                Technologisch bedingt kann es Abweichung zwischen eingestelltem und tats�chlichem Schleifwinkel geben.
+                �ber diesen Parameter kann diese Abweichung ausgeglichen werden.
+                Die Angabe erfolgt in Grad. Die Angabe erfolgt mit einer Nachkommastelle. Der eingetragene Wert gibt die
+                gemessene Abweichung an. Es sind Angaben zwischen -5,0 und +5,0 m�glich.
+
+
+                Beispiel: Eingestellt im Programm ist ein Schleifwinkel von 22 Grad.
+                Gemessen wurde ein tats�chlicher Schleifwinkel von 22,8 Grad. Die einzutragende Abweichung betr�gt
+                in diesem Fall 0,8 Grad, also ein 8.
+
+
+                Beispiel 2: Eine Abweichung von -2,3 Grad wird eingetragen als -23.
+
   tooth_area:
-    name:     "Schleifwinkelbereich mit Z�hnen"
-    comment:  "Auswahl des Schleifwinkelbereiches, der Z�hne enth�lt. Schleifscheibe wird abgehoben."
+    name:       "Schleifwinkelbereich mit Z�hnen"
+    comment:    "Auswahl des Schleifwinkelbereiches, der Z�hne enth�lt. Schleifscheibe wird abgehoben."
 
   blade_drive_selection:
     name:       "Messerantrieb abgew�hlt=0/Servo=1/FU=2"

data/examples/ssm/ssm.setup.param.en.yml

@@ -80,6 +80,21 @@ en:
 
                 Attention: When changing reference mode do not forget to adjust parameter 'Reference Angle Grinding Angle Drive'.
 
+  grinding_angle_difference:
+    name:       "Difference Grinding Angle"
+    comment:    |
+                Configure the difference between given grinding angle and actual grinding angle measured at blade.
+                Value is given in tenth of degree. Given value stands for measured difference.
+                The range of valid values starts at -5.0 and ends at +5.0.
+
+
+                Example: Programme parameter for grinding angle is 22 degree.
+                Measured grinding angle is 22.8 degree. The difference of the grinding angle is therefore 0.8 degree.
+                The value of this setup parameter has to be 8.
+
+                
+                Example 2: A difference of -2,3 degree has to be entered as -23.
+
   tooth_area:
     name:     "Grinding Angle Area with Teeth"
     comment:  "Grinding disc will lift off from blade at configured grinding area."

data/examples/underleaver/underleaver.setup.param

@@ -10,10 +10,10 @@ SetupConfiguration :underleaver, :ul do
     max 0..0
     balance_min 3000..3029
     balance_max 3030..3059
-    machine_type :all_machines, 0, 0..999
-    machine_type :underleaver_one, 1, 1000..1999
-    machine_type :underleaver_two, 2, 2000..2999
-    machine_type :underleaver_three, 3, 3000..3999
+    machine_type :all_machines, 0
+    machine_type :underleaver_one, 1
+    machine_type :underleaver_two, 2
+    machine_type :underleaver_three, 3
   end
 
   category :common do
@@ -61,6 +61,9 @@ SetupConfiguration :underleaver, :ul do
     param :paper_feed_velocity_ratio, 35 do
         depends_on :paper_feed_continuous_motion
     end
+
+    param :portion_edge_detection, 36
+
   end
 
   category :role_configuration do

data/examples/underleaver/underleaver.setup.param.de.yml

@@ -258,6 +258,17 @@ de:
 
           Beispiel: Ein Wert von 30 bedeutet, dass sich der Blattantrieb 30 Prozent schneller dreht als das Band.
 
+  portion_edge_detection:
+    name: "Portion: ausgewertete Kante"
+    comment: |
+          Welche Kante der Portion soll zur Blattpositionierung verwendet werden?
+          N�tzlich bei mehreren Spuren.
+
+
+          0: Vorderkante
+          1: Mitte der Portion (gemessene Portionsl�nge und eingestellte Blattl�nge werden f�r Auswertung ebenfalls verwendet)
+          2: Hinterkante (gemessene Portionsl�nge und eingestellte Blattl�nge werden f�r Auswertung ebenfalls verwendet)
+
   role_diameter_teached_maximum:
     name: "Gr��ter geteachter Rollendurchmesser [mm]"
     comment: |

data/examples/underleaver/underleaver.setup.param.en.yml

@@ -257,6 +257,17 @@ en:
           Value determines how much faster paper feed runs.
           Values between 0 and 30 are valid.
 
+  portion_edge_detection:
+    name: "Portion: detected edge"
+    comment: |
+          This parameter configures the edge which is used to determine the sheet position.
+          Useful only with multiple tracks.
+
+
+          0: Leading edge
+          1: Center of portion (measured portion length and sheet length are also used in computation)
+          2: Trailing edge (measured portion length and sheet length are also used in computation)
+
   role_diameter_teached_maximum:
     name: "Maximum teached Role Diameter [mm]"
     comment: |

data/lib/setup_configuration/legacy/importer.rb

@@ -84,16 +84,18 @@ module SetupConfiguration
           @settings.machine_type("machine_type_#{number}".to_sym, number, v.to_i)
         end
 
+        #calculate ranges for machine types
         @settings.machine_types.each_with_index do |mt, index|
           ending=mt.range + 999
           if @settings.machine_types[index + 1]
             ending = @settings.machine_types[index + 1].range - 1
           end
-          #mt.range=Range.new(mt.range, ending)
           # this is really ugly
           mt.instance_variable_set( :@range, Range.new(mt.range, ending))
         end
 
+
+
         # languages
         lang = @mps3['SPRACHE']
         lang.each() do |k,v|
@@ -130,7 +132,9 @@ module SetupConfiguration
                 #check for multiple defined parameters (in different categories)
                 #warn and skip
                 if param_by_number(param_number) then
-                  $stderr.puts("WARNING: parameter '#{ param_key(param_number)}' with number '#{param_number}' multiple defined. Duplicate found in category '#{category_name(cat_number)}' will be skipped.")
+                  $stderr.puts("WARNING: parameter '#{ param_key(param_number)}' with number '#{param_number}' multiple defined. Duplicate found in category '#{category_name(cat_number)}'.")
+                  parameter = ParameterReference.new( param_key(param_number) )
+                  cat.parameter << parameter
                 else
                   parameter = Parameter.new(param_number)
                   parameter.depends_on(deps[index])
@@ -146,8 +150,10 @@ module SetupConfiguration
 
         # replace parameter numbers with parameter keys
         parameters.each() do |param|
-          p = param_by_number(param.dependency)
-          param.depends_on(p ? p.key : :none)
+          if param.param? then
+            p = param_by_number(param.dependency)
+            param.depends_on(p ? p.key : :none)
+          end
         end
 
         #get categorie names

data/lib/setup_configuration/legacy/language_context.rb

@@ -11,7 +11,7 @@ module SetupConfiguration
         @lang=lang
         @helper=helper
         @lang_abbr= SetupConfiguration::Translation.language_abbreviation(lang)
-        @output = SetupConfiguration::Translation.translation_files(name).select(){|file| file.include?(@lang_abbr.to_s)}.first
+        @output = SetupConfiguration::Translation.translation_file(name, @lang_abbr)
       end
 
       def category_name(cat)

data/lib/setup_configuration/legacy/legacy.rb

@@ -2,6 +2,5 @@
 require 'inifile'
 
 require File.expand_path(File.dirname(__FILE__) + '/parameter')
-require File.expand_path(File.dirname(__FILE__) + '/category')
 require File.expand_path(File.dirname(__FILE__) + '/language_context')
 require File.expand_path(File.dirname(__FILE__) + '/importer')

data/lib/setup_configuration/legacy/parameter.rb

@@ -19,6 +19,10 @@ module SetupConfiguration
         @machine_type != 0
       end
 
+      def param?
+        true
+      end
+
     end
     
   end

data/lib/setup_configuration/legacy/templates/setup.param.erb

@@ -13,6 +13,7 @@ SetupConfiguration :<%= @name.to_sym %>, :<%= @abbreviation.to_sym %> do
   <% for cat in @categories.sort %>
   category :<%= cat.name %> do
     <% for param in cat.parameter %>
+    <% if param.param? %>
     param :<%= param.key %>, <%= param.number %><% if param.extended? %> do
     <% if param.dep? %>
       depends_on :<%= param.dependency %>
@@ -23,6 +24,9 @@ SetupConfiguration :<%= @name.to_sym %>, :<%= @abbreviation.to_sym %> do
     end
     <% else %>
     
+    <% end %>
+    <% else %>
+    param_ref :<%= param.key %>
     <% end %>
     <% end %>
   end

data/lib/setup_configuration/legacy/templates/setup.param.language.yml.erb

@@ -5,9 +5,11 @@
     name:       "<%= category_name(cat.number) %>"
 
     <% for param in cat.parameter %>
+  <% if param.param? %>
   <%= param.key %>:
     name:       "<%= parameter_name(param.number) %>"
     comment:    "<%= parameter_description(param.number) %>"
 
     <% end %>
   <% end %>
+  <% end %>

data/lib/setup_configuration/setup_config.rb

@@ -181,7 +181,7 @@ module SetupConfiguration
     end
 
     #TODO remove range argument
-    def machine_type(name, number, range)
+    def machine_type(name, number, range=nil)
       machine_type = MachineType.new(name, number, range)
       @machine_types << machine_type
       # generates a method with given machine type name in a module
@@ -346,18 +346,18 @@ module SetupConfiguration
   class MachineType
     include Enumerable
 
-    RANGES = [0..999, 1000..1999, 2000..2499, 2500..2999, 3000..3999, 4000..4999, 5000..5999, 6000..6999].freeze
+    RANGES = [0..999, 1000..1999, 2000..2999, 3000..3999, 4000..4999, 5000..5999, 6000..6999, 7000..7999].freeze
 
     attr_reader :name
     attr_reader :range
     attr_reader :sequence_number
     attr_reader :binary_number
 
-    def initialize(name, sequence_number, range)
+    def initialize(name, sequence_number, range = nil)
       @name=name
       raise RuntimeError.new("ERROR: More than #{RANGES.length} different machine types are not supported: [name=#{name}] [number=#{sequence_number}]") if sequence_number >= RANGES.length
       @sequence_number=sequence_number
-      @range=RANGES[@sequence_number]
+      @range = range ? range : RANGES[@sequence_number]
       if @sequence_number <= 0
         @binary_number=0
       else

data/lib/setup_configuration/translation.rb

@@ -6,8 +6,12 @@ module SetupConfiguration
 
     FILE_EXTENSION="setup.param".freeze
 
+    def self.translation_file(config_name, lang)
+      "#{config_name}.#{FILE_EXTENSION}.#{lang}.yml"
+    end
+
     def self.translation_files(config_name)
-      languages.collect { |lang| "#{config_name}.#{FILE_EXTENSION}.#{lang}.yml" }
+      languages.collect { |lang| translation_file(config_name, lang) }
     end
 
     # Returns all supported setup languages.

data/test/setup_configuration/machine_type_test.rb

@@ -8,6 +8,8 @@ class MachineTypeTest < Test::Unit::TestCase
       @all_machines = SetupConfiguration::MachineType.new(:all_machines, 0, 0..999)
       @machine_one = SetupConfiguration::MachineType.new(:machine_one, 1, 1000..1999)
       @machine_three = SetupConfiguration::MachineType.new(:machine_one, 3, 3000..3999)
+      @machine_four = SetupConfiguration::MachineType.new(:machine_one, 4)
+      @machine_five = SetupConfiguration::MachineType.new(:machine_one, 5)
     end
 
     should "return its name" do
@@ -16,18 +18,25 @@ class MachineTypeTest < Test::Unit::TestCase
 
     should "return its machine type number range" do
       assert_equal 0..999, @all_machines.range
+      #default machine type ranges
+      assert_equal 4000..4999, @machine_four.range
+      assert_equal 5000..5999, @machine_five.range
     end
 
     should "return its sequence number" do
       assert_equal 0, @all_machines.sequence_number
       assert_equal 1, @machine_one.sequence_number
       assert_equal 3, @machine_three.sequence_number
+      assert_equal 4, @machine_four.sequence_number
+      assert_equal 5, @machine_five.sequence_number
     end
 
     should "return its binary number" do
       assert_equal 0, @all_machines.binary_number
       assert_equal 1, @machine_one.binary_number
       assert_equal 4, @machine_three.binary_number
+      assert_equal 8, @machine_four.binary_number
+      assert_equal 16, @machine_five.binary_number
     end
 
   end

metadata

@@ -2,7 +2,7 @@
 name: machine_setup
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
   - robi-wan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-13 00:00:00 Z
+date: 2011-09-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: i18n
@@ -20,7 +20,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: "0.5"
+            version: "0.6"
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -88,7 +88,6 @@ files:
   - lib/setup_configuration/core_ext/array.rb
   - lib/setup_configuration/core_ext/array/grouping.rb
   - lib/setup_configuration/generator_module.rb
-  - lib/setup_configuration/legacy/category.rb
   - lib/setup_configuration/legacy/importer.rb
   - lib/setup_configuration/legacy/language_context.rb
   - lib/setup_configuration/legacy/legacy.rb
@@ -136,13 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Generating configuration for machine setup parameters.
-test_files: 
-  - test/setup_configuration/machine_type_test.rb
-  - test/setup_configuration/parameter_factory_test.rb
-  - test/setup_configuration/parameter_test.rb
-  - test/setup_configuration/setup_configuration_test.rb
-  - test/test_helper.rb
+test_files: []
+

data/lib/setup_configuration/legacy/category.rb

@@ -1,22 +0,0 @@
-module SetupConfiguration
-
-  module Legacy
-
-    class Category
-      include Enumerable
-
-      attr_accessor :number
-      attr_accessor :name
-      attr_accessor :parameter
-
-      def initialize()
-        @parameter = []
-      end
-
-      def <=>(parameter)
-        self.number <=> parameter.number
-      end
-
-    end
-  end
-end