ctioga2 0.4 → 0.5

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 359 $', '$Date: 2012-12-26 10:45:35 +0100 (Wed, 26 Dec 2012) $')
+  Version::register_svn_info('$Revision: 387 $', '$Date: 2013-03-12 09:33:37 +0100 (Tue, 12 Mar 2013) $')
 
   module Graphics
 
@@ -27,16 +27,19 @@ module CTioga2
       class LegendStorageStyle < BasicStyle
 
         # The distance between two lines, a Types::Dimension object.
-        typed_attribute :dy, 'dimension'
+        deprecated_attribute :dy, 'dimension', "use vpadding instead"
+
+        # The minimum distance between successive vertical elements
+        typed_attribute :vpadding, 'dimension'
 
         # The width of the legend pictogram, a Types::Dimension object.
-        attr_accessor :picto_width
+        typed_attribute :picto_width, 'dimension'
 
         # The height of the legend pictogram, a Types::Dimension object.
-        attr_accessor :picto_height
+        typed_attribute :picto_height, 'dimension'
 
         # The distance between the legend pictogram and the text
-        attr_accessor :picto_to_text
+        typed_attribute :picto_to_text, 'dimension'
 
         # The overall scale of the legend
         typed_attribute :scale, 'float'
@@ -56,7 +59,10 @@ module CTioga2
         typed_attribute :frame_padding, 'dimension'
 
         def initialize
-          @dy = Types::Dimension.new(:dy, 1.6, :y)
+
+          # @dy = Types::Dimension.new(:dy, 1.6, :y)
+
+          @vpadding = Types::Dimension.new(:dy, 0.3, :y)
 
           @picto_width = Types::Dimension.new(:dy, 1.6, :x)
           @picto_height = Types::Dimension.new(:dy, 0.6, :y)
@@ -71,6 +77,43 @@ module CTioga2
           
           @frame_padding = Types::Dimension.from_text("1mm", :x)
         end
+
+        def dy_to_figure(t)
+
+          # Defaults to one line height + the padding
+
+          if @dy
+            return @dy.to_figure(t, :y)
+          end
+
+          line = Types::Dimension.new(:dy, 1, :y) 
+          return line.to_figure(t, :y) + @vpadding.to_figure(t, :y)
+        end
+
+        def vpadding_to_figure(t)
+          if @dy 
+            line = Types::Dimension.new(:dy, 1, :y) 
+            return (@dy.to_figure(t, :y) - line.to_figure(t, :y))
+          end
+          return @vpadding.to_figure(t, :y)
+        end
+
+      end
+
+      class MultiColumnLegendStyle < BasicStyle
+
+        # Padding !
+        typed_attribute :dx, 'dimension'
+
+        # Number of columns
+        typed_attribute :columns, 'integer'
+        
+        def initialize()
+
+          @dx = Types::Dimension.new(:dy, 0.2, :x)
+
+          @columns = 2
+        end
       end
     end
   end

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

@@ -19,7 +19,7 @@ require 'ctioga2/graphics/coordinates'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 370 $', '$Date: 2012-12-28 17:40:18 +0100 (Fri, 28 Dec 2012) $')
+  Version::register_svn_info('$Revision: 432 $', '$Date: 2013-08-23 19:06:36 +0200 (Fri, 23 Aug 2013) $')
 
   module Graphics
 
@@ -471,7 +471,7 @@ EOH
       X2Command = 
         Cmd.new('x2', nil, '--x2', []) do |plotmaker|
         plotmaker.interpreter.
-          run_commands("xaxis(top)\naxis-style(top,decoration=full)")
+          run_commands("xaxis top\naxis-style top /decoration=full")
       end
 
       X2Command.describe("Switches to top axis for subsequent curves", 
@@ -479,14 +479,14 @@ EOH
 Switches to using the top axis for X axis for the subsequent curves,
 and turns on full decoration for the right axis. Shortcut for:
 
-# xaxis(top)
-# axis-style(top,decoration=full)
+# xaxis top
+# axis-style top /decoration=full
 EOH
 
       Y2Command = 
         Cmd.new('y2', nil, '--y2', []) do |plotmaker|
         plotmaker.interpreter.
-          run_commands("yaxis(right)\naxis-style(right,decoration=full)")
+          run_commands("yaxis right\naxis-style right /decoration=full")
       end
 
       Y2Command.describe("Switches to right axis for subsequent curves", 
@@ -494,8 +494,8 @@ EOH
 Switches to using the right axis for Y axis for the subsequent curves,
 and turns on full decoration for the right axis. Shortcut for:
 
-# yaxis(right)
-# axis-style(right,decoration=full)
+# yaxis right
+# axis-style right /decoration=full
 EOH
 
       NewZAxisCommand = 
@@ -529,14 +529,15 @@ EOH
       LabelStyleCommand.describe("Sets the style of the given label", 
                                  <<"EOH", AxisGroup)
 Sets the style of the given label (see the type {type: label} for more
-information).
+information). See {command: define-text-style} for detailed information 
+about the meaning of the options.
 
 The option text permits to also set the text of the label (does not
 work for ticks).
 
 For tick labels, setting the color option also sets the color for the
 lines of the corresponding axis. If you don't want that, you can 
-override the color using the /stroke_color option of 
+override the color using the @stroke-color@ option of 
 {command: axis-style}. This will only work with Tioga version 1.11 or 
 greater.
 EOH

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

@@ -243,12 +243,12 @@ the @/base-style@ option to the {command: draw-arrow} command.
 Meaning of the style parameters:
 
  * @color@, @style@ and @width@: same as in {command: define-line-style}
- * @head_marker@, @tail_marker@: a {type: marker} to be used for the head 
+ * @head-marker@, @tail-marker@: a {type: marker} to be used for the head 
    or for the tail
- * @head_scale@, @tail_scale@: scale of the head or tail markers
- * @head_angle@, @tail_angle@: rotate the head or the tail by that many
+ * @head-scale@, @tail-scale@: scale of the head or tail markers
+ * @head-angle@, @tail-angle@: rotate the head or the tail by that many
    degrees
- * @head_color@, @tail_color@: the {type: color} of the head or tail
+ * @head-color@, @tail-color@: the {type: color} of the head or tail
 EOD
 
       StyleSheetCommands['box'].long_description = <<EOD
@@ -259,8 +259,8 @@ the @/base-style@ option to the {command: draw-box} command.
 Meaning of the style parameters:
 
  * @color@, @style@ and @width@: same as in {command: define-line-style}
- * @fill_color@: fill color for the box
- * @fill_transparency@: the transparency for the fill, from 0 to 1
+ * @fill-color@: fill color for the box
+ * @fill-transparency@: the transparency for the fill, from 0 to 1
 EOD
 
       StyleSheetCommands['text'].long_description = <<EOD
@@ -304,12 +304,12 @@ Meaning of the style parameters:
 
  * @alignment@, @justification@, @angle@, @color@ and @scale@: 
    as in {command: define-text-style}
- * @fill_color@ and @stroke_color@: markers are both stroked and filled,
+ * @fill-color@ and @stroke_color@: markers are both stroked and filled,
    you can control all colors in one go using @color@ or specifying each
-   with @fill_color@ and @stroke_color@
+   with @fill-color@ and @stroke_color@
  * @font@: is a PDF font number (from 1 to 14), only used for marker
    strings
- * @horizontal_scale@, @vertical_scale@: scales the marker only
+ * @horizontal-scale@, @vertical-scale@: scales the marker only
    horizontally or vertically
 EOD
 
@@ -334,12 +334,12 @@ Sets the style for a whole axis. All axis styles descend from the
 
 Axis styles have lots of parameters:
 
- * @axis_label_@ and @tick_label_@ parameters are title style parameters
+ * @axis-label-@ and @tick-label-@ parameters are title style parameters
    whose meaning is given in {command: define-title-style}, that affect
    ticks and axis labels
  * @decoration@: a {type: axis-decoration} that specify which ticks and 
    tick labels to draw
- * @background_lines_@ parameters define the style of background lines, 
+ * @background-lines-@ parameters define the style of background lines, 
    as in {command: define-line-style}
 EOD
       

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 370 $', '$Date: 2012-12-28 17:40:18 +0100 (Fri, 28 Dec 2012) $')
+  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
 
   module Graphics
 
@@ -36,11 +36,12 @@ module CTioga2
 
         # The 'shift' of the text. Only meaningful for axes and tick
         # labels, where the position of the text is specified using a
-        # side rather than a precise position. In frame coordinates ?
-        typed_attribute :shift, 'float'
+        # side rather than a precise position.
+        typed_attribute :shift, 'dimension'
 
-        # The scale of the text
-        typed_attribute :scale, 'float'
+        # The scale of the text. In text height by default, but you
+        # can specify a real size too
+        typed_attribute :scale, 'dimension'
 
         # The vertical alignment 
         typed_attribute :alignment, 'alignment'
@@ -53,17 +54,45 @@ module CTioga2
         # (see FigureMaker#show_text).
         def draw_text(t, text, x_or_loc, y = nil, measure = nil)
           t.context do
-            dict = prepare_show_text_dict(text, x_or_loc, y, measure)
+            dict = prepare_show_text_dict(t, text, x_or_loc, y, measure)
             t.show_text(dict)
           end
         end
 
+        def shift_dy(t)
+          if @shift
+            return @shift.to_dy(t)
+          end
+          return nil
+        end
+
+        def scale_dy(t)
+          if @scale
+            return @scale.to_dy(t)
+          end
+          return nil
+        end
+
+        def hash_for_tioga(t)
+          dict = self.to_hash
+          if dict.key? 'shift'
+            dim = dict['shift']
+            dict['shift'] = dim.to_dy(t)
+          end
+          if dict.key? 'scale'
+            dim = dict['scale']
+            dict['scale'] = dim.to_dy(t)
+          end
+          return dict
+        end
+
         protected
         
         # Prepares the dictionnary for use with show_text
-        def prepare_show_text_dict(text, x_or_loc, y = nil, measure = nil)
-          dict = self.to_hash
+        def prepare_show_text_dict(t, text, x_or_loc, y = nil, measure = nil)
+          dict = self.hash_for_tioga(t)
           dict['text'] = text
+
           if y
             dict['at'] = [x_or_loc, y]
           else
@@ -148,7 +177,7 @@ module CTioga2
         protected 
         
         def prepare_label_dict(t, default = nil, measure = nil)
-          dict = prepare_show_text_dict(@text, @loc, nil, measure)
+          dict = prepare_show_text_dict(t, @text, @loc, nil, measure)
           if default
             for attribute in %w(scale angle shift)
               if ! dict.key?(attribute)

data/lib/ctioga2/graphics/types.rb

@@ -25,7 +25,7 @@ require 'ctioga2/graphics/types/grid'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 344 $', '$Date: 2012-12-23 22:45:22 +0100 (Sun, 23 Dec 2012) $')
+  Version::register_svn_info('$Revision: 376 $', '$Date: 2013-01-23 22:52:47 +0100 (Wed, 23 Jan 2013) $')
 
   module Graphics
 
@@ -216,6 +216,25 @@ tick labels. Possible values:
  * @full@: major ticks and labels + minor ticks
 EOD
 
+    TicksSideRE = {
+      /i(nside)?/i =>  {'ticks_inside' => true,
+        'ticks_outside' => false},
+      /o(utside)?/i => {'ticks_outside' => true,
+        'ticks_inside' => false},
+      /b(oth)?/i => {'ticks_outside' => true,
+        'ticks_inside' => true}
+    }
+
+    TicksSideType = 
+      CmdType.new('ticks-side', {:type => :re_list,
+                    :list => TicksSideRE}, <<EOD)
+On what side of an axis line are the ticks positioned:
+ * @inside@: on the inside
+ * @outside@: on the outside
+ * @both@: on both the inside and the outside
+EOD
+
+
     # Dimensions
 
     DimensionType = 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 328 $', '$Date: 2012-11-28 15:11:49 +0100 (Wed, 28 Nov 2012) $')
+  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
 
   module Graphics
 
@@ -77,6 +77,12 @@ module CTioga2
           end
         end
 
+        # Return the value of the dimension in units of text height
+        def to_dy(t)
+          fig = to_figure(t, :y)
+          return fig/t.default_text_height_dy
+        end
+
         # Converts the Dimension to the *frame* coordinates of the
         # *current* frame in _t_.
         def to_frame(t, orientation = nil)

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 222 $', '$Date: 2011-01-11 00:52:31 +0100 (Tue, 11 Jan 2011) $')
+  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
 
 
   module MetaBuilder
@@ -97,7 +97,7 @@ module CTioga2
           if @hash.has_key?(str.to_sym)
             return str.to_sym
           else
-            raise IncorrectInput, "Invalid input: #{str} should be one of " +
+            raise IncorrectInput, "Invalid input: '#{str}' should be one of " +
               @hash.keys.map {|s| s.to_s}.join(',')
           end
         end
@@ -130,7 +130,7 @@ module CTioga2
               return v
             end
           end
-          raise IncorrectInput, "Invalid input: #{str} should match " +
+          raise IncorrectInput, "Invalid input: '#{str}' should match " +
             @re_hash.keys.map {|s| s.to_s}.join(',')
         end
 
@@ -200,7 +200,7 @@ module CTioga2
             fact = if nb > 1
                      1.0/(nb - 1)     # The famous off-by one...
                    else
-                     warn { "Incorrect gradient number: #{nb}" }
+                     warn { "Incorrect gradient number: '#{nb}'" }
                      1.0
                    end
             array = []

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
+  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
 
   module MetaBuilder
 
@@ -58,7 +58,7 @@ module CTioga2
         type_name :float_range, 'range'
         
         def string_to_type_internal(str)
-          raise IncorrectInput, "#{str} is not a valid range" unless 
+          raise IncorrectInput, "'#{str}' is not a valid range" unless 
             str =~ RANGE_RE
           s,e = Float($1), Float($2)
           return Range.new(s,e)
@@ -79,7 +79,7 @@ module CTioga2
         type_name :partial_float_range, 'range'
         
         def string_to_type_internal(str)
-          raise IncorrectInput, "#{str} is not a valid range" unless 
+          raise IncorrectInput, "'#{str}' is not a valid range" unless 
             str =~ RANGE_RE
           s,e = ($1 ? Float($1) : nil), ($2 ? Float($2) : nil)
           return [s, e]

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 351 $', '$Date: 2012-12-25 22:48:10 +0100 (Tue, 25 Dec 2012) $')
+  Version::register_svn_info('$Revision: 401 $', '$Date: 2013-08-19 17:29:59 +0200 (Mon, 19 Aug 2013) $')
 
   module MetaBuilder
     module Types
@@ -159,7 +159,7 @@ module CTioga2
                 return v
             end
           end
-          raise IncorrectInput, "Not an axis type: #{str}"
+          raise IncorrectInput, "Not an axis type: '#{str}'"
         end
       end
 

data/lib/ctioga2/plotmaker.rb

@@ -155,7 +155,7 @@ require 'ctioga2/postprocess'
 # displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision: 314 $', '$Date: 2012-08-10 11:59:35 +0200 (Fri, 10 Aug 2012) $')
+  Version::register_svn_info('$Revision: 431 $', '$Date: 2013-08-23 17:58:47 +0200 (Fri, 23 Aug 2013) $')
 
   # This class is the core of ctioga. It parses the command-line arguments,
   # reads all necessary files and plots graphs. Most of its functionality
@@ -354,6 +354,17 @@ module CTioga2
       end
       t.make_preview_pdf(t.figure_index(figname))
 
+      # We look for latex errors
+      if t.respond_to? :pdflatex_errors
+        errs = t.pdflatex_errors
+        if errs.size > 0
+          error { "pdflatex returned with #{errs.size} error lines"}
+          for l in errs
+            warn { "pdflatex error: #{l.chomp}" }
+          end
+        end
+      end
+
       file = t.save_dir ? File::join(t.save_dir, figname + ".pdf") : 
         figname + ".pdf"