ctioga2 0.11 → 0.12

data/lib/ctioga2/graphics/styles/factory.rb

@@ -40,6 +40,9 @@ module CTioga2
           # parameter. It is a hash. 
           attr_accessor :sets
 
+          # The name of the default set, when it isn't 'default'
+          attr_accessor :default_set
+
           # The description of the parameter.
           attr_accessor :description
           
@@ -60,8 +63,16 @@ module CTioga2
           def initialize(name, type, sets, description, 
                          short_option = nil, disable_cmds = false)
             @name = name
-            @type = type 
-            @sets = sets
+            @type = type
+            if sets
+              # If the sets is an array, it is of the form [sets, 'default set']
+              if sets.is_a? Array
+                @sets = sets[0]
+                @default_set = sets[1]
+              else
+                @sets = sets
+              end
+            end
             @description = description
             @short_option = short_option
             @disable_commands = disable_cmds
@@ -81,7 +92,9 @@ module CTioga2
           # Returns a suitable default set for the given object.
           def default_set
             return nil unless @sets
-            if @sets.key? 'default'
+            if @default_set
+              return @sets[@default_set]
+            elsif @sets.key? 'default'
               return @sets['default']
             else
               @sets.each do |k,v|
@@ -249,22 +262,36 @@ module CTioga2
           }
           @parameters_carrays = {}
           for target, param in self.class.parameters
+            # There should be a way to do that !
             set = param.default_set
             if set
               @parameters_carrays[target] = CircularArray.new(set)
             end
           end
+
+          @next_style = nil
+        end
+
+        # Sets the style to be returned from the next call to #next
+        # (not counting the effect of the options passed)
+        def set_next_style(stl)
+          @next_style = stl
         end
 
         # Gets the style for the next curve. The _one_time_ hash
         # contains values 'parameter name' (name, and not target) =>
         # value that are used for this time only.
         def next(one_time = {})
-          base = {}
-          for target, array in @parameters_carrays
-            base[target] = array.next
+          if @next_style
+            base = @next_style
+            @next_style = nil
+          else
+            base = {}
+            for target, array in @parameters_carrays
+              base[target] = array.next
+            end
+            base.merge!(@override_parameters)
           end
-          base.merge!(@override_parameters)
           base.merge!(hash_name_to_target(one_time))
           return CurveStyle.from_hash(resolve_links(base))
         end
@@ -327,18 +354,29 @@ module CTioga2
         simple_parameter 'line_style', 'line style', Sets::LineStyleSets
 
         # Markers
-        simple_parameter  'marker', 'marker', Sets::MarkerSets, '-m'
+        simple_parameter 'marker', 'marker', Sets::MarkerSets, '-m'
 
         simple_parameter 'marker_color', "marker color", Sets::ColorSets
 
+        simple_parameter 'marker_fill_color', "marker fill color", [Sets::ColorSets, 'nil']
+
+        simple_parameter 'marker_line_color', "marker stroke color", [Sets::ColorSets, 'nil']
+
         simple_parameter 'marker_scale', "marker scale", Sets::LineWidthSets
 
+        simple_parameter 'marker_angle', "marker angle", nil
+
+        simple_parameter 'marker_line_width', "marker line width", nil 
+
         simple_parameter 'marker_min_scale', "marker scale", nil
 
         # Error bars:
         simple_parameter 'error_bar_color', "error bar color", 
         Sets::ColorSets
 
+        simple_parameter 'error_bar_line_width', "error bar line width", 
+        Sets::LineWidthSets
+
         # Location:
         define_parameter 'location_xaxis', 'xaxis', 
         nil, "X axis", nil, true
@@ -470,7 +508,40 @@ module CTioga2
           return tv
         end
       end
-    end
+
+      SkipCommand = 
+        Cmd.new("skip",nil,"--skip", 
+                [], {'number' => CmdArg.new("integer")}
+               ) do |plotmaker, opts|
+        number = opts['number'] || 1
+        fct = plotmaker.curve_generator.style_factory
+        while number > 0
+          number -= 1
+          fct.next
+        end
+      end
+
+      SkipCommand.describe('Skips next curve style', 
+                           <<EOH, CurveStyleFactory::CurveStyleGroup)
+This command acts as if one (or @number@) dataset had been drawn with 
+respect to the style of the next dataset to be drawn.
+EOH
+
+      ReuseCommand = 
+        Cmd.new("reuse-style",nil,"--reuse-style", 
+                [CmdArg.new('object')], {}
+               ) do |plotmaker, obj, opts|
+        stl = obj.curve_style.to_hash
+        plotmaker.curve_generator.style_factory.set_next_style(stl)
+      end
+
+      ReuseCommand.describe('Reuse the style of a previous curve', 
+                            <<EOH, CurveStyleFactory::CurveStyleGroup)
+After using this command, the next curve will have the same style as the 
+curve whose name was given as the first argument (it is the name given to 
+the `/id=` option to plot.
+EOH
+end
 
     # Now, we document some aspects of the above created commands
     c = Commands::Command

data/lib/ctioga2/graphics/styles/plot.rb

@@ -439,7 +439,7 @@ EOH
             style = AxisStyle.current_axis_style(plotmaker, w)
             style.set_from_hash(opts)
           rescue Exception => e
-            error {"Error while setting style of axis: #{w} -- #{e}"}
+            Log::error {"Error while setting style of axis: #{w} -- #{e}"}
           end
         end
       end

data/lib/ctioga2/graphics/styles/scope.rb

@@ -0,0 +1,72 @@
+# scope.rb: containers that provide translation and scaling capacities
+# copyright (c) 2015 by Vincent Fourmond
+  
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+  
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details (in the COPYING file).
+
+require 'ctioga2/utils'
+require 'ctioga2/log'
+
+# This module contains all the classes used by ctioga
+module CTioga2
+
+  module Graphics
+
+    # All the styles
+    module Styles
+
+      # This style represents a scope, ie something that translates
+      # (first) and scales (second) figure coordinates.
+      class ScopeStyle < BasicStyle
+
+        typed_attribute 'xshift', 'dimension'
+        typed_attribute 'xscale', 'float'
+
+        typed_attribute 'yshift', 'dimension'
+        typed_attribute 'yscale', 'float'
+
+
+        def initialize
+        end
+
+        # applies the transformation to the current figure coordinates
+        def apply_to_figure(t)
+          bl = t.bounds_left
+          br = t.bounds_right
+          bt = t.bounds_top
+          bb = t.bounds_bottom
+
+          if @xshift
+            dx = @xshift.to_figure(t,:x)
+            bl -= dx
+            br -= dx
+          end
+
+          if @yshift
+            dy = @yshift.to_figure(t,:y)
+            bt -= dy
+            bb -= dy
+          end
+
+          if @xscale
+            bl, br = *Utils::scale_segment(bl, br, 1/@xscale)
+          end
+          if @yscale
+            bt, bb = *Utils::scale_segment(bt, bb, 1/@yscale)
+          end
+
+          t.set_bounds([bl, br, bt, bb])
+        end
+
+      end
+    end
+  end
+end
+

data/lib/ctioga2/graphics/styles/sets.rb

@@ -41,8 +41,9 @@ module CTioga2
           [LightPlum, PaleGreen, Gold, RedBrown, SkyBlue ],
           "gnuplot" => 
           [Red, [0,1.0,0], Blue, Magenta, Cyan, Yellow, Black, Coral, Gray],
+          'nil' => [nil]
         }
-        
+
         begin
           t = Tioga::FigureMaker.new
           lst = []

data/lib/ctioga2/graphics/types.rb

@@ -44,7 +44,7 @@ module CTioga2
       Dash_Dot_Dot = Line_Type_Dash_Dot_Dot
     end
     
-    NoRE = /no(ne)?|off/i
+    NoRE = /no(ne)?|off|false/i
 
     ColorType = CmdType.new('color', {
                               :type => :tioga_color,

data/lib/ctioga2/graphics/types/dimensions.rb

@@ -51,10 +51,58 @@ module CTioga2
         # _value_ oriented along the given _orientation_
         def initialize(type, value, orientation = :x)
           @type = type
+          if not @type.is_a? Symbol
+            raise "Invalid value for the dimension type: '#{@type}'"
+          end
           @value = value
           @orientation = orientation
         end
 
+        def self.make_dimension(val, orient = :x, default = :figure)
+          if val.is_a? Dimension
+            return val
+          else
+            return Dimension.new(default, val, orient)
+          end
+        end
+
+        # Gets the angle along the given direction
+        def self.get_angle(t, dx, dy)
+          dx = make_dimension(dx, :x).to_bp(t)
+          dy = make_dimension(dy, :y).to_bp(t)
+          return 180 * Math::atan2(dy, dx)/Math::PI
+        end
+
+        def -@
+          return Dimension.new(@type, -@value, @orientation)
+        end
+
+        # Returns a dimension corresponding to the distance.
+        def self.get_distance(t, dx, dy)
+          dx = make_dimension(dx, :x).to_bp(t)
+          dy = make_dimension(dy, :y).to_bp(t)
+          return Dimension.new(:bp, (dx**2 + dy**2)**0.5)
+        end
+
+        # Adjusts the given line by adding the dimensions on the left
+        # and on the right (can be negative).
+        #
+        # Returns the new [x1, y1, x2, y2]
+        def self.adjust_line(t, x1, y1, x2, y2, left, right)
+          dx = x2 - x1
+          dy = y2 - y1
+          dst = get_distance(t, x2-x1, y2-y1).to_bp(t)
+          lf = left.to_bp(t)/dst
+          rf = right.to_bp(t)/dst
+
+          x1 -= lf * dx
+          y1 -= lf * dy
+          x2 += rf * dx
+          y2 += rf * dy
+          return [x1, y1, x2, y2]
+        end
+          
+
         # Converts the Dimension to the *figure* coordinates of the
         # *current* figure in _t_.
         #

data/lib/ctioga2/log.rb

@@ -35,26 +35,31 @@ module CTioga2
     # is not implemented yet.
     def debug(channel = nil)
       @@logger.debug {yield + Log.context}
+      @@counts[:debug] += 1
     end
 
     # Prints a warning message
     def warn
       @@logger.warn {yield + Log.context} 
+      @@counts[:warn] += 1
     end
 
     # Prints an informational message
     def info
       @@logger.info {yield + Log.context}
+      @@counts[:info] += 1
     end
 
     # Prints an error message
     def error
       @@logger.error {yield + Log.context}
+      @@counts[:error] += 1
     end
 
     # Prints a fatal error message and initiates program termination.
     def fatal
       @@logger.fatal {yield + Log.context}
+      @@counts[:fatal] += 1     # Though not very useful
       exit 1                    # Fatal error.
     end
 
@@ -70,8 +75,15 @@ module CTioga2
       Logger::Formatter::Format.replace("[%4$s] %6$s\n")
       @@logger = Logger.new(stream)
       @@logger.level = Logger::WARN # Warnings and more only by default
+      @@counts = {}
+      for k in [:error, :debug, :warn, :info, :fatal]
+        @@counts[k] = 0
+      end
     end
 
+    def self.counts
+      return @@counts
+    end
 
     # Logs to the target file, and fall back onto stderr should
     # opening fail.

data/lib/ctioga2/metabuilder/type.rb

@@ -87,6 +87,8 @@ module CTioga2
       # to a Type child
       @@types = { }
 
+      @@type_names = {}
+
       # The initial type specification that was given to the Type
       attr_accessor :type
 
@@ -144,6 +146,7 @@ module CTioga2
             "from #{@@types[name]} to #{self}" }
         end
         @@types[name] = self
+        @@type_names[self] = name
         self.send(:define_method,:type_name) do
           public_name
         end
@@ -190,31 +193,40 @@ module CTioga2
       # function that can take advantage of a few general features. It
       # is recommanded to define a #string_to_type_internal function
       # rather to redefine #string_to_type
-      def string_to_type(string)
-        # First, passthrough
-        if @passthrough && @passthrough === string
-          return stt_run_hook(string)
-        end
-        # First, shortcuts:
-        if @shortcuts and @shortcuts.key? string
-          return stt_run_hook(@shortcuts[string])
-        end
-        if @re_shortcuts
-          for k, v in @re_shortcuts
-            if string =~ k
-              return stt_run_hook(v)
+      def string_to_type(string, tn = nil)
+        begin
+          # First, passthrough
+          if @passthrough && @passthrough === string
+            return stt_run_hook(string)
+          end
+          # First, shortcuts:
+          if @shortcuts and @shortcuts.key? string
+            return stt_run_hook(@shortcuts[string])
+          end
+          if @re_shortcuts
+            for k, v in @re_shortcuts
+              if string =~ k
+                return stt_run_hook(v)
+              end
             end
           end
-        end
 
-        # Then, constants lookup.
-        if @type.key?(:namespace)
-          begin
-            return stt_run_hook(lookup_const(string))
-          rescue IncorrectInput
+          # Then, constants lookup.
+          if @type.key?(:namespace)
+            begin
+              return stt_run_hook(lookup_const(string))
+            rescue IncorrectInput
+            end
           end
+          return stt_run_hook(string_to_type_internal(string))
+        rescue Exception => e
+          txt = if tn
+                  "to type '#{tn}' failed:\n\t -> "
+                else
+                  "failed: "
+                end
+          raise "Conversion of '#{string}' #{txt}#{e.message}"
         end
-        return stt_run_hook(string_to_type_internal(string))
       end
 
       # This function does the exact opposite of the #string_to_type

data/lib/ctioga2/metabuilder/types/strings.rb

@@ -34,7 +34,7 @@ module CTioga2
           return 'text'
         end
         
-        def string_to_type(str)
+        def string_to_type_internal(str)
           return str
         end
       end
@@ -67,7 +67,7 @@ module CTioga2
           return 'regexp'
         end
         
-        def string_to_type(str)
+        def string_to_type_internal(str)
           if str =~ /^\/(.*)\/$/
             return Regexp.new($1)
           else