ctioga2 0.5 → 0.6

data/Changelog

@@ -1,3 +1,20 @@
+ctioga2 (0.6)
+
+  * Fix various problems related to file names and directories
+  * Using command files, path of data files are now taken to be relative
+    to the directory in which the command file is located
+  * It is now possible to use the ruby construct ( ? : ) in datasets/text
+    files
+  * Implement the impulses path style
+  * Greater control on how to close paths for filling
+  * Increase the default size of the text significantly + a
+    --set-global-font command to change the default text size
+  * Control the position of ticks and the text of tick labels
+  * It is now possible to use abs(x) in formulas, rather than the old
+    x.abs version (which is still usable !)
+
+ -- Vincent <vincent.fourmond@9online.fr>  Wed  4 Sep 22:18:46 CEST 2013
+
 ctioga2 (0.5)
 
   * Choose the side of axis ticks 

data/lib/ctioga2/commands/general-commands.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/parsers/file'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
+  Version::register_svn_info('$Revision: 497 $', '$Date: 2013-09-04 22:07:55 +0200 (Wed, 04 Sep 2013) $')
 
   module Commands
  
@@ -57,13 +57,23 @@ EOH
     # Includes a file
     RunCommandFile = 
       Cmd.new("include", '-f', "--file", 
-              [ CmdArg.new('file'), ]) do |plotmaker, file|
+              [ CmdArg.new('file')], 
+              {'log' => CmdArg.new('boolean') }
+              ) do |plotmaker, file, opts|
+      if opts['log']
+        tg = file.sub(/(\.ct2)?$/, '-log.txt')
+        Log::log_to(tg, "ctioga2 version '#{CTioga2::Version::version}' starting at #{Time.now} to process file: #{file}")
+      end
       plotmaker.interpreter.run_command_file(file)
     end
     
     RunCommandFile.describe("Runs given command file", <<EOH, GeneralGroup)
 Reads the file and runs commands found in them, using the ctioga language.
+
 > ctioga2 -f my_file.ct2
+
+If the @/log@ is on, then all messages are written to a -log.txt file
+instead of to the terminal.
 EOH
 
     # Evaluate a series of commands.

data/lib/ctioga2/commands/general-types.rb

@@ -15,7 +15,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 223 $', '$Date: 2011-01-11 01:07:48 +0100 (Tue, 11 Jan 2011) $')
+  Version::register_svn_info('$Revision: 484 $', '$Date: 2013-09-02 22:44:42 +0200 (Mon, 02 Sep 2013) $')
 
   module Commands
  
@@ -50,6 +50,29 @@ EOD
 A floating-point number.
 EOD
 
+
+    FloatList = CmdType.new('float-list', 
+                            {
+                              :type => :array,
+                              :subtype => :float,
+                              :separator => /\s+|\s*,\s*/,
+                              :separator_out => " "
+                            }, <<EOD)
+A list of space-separated or comma-separated floating point numbers.
+EOD
+
+    TextList = CmdType.new('text-list', 
+                            {
+                              :type => :array,
+                              :subtype => :string,
+                              :separator => /\s*,\s*/,
+                              :alternative_separator => /\s*\|\|\s*/,
+                              :separator_out => ","
+                            }, <<EOD)
+A list of comma-separated texts. If you must include a comma inside the
+texts, then use @||@ as a separator.
+EOD
+
     IntegerType = CmdType.new('integer', :integer, <<EOD)
 An integer.
 EOD

data/lib/ctioga2/commands/interpreter.rb

@@ -21,7 +21,7 @@ require 'ctioga2/commands/doc/doc'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 355 $', '$Date: 2012-12-26 00:19:04 +0100 (Wed, 26 Dec 2012) $')
+  Version::register_svn_info('$Revision: 492 $', '$Date: 2013-09-03 21:54:09 +0200 (Tue, 03 Sep 2013) $')
 
   # This module contains the real core of ctioga2: a set of classes
   # that implement the concept of commands. Each command translates
@@ -210,7 +210,12 @@ module CTioga2
         if ! @plotmaker_target.figure_name
           @plotmaker_target.figure_name = file.gsub(/\.[^.]+$/,'')
         end
-        @file_parser.run_command_file(file, self)
+        dir = File::dirname(file)
+        base = File::basename(file)
+        
+        Dir::chdir(dir) do
+          @file_parser.run_command_file(base, self)
+        end
       end
 
       # Parses and runs the given string.

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

@@ -21,7 +21,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
+  Version::register_svn_info('$Revision: 451 $', '$Date: 2013-08-29 01:28:30 +0200 (Thu, 29 Aug 2013) $')
 
   module Data
 
@@ -64,8 +64,10 @@ EOD
             set = $1
             range = $2
           end          
-          name = "math: #{set}"
-          if set =~ /:/         # parametric
+          name = "#{set}"
+
+          
+          if set.split_at_toplevel(/:/).size > 1         # parametric
             if range
               set_param_from_string(:t_range, range)
             end

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

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 372 $', '$Date: 2012-12-28 18:13:15 +0100 (Fri, 28 Dec 2012) $')
+  Version::register_svn_info('$Revision: 493 $', '$Date: 2013-09-03 22:11:38 +0200 (Tue, 03 Sep 2013) $')
 
 
   module Data
@@ -183,10 +183,8 @@ EOD
                 return IO.popen(method % file)
               end
             end
-            return File::open(file)
           end
-          error { "Could not open #{file}" }
-          return nil
+          return File::open(file)
         end
 
         # A line is invalid if it is blank or starts

data/lib/ctioga2/data/dataset.rb

@@ -18,7 +18,7 @@ require 'ctioga2/data/indexed-dtable'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 406 $', '$Date: 2013-08-22 21:23:44 +0200 (Thu, 22 Aug 2013) $')
+  Version::register_svn_info('$Revision: 451 $', '$Date: 2013-08-29 01:28:30 +0200 (Thu, 29 Aug 2013) $')
 
 
   # \todo now, port the backend infrastructure...
@@ -87,7 +87,7 @@ module CTioga2
       def self.dataset_from_spec(name, spec)
         specs = []
         i = 0
-        for s in spec.split(/:/)
+        for s in spec.split_at_toplevel(/:/)
           if s =~ /^(x|y\d*|z)(#{DataColumn::ColumnSpecsRE})=(.*)/i
             which, mod, s = $1.downcase,($2 && $2.downcase) || "value",$3
             

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

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 184 $', '$Date: 2010-11-07 00:44:40 +0100 (Sun, 07 Nov 2010) $')
+  Version::register_svn_info('$Revision: 474 $', '$Date: 2013-08-31 15:05:39 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -99,11 +99,17 @@ module CTioga2
 
           for func in @path_elements
             case @curve_style.path_style
-            when /splines/
+            when /^splines/
               for f in func.split_monotonic
                 new_f = f.bound_values(*bnds.extrema)
                 t.append_interpolant_to_path(new_f.make_interpolant)
               end
+            when /^impulses/
+              # We draw lines from y = 0
+              for x,y in func
+                t.move_to_point(x, 0)
+                t.append_point_to_path(x, y)
+              end
             else
               f = func.bound_values(*bnds.extrema)
               t.move_to_point(f.x.first, f.y.first)
@@ -119,10 +125,15 @@ module CTioga2
         # which is the same as the _y0_ attribute of a CurveFillStyle.
         #
         # It must not be _false_
-        def make_closed_path(t, fv)
-          y0 = fill_value_to_y(fv)
+        #
+        # @todo Make sure this is called only on sub-plots when
+        # splitting on NaN !
+        def make_closed_path(t, close_type = nil)
           make_path(t)
-          close_path(t, y0)
+          close_type ||= @curve_style.fill.close_type
+          bnds = parent.get_el_boundaries(self)
+          close_type.close_path(t, bnds, @function[0], 
+                                @function[@function.size - 1])
         end
 
         # Strokes the path.
@@ -145,14 +156,6 @@ module CTioga2
           end
         end
 
-        # A function to close the path created by make_path.
-        # Overridden in the histogram code.
-        def close_path(t, y0)
-          t.append_point_to_path(@function.x.last, y0)
-          t.append_point_to_path(@function.x.first, y0)
-          t.close_path
-        end
-
         # Returns the AxisSyle objects for the X and Y axes as an array.
         def get_axes
           return [ 
@@ -164,11 +167,13 @@ module CTioga2
         # Draws the filled region according to the :fill_type element
         # of the style pseudo-hash. It can be:
         def draw_fill(t)
-          return unless @curve_style.fill.y0
+          return unless (@curve_style.fill &&  
+                         @curve_style.fill.close_type &&
+                         @curve_style.fill.close_type.fill?)
           t.context do
             # Remember: first setup_fill, then draw path, then do_fill
             @curve_style.fill.setup_fill(t)
-            make_closed_path(t,@curve_style.fill.y0)
+            make_closed_path(t)
             @curve_style.fill.do_fill(t)
           end
         end
@@ -197,18 +202,6 @@ module CTioga2
           end
         end
 
-        protected 
-
-        # Converts the value of a fill value into a number (or nil)
-        def fill_value_to_y(fv)
-          return nil unless fv
-          case fv
-          when :bottom,:top
-            bnds = parent.get_el_boundaries(self)
-            return bnds.send(fv)
-          end
-          return fv
-        end
         
       end
     end

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
+  Version::register_svn_info('$Revision: 474 $', '$Date: 2013-08-31 15:05:39 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -122,14 +122,17 @@ module CTioga2
               :below => :bottom
             }
           end
+          closer = Types::FillUntil.new
           # We clip for the first ones...
           for c in @curves[0..-2]
-            c.make_closed_path(t, conversion[c.curve_style.region_position])
+            closer.type = conversion[c.curve_style.region_position]
+            c.make_closed_path(t, closer)
             t.clip
           end
           # We don't clip on the last one !
           c = @curves.last
-          c.make_closed_path(t, conversion[c.curve_style.region_position])
+          closer.type = conversion[c.curve_style.region_position]
+          c.make_closed_path(t, closer)
         end
 
       end

data/lib/ctioga2/graphics/generator.rb

@@ -18,7 +18,7 @@ require 'ctioga2/graphics/coordinates'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 412 $', '$Date: 2013-08-22 23:04:59 +0200 (Thu, 22 Aug 2013) $')
+  Version::register_svn_info('$Revision: 481 $', '$Date: 2013-09-01 12:08:37 +0200 (Sun, 01 Sep 2013) $')
 
   module Graphics
 
@@ -165,8 +165,9 @@ EOH
     end
     
     ContourPlotCommand.describe('select contour plots', 
-                                     <<EOH, PlotTypesGroup)
-...
+                                <<EOH, PlotTypesGroup)
+Switch to contour plots for later curves. Contour plots need three
+columns (X,Y,Z). They have major and minor lines.
 EOH
 
     XYPlotCommand = 

data/lib/ctioga2/graphics/legends/provider.rb

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 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: 471 $', '$Date: 2013-08-31 14:11:01 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -45,7 +45,7 @@ module CTioga2
             @current_legend = nil
             return l
           elsif @auto_legend
-            return dataset.name
+            return "\\texttt{#{Utils::tex_quote_string(dataset.name)}}"
           else
             return nil
           end

data/lib/ctioga2/graphics/styles.rb

@@ -28,6 +28,7 @@ require 'ctioga2/graphics/styles/contour'
 require 'ctioga2/graphics/styles/errorbar'
 
 require 'ctioga2/graphics/styles/sets'
+require 'ctioga2/graphics/styles/ticks'
 
 require 'ctioga2/graphics/styles/axes'
 require 'ctioga2/graphics/styles/map-axes'

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 435 $', '$Date: 2013-08-26 22:03:19 +0200 (Mon, 26 Aug 2013) $')
+  Version::register_svn_info('$Revision: 483 $', '$Date: 2013-09-02 22:10:14 +0200 (Mon, 02 Sep 2013) $')
 
   module Graphics
 
@@ -56,6 +56,9 @@ module CTioga2
         # The label of the axis, if there is one
         sub_style :axis_label, TextLabel
 
+        # The axis ticks and labels
+        sub_style :ticks, AxisTicks
+
         # Whether the axis should be log scale or not
         typed_attribute :log, 'boolean'
 
@@ -74,6 +77,12 @@ module CTioga2
 
         typed_attribute :ticks_side, 'ticks-side'
 
+        # @todo Add a 'slave' attribute: axes would be created as
+        # slaves to another one until:
+        # * a curve is added to it
+        # * a transform is set
+        # * ticks are set
+
 
         # Creates a new AxisStyle object at the given location with
         # the given style.
@@ -86,6 +95,7 @@ module CTioga2
           @axis_label = TextLabel.new(label)
           @log = false
           @ticks_side = {}
+          @ticks = AxisTicks.new
         end
 
         # Draws the axis within the current plot. Boundaries are the
@@ -99,6 +109,12 @@ module CTioga2
         #   a transformation)
         def draw_axis(t)
           spec = get_axis_specification(t)
+
+          info = t.axis_information(spec)
+
+          # Merge in the specs
+          spec.merge!(@ticks.ticks_specs(t, info, @transform))
+          
           # Add tick label style:
           spec.merge!(@tick_label_style.hash_for_tioga(t))
 
@@ -143,6 +159,8 @@ minor_tick_length minor_tick_width)
           if @background_lines
             # First, getting major ticks location from tioga
             info = t.axis_information(get_axis_specification(t))
+            
+            tick_info = @ticks.ticks_specs(t, info, @transform)
 
             if info['vertical']
               x0 = t.bounds_left
@@ -153,7 +171,7 @@ minor_tick_length minor_tick_width)
             end
             t.context do
               @background_lines.set_stroke_style(t)
-              values = info['major_ticks'] || info['major']
+              values = tick_info['major_ticks']
               for val in values
                 if info['vertical']
                   t.stroke_line(x0, val, x1, val)

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 419 $', '$Date: 2013-08-23 01:05:42 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 466 $', '$Date: 2013-08-31 13:10:38 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -154,11 +154,7 @@ module CTioga2
       # how the fill should be applied to curves.
       class CurveFillStyle < FillStyle
 
-        # At which Y value we should draw the horizontal line for the
-        # fill ? A float, or:
-        # * :top, :bottom
-        # * false, nil to disable filling altogether
-        typed_attribute :y0, 'fill-until'
+        typed_attribute :close_type, 'fill-until'
         
       end
 

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 432 $', '$Date: 2013-08-23 19:06:36 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 489 $', '$Date: 2013-09-03 01:03:12 +0200 (Tue, 03 Sep 2013) $')
 
   module Graphics
 
@@ -105,16 +105,10 @@ module CTioga2
 
 
         # Creates a new parameter for the style factory.
-        #
-        # \todo add a way to add some more text to the description;
-        # possibly a self.describe_parameter function ?
-        #
-        # @todo Remove completely the 'type' argument
         def self.define_parameter(target, name, sets, description, 
                                   short_option = nil, disable_cmds = false)
           # We define two new types:
           # - first, the color-or-auto type:
-          # base_type = Commands::CommandType.get_type(type)
           base_type = CurveStyle.attribute_type(target)
 
           if ! Commands::Interpreter.type("#{base_type.name}-or-auto")
@@ -251,7 +245,8 @@ module CTioga2
           @override_parameters = {
             'line_style' => LineStyles::Solid,
             'marker_marker' => false,
-            'marker_scale' => 0.5 
+            'marker_scale' => 0.5,
+            'fill_color' => '=color'.to_sym
           }
           @parameters_carrays = {}
           for target, param in self.class.parameters
@@ -353,7 +348,7 @@ module CTioga2
         nil, "Y axis", nil, true
 
         # Now, fill style
-        define_parameter 'fill_y0', 'fill', 
+        define_parameter 'fill_close_type', 'fill', 
         {}, "Fill until", nil
 
         simple_parameter 'fill_color', "fill color", Sets::ColorSets
@@ -454,6 +449,9 @@ module CTioga2
             for k,v in h
               v.to_s =~ /^(?:=|->)(\S+)/
               target = $1
+              if CurveStyleFactory.name_to_target[target]
+                target = CurveStyleFactory.name_to_target[target]
+              end
               if tv.key? target
                 tv[k] = tv[target]
                 h.delete(k)