ctioga2 0.3 → 0.4

data/lib/ctioga2/data/backends/backends/gnuplot.rb

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
 
 
   module Data

data/lib/ctioga2/data/backends/backends/math.rb

@@ -21,7 +21,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
 
   module Data
 

data/lib/ctioga2/data/backends/backends/text.rb

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 372 $', '$Date: 2012-12-28 18:13:15 +0100 (Fri, 28 Dec 2012) $')
 
 
   module Data
@@ -56,7 +56,17 @@ module CTioga2
 
         describe 'text', 'Text format', <<EOD
 This backend reads text files in a format close to the one understood
-by gnuplot and the like.
+by gnuplot and the like. More specifically, it reads text files organized
+in columns.
+
+The column separator is specified by the @separator@ option or using
+the {command: text-separator} command; it is a {type: regexp}
+
+By default, the {command: text} backend only loads the column 1 as X
+and 2 as Y, but that can be changed either by specifiying a default
+column spec using either the @default_column_spec@ option or by adding
+a specification directly after the file name.
+
 EOD
 
         # Inherit the baseline handling, can be useful !

data/lib/ctioga2/data/backends/description.rb

@@ -22,7 +22,7 @@ require 'ctioga2/commands/groups'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 307 $', '$Date: 2012-01-05 14:50:43 +0100 (Thu, 05 Jan 2012) $')
   
 
   module Data

data/lib/ctioga2/data/backends/factory.rb

@@ -20,7 +20,7 @@ require 'ctioga2/data/backends/backend'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
 
   module Data
 

data/lib/ctioga2/data/backends/parameter.rb

@@ -21,7 +21,7 @@ require 'ctioga2/metabuilder/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 17 $', '$Date: 2009-04-28 22:22:22 +0200 (Tue, 28 Apr 2009) $')
 
   module Data
 

data/lib/ctioga2/data/datacolumn.rb

@@ -17,7 +17,7 @@ require 'ctioga2/utils'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 229 $', '$Date: 2011-01-17 17:34:57 +0100 (Mon, 17 Jan 2011) $')
 
   module Data
 

data/lib/ctioga2/data/dataset.rb

@@ -18,7 +18,7 @@ require 'ctioga2/data/indexed-dtable'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 304 $', '$Date: 2012-01-03 15:06:33 +0100 (Tue, 03 Jan 2012) $')
 
 
   # \todo now, port the backend infrastructure...

data/lib/ctioga2/data/filters.rb

@@ -19,7 +19,7 @@ require 'ctioga2/data/backends/factory'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
 
 
   module Data

data/lib/ctioga2/data/indexed-dtable.rb

@@ -15,7 +15,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 181 $', '$Date: 2010-10-27 15:18:35 +0200 (Wed, 27 Oct 2010) $')
 
 
   module Data

data/lib/ctioga2/data/point.rb

@@ -17,7 +17,7 @@ require 'ctioga2/data/dataset'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 112 $', '$Date: 2009-11-09 22:34:12 +0100 (Mon, 09 Nov 2009) $')
 
 
   module Data

data/lib/ctioga2/data/stack.rb

@@ -25,7 +25,7 @@ require 'ctioga2/data/filters'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 367 $', '$Date: 2012-12-28 16:14:52 +0100 (Fri, 28 Dec 2012) $')
 
 
   module Data
@@ -173,10 +173,10 @@ module CTioga2
           datasets = [ specified_dataset(opts) ]
         else
           nb = opts['number'] || 2
-          if stack.stack.size < nb
+          if @stack.size < nb
             raise "Not enough datasets on the stack"
           end
-          datasets = stack.stack[(- nb).. -2]
+          datasets = @stack[(- nb).. -2]
           datasets.reverse!
         end
       end
@@ -355,7 +355,7 @@ stack. The name option can be used to give a name to the new dataset.
 EOH
 
     ApplyLastCommand =
-      Cmd.new("apply-formula", '', "--apply-formula",
+      Cmd.new("apply-formula", nil, "--apply-formula",
               [CmdArg.new('text')], 
               {
                 'which' => CmdArg.new('stored-dataset'),
@@ -383,8 +383,8 @@ EOH
                               <<EOH, DataStackGroup)
 Displays the current contents of the dataset stack. 
 
-Mostly used for debugging when operations like {cmd: merge-datasets}
-or {cmd: join-datasets} don't work as expected.
+Mostly used for debugging when operations like {command: merge-datasets}
+or {command: join-datasets} don't work as expected.
 EOH
 
 

data/lib/ctioga2/graphics/coordinates.rb

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 177 $', '$Date: 2010-10-25 13:22:39 +0200 (Mon, 25 Oct 2010) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements.rb

@@ -29,7 +29,7 @@ require 'ctioga2/graphics/elements/contour'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/containers.rb

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/contour.rb

@@ -17,7 +17,7 @@ require 'ctioga2/graphics/elements/primitive'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 299 $', '$Date: 2011-03-15 11:22:20 +0100 (Tue, 15 Mar 2011) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/curve2d.rb

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 184 $', '$Date: 2010-11-07 00:44:40 +0100 (Sun, 07 Nov 2010) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/element.rb

@@ -18,7 +18,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
 
   # This module contains all graphical elements of CTioga2
   module Graphics

data/lib/ctioga2/graphics/elements/gradient-region.rb

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/parametric2d.rb

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 300 $', '$Date: 2011-06-07 21:17:49 +0200 (Tue, 07 Jun 2011) $')
 
   module Graphics
 

data/lib/ctioga2/graphics/elements/primitive.rb

@@ -16,18 +16,24 @@ require 'ctioga2/utils'
 require 'ctioga2/log'
 
 require 'ctioga2/graphics/types'
+require 'ctioga2/graphics/styles'
 require 'shellwords'
 
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 370 $', '$Date: 2012-12-28 17:40:18 +0100 (Fri, 28 Dec 2012) $')
 
   module Graphics
 
     module Elements
       
       # A TiogaElement that represents a graphics primitive.
+      #
+      # @todo Most of the objects here should rely on getting a
+      # BasicStyle object from the options hash and use it to
+      # draw. There is no need to make cumbersome and hard to extend
+      # hashes.
       class TiogaPrimitiveCall < TiogaElement
         
         # Some kind of reimplementation of Command for graphics
@@ -87,7 +93,8 @@ module CTioga2
 
         # Creates a new primitive with the given parameters, and makes
         # it immediately available as a command.
-        def self.primitive(name, long_name, comp, opts = {}, &code)
+        def self.primitive(name, long_name, comp, opts = {}, 
+                           desc = nil, &code)
           primitive = TiogaPrimitive.new(name, comp, opts, &code)
           @known_primitives[name] = primitive
           
@@ -98,7 +105,11 @@ module CTioga2
 
           cmd_opts = {}
           for k,v in opts
-            cmd_opts[k] = CmdArg.new(v)
+            cmd_opts[k] = if v.respond_to?(:type)
+                            v
+                          else
+                            CmdArg.new(v)
+                          end
           end
           
           cmd = Cmd.new("draw-#{name}",nil,"--draw-#{name}", 
@@ -111,12 +122,53 @@ module CTioga2
             plotmaker.root_object.current_plot.
               add_element(call)
           end
+          if ! desc
+            desc = "Directly draws #{long_name} on the current plot"
+          end
           cmd.describe("Draws #{long_name}",
-                       "Directly draws #{long_name} on the current plot", PrimitiveGroup)
+                       desc, 
+                       PrimitiveGroup)
 
           PrimitiveCommands[name] = cmd
         end
 
+        # This creates a primitive base on a style object, given a
+        # _style_class_, the base _style_name_ for the underlying
+        # styling system, options to remove and options to add.
+        #
+        # The underlying code receives:
+        # * the FigureMaker object
+        # * the compulsory arguments
+        # * the style
+        # * the raw options
+        def self.styled_primitive(name, long_name, comp, style_class, 
+                                  style_name, without = [],
+                                  additional_options = {},
+                                  set_style_command = nil, # This
+                                                           # could be
+                                                           # removed
+                                  &code)
+          options = style_class.options_hash.without(without)
+          options.merge!(additional_options)
+          options['base-style'] = 'text' # the base style name
+
+          set_style_command ||= style_name
+          desc = <<"EOD"
+Draws #{long_name} on the current plot, using the given style.
+For more information on the available options, see the 
+{command: define-#{set_style_command}-style} command.
+EOD
+
+          self.primitive(name, long_name, comp, options, desc) do |*all|
+            opts = all.pop
+            st_name = opts['base-style'] || "base"
+            style = Styles::StyleSheet.style_for(style_class,st_name) 
+            style.set_from_hash(opts)
+            all << style << opts
+            code.call(*all)
+          end
+        end
+
 
         # Returns a pair primitive/primitive command for the named
         # primitive, or [ _nil_, _nil_ ]
@@ -126,59 +178,42 @@ module CTioga2
 
         # Now, a list of primitives, along with their code.
 
-        primitive("text", "text", [ 'point', 'text' ],
-                  {
-                    'color' => 'color',
-                    'scale' => 'float',
-                    'angle' => 'float',
-                    'justification' => 'justification',
-                    'alignment' => 'alignment',
-                    'font' => 'latex-font',
-                  }
-                  ) do |t, point, string, options|
+        styled_primitive("text", "text", 
+                         [ 'point', 'text' ],
+                         Styles::FullTextStyle,
+                         'text',
+                         ['text'],
+                         {'font' => 'latex-font'}
+                  ) do |t, point, string, style, options|
           # @todo add a way to specify fonts ???
           options ||= {}
           if options['font']
             string = options['font'].fontify(string)
-            options.delete('font')
           end
-          options['text'] = string
-          options['at'] = point.to_figure_xy(t)
-          t.show_text(options)
+          style.draw_text(t, string, *(point.to_figure_xy(t)))
         end
 
-        # @todo add rendering mode !!
-        MarkerOptions = {
-          'color' => 'color',
-          'stroke_color' => 'color',
-          'fill_color' => 'color',
-          'scale' => 'float',
-          'horizontal_scale' => 'float',
-          'vertical_scale' => 'float',
-          'angle' => 'float',
-          'justification' => 'justification',
-          'alignment' => 'alignment',
-        }
-
-        primitive("marker", "marker", [ 'point', 'marker' ],
-                  MarkerOptions) do |t, point, marker, options|
-          ## \todo add a way to specify fonts ???
-          options ||= {}
-          options['marker'] = marker
-          options['at'] = point.to_figure_xy(t)
-          t.show_marker(options)
+        styled_primitive("marker", "marker", 
+                         [ 'point', 'marker' ],
+                         Styles::MarkerStringStyle,
+                         'marker',
+                         ['font'] # font doesn't make any sense with a
+                         # marker spec
+                         ) do |t, point, marker, style, options|
+          style.draw_marker(t, marker, *point.to_figure_xy(t))
         end
 
-        primitive("string-marker", "marker", [ 'point', 'text' ],
-                  {'font' => 'pdf-font' }.update(MarkerOptions)
-                  ) do |t, point, string, options|
-          ## \todo add a way to specify fonts ???
-          options ||= {}
-          options['text'] = string
-          options['at'] = point.to_figure_xy(t)
-          t.show_marker(options)
+        styled_primitive("string-marker", "marker", 
+                         [ 'point', 'text' ],
+                         Styles::MarkerStringStyle,
+                         'marker-string', [],
+                         {},
+                         'marker'
+                         ) do |t, point, string, style, options|
+          style.draw_string_marker(t, string, *point.to_figure_xy(t))
         end
 
+
         # options for arrows (and therefore tangents)
         ArrowOptions = {
           'color' => 'color',
@@ -192,32 +227,43 @@ module CTioga2
           'line_style' => 'line-style',
         }
 
-        primitive("arrow", "arrow", [ 'point', 'point' ], 
-                  ArrowOptions) do |t, tail,head, options|
-          ## \todo a scale or marker_scale option that sets the scale
-          ## of both head and tail
-          options ||= {}
-          options['head'] = head.to_figure_xy(t)
-          options['tail'] = tail.to_figure_xy(t)
-          t.show_arrow(options)
+        styled_primitive("arrow", "arrow", 
+                         [ 'point', 'point' ], 
+                         Styles::ArrowStyle,
+                         'arrow') do |t, tail, head, style, options|
+          style.draw_arrow(t, *tail.to_figure_xy(t),
+                           *head.to_figure_xy(t))
         end
- 
-        primitive("line", "line", [ 'point', 'point' ],
-                  {
-                    'color' => 'color',
-                    'line_width' => 'float',
-                    'line_style' => 'line-style',
-                  }
-                  ) do |t, tail,head, options|
-          options ||= {}
-          for a in ['head', 'tail'] 
-            options["#{a}_marker"] = "None"
-          end
-          options['head'] = head.to_figure_xy(t)
-          options['tail'] = tail.to_figure_xy(t)
-          t.show_arrow(options)
+
+        styled_primitive("line", "line", 
+                         [ 'point', 'point' ],
+                         Styles::StrokeStyle,
+                         'line'
+                  ) do |t, tail, head, style, options|
+          style.draw_line(t, *(tail.to_figure_xy(t)),
+                          *(head.to_figure_xy(t)))
         end
 
+        # Here, we need to add deprecated options for backward
+        # compatibility
+
+        for cmd in ['draw-line', 'draw-arrow']
+          Commands::make_alias_for_option cmd, 'width', 'line_width', true
+          Commands::make_alias_for_option cmd, 'style', 'line_style', true
+        end
+
+        styled_primitive("box", "box", 
+                         [ 'point', 'point' ], 
+                         Styles::BoxStyle,
+                         'box') do |t, tl, br, style, options|
+          x1,y1 = tl.to_figure_xy(t)
+          x2,y2 = br.to_figure_xy(t)
+          style.draw_box(t, x1, y1, x2, y2)
+        end
+
+
+        Commands::make_alias_for_option 'draw-box', 'fill_color', 'fill-color'
+        Commands::make_alias_for_option 'draw-box', 'fill_transparency', 'fill-transparency'
 
         protected