ctioga2 0.6.1 → 0.7

data/Changelog

@@ -1,3 +1,15 @@
+ctioga2 (0.7)
+
+  * It is now possible to index marker size index on Z values for
+    parametric plots
+  * --csv shortcut to read CSV files
+  * Round boxes (for the draw-box command and for the legends too)
+  * Make -X smarter about which viewer to use
+  * Unclipped plot elements + full control of depth
+  * Small bug fixes
+
+ -- Vincent <vincent.fourmond@9online.fr>  Thu  3 Oct 22:53:25 CEST 2013
+
 ctioga2 (0.6.1)
 
   * Fix crash when a curve has no points within the plot boundaries

data/lib/ctioga2/commands/commands.rb

@@ -17,7 +17,7 @@ require 'ctioga2/commands/groups'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 430 $', '$Date: 2013-08-23 14:23:52 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
 
   module Commands
 
@@ -143,6 +143,7 @@ module CTioga2
         @short_description = short
         @long_description = long || short
         if(group)
+          group = Interpreter::group(group) if group.is_a? String
           @group = group
           group.commands << self
         end

data/lib/ctioga2/commands/doc/help.rb

@@ -18,7 +18,7 @@ require 'ctioga2/commands/doc/wordwrap'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 409 $', '$Date: 2013-08-22 21:23:51 +0200 (Thu, 22 Aug 2013) $')
+  Version::register_svn_info('$Revision: 532 $', '$Date: 2013-09-29 12:13:33 +0200 (Sun, 29 Sep 2013) $')
 
   module Commands
 
@@ -99,14 +99,24 @@ module CTioga2
             @color = false
           end
 
+          should_close = false
+          output = $stdout
+
           if @to_tty and @to_pager
             # We pass -R as default value...
             ENV['LESS'] = 'R'
-            output = IO::popen("pager", "w")
-            pager = true
-          else
-            output = $stdout
-            pager = false
+            pager = 'pager'
+            for w in [ENV['PAGER'], 'less', 'pager' ]
+              if Utils::which(w)
+                pager = w
+                break
+              end
+            end
+            begin
+              output = IO::popen(pager, "w")
+              should_close = true
+            rescue
+            end
           end
           
           for group in groups
@@ -123,7 +133,7 @@ module CTioga2
               output.puts format_one_entry(cmd)
             end
           end
-          output.close
+          output.close if should_close
         end
 
         protected

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

@@ -15,7 +15,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 484 $', '$Date: 2013-09-02 22:44:42 +0200 (Mon, 02 Sep 2013) $')
+  Version::register_svn_info('$Revision: 517 $', '$Date: 2013-09-19 18:28:15 +0200 (Thu, 19 Sep 2013) $')
 
   module Commands
  
@@ -50,6 +50,13 @@ EOD
 A floating-point number.
 EOD
 
+    FloatOrFalseType = CmdType.new('float-or-false', {
+                              :type => :float,
+                              :shortcuts => {'none' => false }}, 
+                              <<EOD)
+A floating-point number, or @none@.
+EOD
+
 
     FloatList = CmdType.new('float-list', 
                             {

data/lib/ctioga2/commands/interpreter.rb

@@ -21,7 +21,7 @@ require 'ctioga2/commands/doc/doc'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
+  Version::register_svn_info('$Revision: 512 $', '$Date: 2013-09-11 13:20:24 +0200 (Wed, 11 Sep 2013) $')
 
   # This module contains the real core of ctioga2: a set of classes
   # that implement the concept of commands. Each command translates
@@ -208,7 +208,8 @@ module CTioga2
       # specified.
       def run_command_file(file)
         if ! @plotmaker_target.figure_name
-          @plotmaker_target.figure_name = file.gsub(/\.[^.]+$/,'')
+          @plotmaker_target.figure_name = file.gsub(/\.[^.]+$/,'').
+            gsub(/%/, '%%')
         end
 
         dir = File::dirname(file)

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

@@ -25,7 +25,7 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 493 $', '$Date: 2013-09-03 22:11:38 +0200 (Tue, 03 Sep 2013) $')
+  Version::register_svn_info('$Revision: 524 $', '$Date: 2013-09-22 16:18:39 +0200 (Sun, 22 Sep 2013) $')
 
 
   module Data
@@ -150,7 +150,12 @@ EOD
             end
             return ret
           else
-            return super
+            m = Dir::glob(spec)
+            if m.size > 0
+              return m
+            else
+              return super
+            end
           end
         end
 
@@ -380,7 +385,11 @@ EOD
                                            @current_data,
                                            @included_modules)
           else
-            return @current_data[column.to_i].dup
+            if @current_data[column.to_i]
+              return @current_data[column.to_i].dup
+            else
+              raise "Cannot find column number #{column.to_i} -- maybe you got the column separator wrong ?"
+            end
           end
         end
 
@@ -425,6 +434,7 @@ EOD
 #         end
 
       end
+
       
     end
 

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: 390 $', '$Date: 2013-03-13 11:36:47 +0100 (Wed, 13 Mar 2013) $')
+  Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
 
 
   module Data
@@ -72,6 +72,20 @@ module CTioga2
 
         # Defaults to the 'text' backend
         @backend_factory = Data::Backends::BackendFactory.new('text')
+
+        # Probably a bit out of place...
+        csv = 
+          Cmd.new('csv', nil, '--csv', []) do |plotmaker|
+          plotmaker.interpreter.
+            run_commands("text /separator=/[,;]/")
+        end
+        
+        csv.describe("reads CSV files", 
+                            <<"EOH", "backend-text")
+Now parse the following data files as CSV.
+
+# text /separator=/[,;]/
+EOH
       end
 
       # Performs expansion on the given _set_ with the current
@@ -547,7 +561,8 @@ EOH
 Adds the given commands to the dataset hook. See {command: dataset-hook} 
 for more information about the dataset hook.
 EOH
-
+  
+  
   end
 
 end

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 378 $', '$Date: 2013-03-04 22:42:54 +0100 (Mon, 04 Mar 2013) $')
+  Version::register_svn_info('$Revision: 529 $', '$Date: 2013-09-25 18:23:27 +0200 (Wed, 25 Sep 2013) $')
 
   module Graphics
 
@@ -53,6 +53,7 @@ module CTioga2
 
         # Creates an empty new Container with the given _parent_.
         def initialize(parent = nil, root = nil)
+          super()
           @parent = parent
           
           # elements to be given to tioga

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

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 505 $', '$Date: 2013-09-05 22:18:57 +0200 (Thu, 05 Sep 2013) $')
+  Version::register_svn_info('$Revision: 535 $', '$Date: 2013-10-02 20:31:21 +0200 (Wed, 02 Oct 2013) $')
 
   module Graphics
 
@@ -33,7 +33,7 @@ module CTioga2
       #
       # * transparency
       # * drawing order
-      class Curve2D  < TiogaElement
+      class Curve2D  < PlotBasedElement
 
         include Log
         include Dobjects
@@ -45,18 +45,11 @@ module CTioga2
         # Elements of the path, when there are more than one:
         attr_accessor :path_elements
 
-        # The Data::Dataset object that should get plotted.
-        attr_accessor :dataset
 
-        # A Styles::CurveStyle object saying how the curve should be
-        # drawn.
-        attr_accessor :curve_style
-
-        undef :location=, :location
-        
         # Creates a new Curve2D object with the given _dataset_ and
         # _style_.
         def initialize(dataset, style = nil)
+          super()
           @dataset = dataset
           if @dataset.size > 2
             warn { "Columns Y2 and further were ignored for set #{dataset.name}" }
@@ -78,12 +71,6 @@ module CTioga2
 
         end
 
-        # Returns the LocationStyle object of the curve. Returns the
-        # one from #curve_style.
-        def location
-          return @curve_style.location
-        end
-
         # Returns the Types::Boundaries of this curve.
         def get_boundaries
           return Types::Boundaries.bounds(@function.x, @function.y)
@@ -101,7 +88,11 @@ module CTioga2
             case @curve_style.path_style
             when /^splines/
               for f in func.split_monotonic
-                new_f = f.bound_values(*bnds.extrema)
+                new_f = if @curve_style.clipped 
+                          f.bound_values(*bnds.extrema)
+                        else
+                          f.dup
+                        end
                 t.append_interpolant_to_path(new_f.make_interpolant)
               end
             when /^impulses/
@@ -114,8 +105,11 @@ module CTioga2
 
               # Hmmmm. This may get the wrong thing if you happen to
               # draw something completely outside.
-              f = func.bound_values(*bnds.extrema)
-
+              if @curve_style.clipped 
+                f = func.bound_values(*bnds.extrema)
+              else
+                f = func
+              end
               # If for some reason, there is no point left, we plot
               # the original function.
               if f.size < 2

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: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
+  Version::register_svn_info('$Revision: 535 $', '$Date: 2013-10-02 20:31:21 +0200 (Wed, 02 Oct 2013) $')
 
   # This module contains all graphical elements of CTioga2
   module Graphics
@@ -38,6 +38,22 @@ module CTioga2
         # LocationStyle object
         attr_writer :location
 
+        attr_accessor :clipped
+
+        
+        # Depth
+        attr_writer :depth
+
+        def initialize()
+          @clipped = true
+
+          @depth = 50           # Hey, like xfig
+        end
+
+        def depth
+          @depth || 50
+        end
+
         # Makes sure there is a location when one asks for it.
         def location
           @location ||= Styles::LocationStyle.new
@@ -77,24 +93,43 @@ module CTioga2
           raise "Should be reimplemented by children"
         end
       end 
-      
 
-#       # A unique method call to a FigureMaker object.
-#       class TiogaFuncall < TiogaElement
 
-#         # _symbol_ is the symbol to be called, and the remainder will
-#         # be used as arguments for the call.
-#         def initialize(symbol, *args)
-#           @symbol = symbol
-#           @args = args
-#         end
+      # The base class for all dataset-based elements
+      class PlotBasedElement < TiogaElement
+
+        # The Data::Dataset object that should get plotted.
+        attr_accessor :dataset
+
+        # A Styles::CurveStyle object saying how the curve should be
+        # drawn.
+        attr_accessor :curve_style
+
+        undef :location=, :location
+
+        # Returns the LocationStyle object of the curve. Returns the
+        # one from #curve_style.
+        def location
+          return @curve_style.location
+        end
+
+        undef :clipped, :clipped=
+
+        def clipped
+          return @curve_style.clipped
+        end
+
+        undef :depth, :depth=
+
+        def depth
+          return @curve_style.depth
+        end
+
+        def initialize()
+          super()
+        end
+      end
 
-#         protected
-        
-#         def real_do(f)
-#           f.send(@symbol, *@args)
-#         end
-#       end
     end
   end
 end

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

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 300 $', '$Date: 2011-06-07 21:17:49 +0200 (Tue, 07 Jun 2011) $')
+  Version::register_svn_info('$Revision: 535 $', '$Date: 2013-10-02 20:31:21 +0200 (Wed, 02 Oct 2013) $')
 
   module Graphics
 
@@ -40,35 +40,28 @@ module CTioga2
       # factory, I think. Color maps can be used for colors, but for
       # the rest, things will have to be implemented as parameters to
       # the curve generator, or even separated commands.
-      class Parametric2D  < TiogaElement
+      class Parametric2D  < PlotBasedElement
 
         include Log
         include Dobjects
 
-        # The Data::Dataset object that should get plotted.
-        attr_accessor :dataset
-
-        # A Styles::CurveStyle object saying how the curve should be
-        # drawn.
-        #
-        # Some of the elements will be overridden.
-        attr_accessor :curve_style
-
         # For convenience only: xy functions
         attr_accessor :function
 
         # A hash Z value -> corresponding XY functions.
         attr_accessor :planes
 
+        # A ParametricPlotStyle object handling the correspondance
+        # between Z axis and stylistic aspects
+        attr_accessor :parametric_style
 
-
-        undef :location=, :location
-        
         # Creates a new Curve2D object with the given _dataset_ and
         # _style_.
-        def initialize(dataset, style = nil)
+        def initialize(dataset, style = nil, parametric_plot_style = nil)
           @dataset = dataset
           @curve_style = style
+          
+          @parametric_style = parametric_plot_style
           prepare_data
         end
 
@@ -84,22 +77,26 @@ module CTioga2
             @planes[zs[0]].x << x
             @planes[zs[0]].y << y
           end
+
+          
+          @zmin = []
+          @zmax = []
+
+          ## @todo This should rather use Z axes in the end ?
+          (@dataset.ys.size - 1).times do |i|
+            @zmin << @dataset.ys[i+1].values.min
+            @zmax << @dataset.ys[i+1].values.max
+          end
         end
         
         protected :prepare_data
 
-        # Returns the LocationStyle object of the curve. Returns the
-        # one from #curve_style.
-        def location
-          return @curve_style.location
-        end
-
         # Returns the Types::Boundaries of this curve.
         def get_boundaries
           return Types::Boundaries.bounds(@function.x, @function.y)
         end
 
-        # Draws the markers, if applicable.
+        # Draws the path lines, if applicable.
         def draw_path(t)
           min = @dataset.z.values.min
           max = @dataset.z.values.max
@@ -125,19 +122,16 @@ module CTioga2
 
         # Draws the markers, if applicable.
         def draw_markers(t)
-          min = @dataset.z.values.min
-          max = @dataset.z.values.max
+          @parametric_style.prepare
           if @curve_style.has_marker?
             # We use a default color map for the markers
             @curve_style.marker_color_map ||= 
               Styles::ColorMap.from_text("Red--Green")
-            cmap = @curve_style.marker_color_map
-            for zs in @planes.keys.sort ## \todo have the sort
-                                        ## direction configurable.
-              f = @planes[zs]
-              color = cmap.z_color(zs, min, max)
-              @curve_style.marker.draw_markers_at(t, f.x, f.y, 
-                                                  { 'color' => color})
+
+            @dataset.each_values do |i,x,y,*z|
+              ms = @parametric_style.marker_style(@curve_style, 
+                                                  z, @zmin, @zmax)
+              ms.draw_markers_at(t, x, y)
             end
           end
         end