ctioga2 0.7 → 0.8

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

@@ -22,8 +22,6 @@ require 'shellwords'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
-
   module Graphics
 
     module Elements

data/lib/ctioga2/graphics/elements/redirecting-container.rb

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     module Elements
@@ -46,6 +44,27 @@ module CTioga2
           return parent.legend_area = l
         end
 
+        undef :gp_cache, :gp_cache=
+        
+        def gp_cache
+          return parent.gp_cache
+        end
+
+        def gp_cache=(c)
+          return parent.gp_cache = c
+        end
+
+        def each_item(leaf_only = true, recursive = false, tl = true, &blk)
+          if tl
+            parent.each_item(leaf_only, recursive, tl, &blk)
+          else
+            if @elements
+              super(leaf_only, recursive, true, &blk)
+            end
+          end
+        end
+
+
       end
     end
   end

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 474 $', '$Date: 2013-08-31 15:05:39 +0200 (Sat, 31 Aug 2013) $')
-
   module Graphics
 
     module Elements

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 540 $', '$Date: 2013-10-04 00:05:23 +0200 (Fri, 04 Oct 2013) $')
-
   module Graphics
 
     module Elements

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

@@ -17,8 +17,6 @@ require 'ctioga2/graphics/elements/primitive'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 171 $', '$Date: 2010-10-22 17:07:52 +0200 (Fri, 22 Oct 2010) $')
-
   module Graphics
 
     module Elements

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

@@ -19,8 +19,6 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     module Elements

data/lib/ctioga2/graphics/elements/xyz-map.rb

@@ -19,8 +19,6 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 535 $', '$Date: 2013-10-02 20:31:21 +0200 (Wed, 02 Oct 2013) $')
-
   module Graphics
 
     module Elements

data/lib/ctioga2/graphics/generator.rb

@@ -21,8 +21,6 @@ require 'ctioga2/graphics/styles/plot-types'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 513 $', '$Date: 2013-09-19 00:43:28 +0200 (Thu, 19 Sep 2013) $')
-
   module Graphics
 
 
@@ -53,6 +51,11 @@ module CTioga2
       # parametric plots.
       attr_accessor :xy_parametric_parameters
 
+
+      # Style of histograms
+      attr_accessor :histogram_parameters
+
+
       # Creates a CurveGenerator object.
       def initialize
         @legend_provider = Legends::LegendProvider.new
@@ -60,6 +63,7 @@ module CTioga2
         @current_curves = :xy_plot
 
         @xy_parametric_parameters = Styles::ParametricPlotStyle.new
+        @histogram_parameters = Styles::HistogramStyle.new
       end
 
       PlotOptions = { 
@@ -87,8 +91,16 @@ module CTioga2
           CurveStyleFactory::PlotCommandOptions.key?(k)
         }
 
-        curve = send(@current_curves, plot, dataset, options)
-        curve.curve_style.target = curve
+        begin
+          legend = @legend_provider.dataset_legend(dataset)
+          style = @style_factory.next(options)
+          style.legend ||= legend # The legend specified as option to
+                                  # the --plot command has precedence
+                                  # over the one specified by
+                                  # --legend.
+          curve = send(@current_curves, dataset, style)
+          curve.curve_style.target = curve
+        end
         return curve
       end
 
@@ -96,56 +108,36 @@ module CTioga2
       
       ## \name Available kinds of curves
       ##
-      ## @todo All these are completely identical, there probably
-      ## isn't need for separate code ?
-      # 
-      # @{
-      # 
+      ## @{
+
+
       # The "classical" 2D plots.
-      def xy_plot(plot, dataset, options = {})
-        legend = @legend_provider.dataset_legend(dataset)
-        style = @style_factory.next(options)
-        style.legend ||= legend # The legend specified as option to
-                                # the --plot command has precedence
-                                # over the one specified by --legend.
-        curve = Graphics::Elements::Curve2D.new(dataset, style)
-        return curve
+      def xy_plot(dataset, style)
+        return Graphics::Elements::Curve2D.new(dataset, style)
+      end
+
+      # The "classical" 2D plots.
+      def histogram(dataset, style)
+        return Graphics::Elements::Histogram.new(dataset, style, 
+                                                 @histogram_parameters.dup)
       end
 
       # XYZ plots formerly known as "parametric plots"
-      def xy_parametric(plot, dataset, options = {})
-        legend = @legend_provider.dataset_legend(dataset)
-        style = @style_factory.next(options)
-        style.legend ||= legend # The legend specified as option to
-                                # the --plot command has precedence
-                                # over the one specified by --legend.
-        curve = Graphics::Elements::Parametric2D.
+      def xy_parametric(dataset, style)
+        return Graphics::Elements::Parametric2D.
           new(dataset, style, @xy_parametric_parameters.dup)
-        return curve
       end
 
       # XYZ maps
-      def xyz_map(plot, dataset, options = {})
-        legend = @legend_provider.dataset_legend(dataset)
-        style = @style_factory.next(options)
-        style.legend ||= legend # The legend specified as option to
-                                # the --plot command has precedence
-                                # over the one specified by --legend.
+      def xyz_map(dataset, style)
         style.legend = false    # No legend for XYZ maps
-        curve = Graphics::Elements::XYZMap.new(dataset, style)
-        return curve
+        return Graphics::Elements::XYZMap.new(dataset, style)
       end
 
       # XYZ maps
-      def xyz_contour(plot, dataset, options = {})
-        legend = @legend_provider.dataset_legend(dataset)
-        style = @style_factory.next(options)
-        style.legend ||= legend # The legend specified as option to
-                                # the --plot command has precedence
-                                # over the one specified by --legend.
-        style.legend = false    # No legend for XYZ maps
-        curve = Graphics::Elements::XYZContour.new(dataset, style)
-        return curve
+      def xyz_contour(dataset, style)
+        style.legend = false    # No legend for XYZ contours
+        return Graphics::Elements::XYZContour.new(dataset, style)
       end
 
 
@@ -174,6 +166,19 @@ module CTioga2
 Switch to XY parametric plots, that is standard XY plots whose appearance
 (such as color, marker color, and, potentially, marker kinds and more)
 are governed by one (or more ?) Z values.
+EOH
+
+    HistogramPlotCommand = 
+      Cmd.new("histogram",nil,"--histogram", 
+              [], Styles::HistogramStyle.options_hash) do |plotmaker, opts|
+      plotmaker.curve_generator.current_curves = :histogram
+      plotmaker.curve_generator.
+        histogram_parameters.set_from_hash(opts)
+    end
+    
+    HistogramPlotCommand.describe('select histogram plots', 
+                                  <<EOH, PlotTypesGroup)
+Switch to drawing histograms.
 EOH
 
     ContourPlotCommand = 

data/lib/ctioga2/graphics/legends.rb

@@ -20,8 +20,6 @@ require 'ctioga2/graphics/legends/multicols'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 432 $', '$Date: 2013-08-23 19:06:36 +0200 (Fri, 23 Aug 2013) $')
-
   module Graphics
 
     # Now, various commands pertaining to legends

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 386 $', '$Date: 2013-03-11 22:57:16 +0100 (Mon, 11 Mar 2013) $')
-
   module Graphics
 
     # This module holds all the classes dealing with legends

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

@@ -18,8 +18,6 @@ require 'ctioga2/graphics/styles'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 386 $', '$Date: 2013-03-11 22:57:16 +0100 (Mon, 11 Mar 2013) $')
-
   module Graphics
 
     module Legends

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

@@ -18,8 +18,6 @@ require 'ctioga2/graphics/styles'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     module Legends

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 471 $', '$Date: 2013-08-31 14:11:01 +0200 (Sat, 31 Aug 2013) $')
-
   module Graphics
 
     module Legends

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 139 $', '$Date: 2010-01-22 00:12:17 +0100 (Fri, 22 Jan 2010) $')
-
   module Graphics
 
     # This module holds all the classes dealing with legends

data/lib/ctioga2/graphics/root.rb

@@ -21,8 +21,6 @@ require 'ctioga2/graphics/subplot-commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
-
   # This module contains all graphical elements of CTioga2
   module Graphics
 

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     # All the styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 483 $', '$Date: 2013-09-02 22:10:14 +0200 (Mon, 02 Sep 2013) $')
-
   module Graphics
 
     module Styles

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 342 $', '$Date: 2012-12-23 21:34:48 +0100 (Sun, 23 Dec 2012) $')
-
   module Graphics
 
     module Styles

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
-
   module Graphics
 
     # All the styles
@@ -40,6 +38,10 @@ module CTioga2
         # names of the attributes, while still showing them up
         # properly documented in rdoc.
         def self.attr_accessor(symbol)
+          cal = caller
+          # if ! (caller[0] =~ /typed_attribute/)
+          #   puts "Deprecated use at #{caller[0]}"
+          # end
           @attributes ||= []
           @attributes << symbol
           OldAttrAccessor.call(symbol)

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     # All the styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 105 $', '$Date: 2009-09-17 22:17:16 +0200 (Thu, 17 Sep 2009) $')
-
   module Graphics
 
     module Styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 540 $', '$Date: 2013-10-04 00:05:23 +0200 (Fri, 04 Oct 2013) $')
-
   module Graphics
 
     module Styles

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

@@ -18,8 +18,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     module Styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
-
   module Graphics
 
     module Styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 466 $', '$Date: 2013-08-31 13:10:38 +0200 (Sat, 31 Aug 2013) $')
-
   module Graphics
 
     # All the styles

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

@@ -18,8 +18,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 123 $', '$Date: 2010-01-10 02:45:47 +0100 (Sun, 10 Jan 2010) $')
-
   module Graphics
 
     # All the styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
-
   module Graphics
 
     module Styles

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

@@ -19,8 +19,6 @@ require 'ctioga2/graphics/coordinates'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 335 $', '$Date: 2012-12-23 00:29:44 +0100 (Sun, 23 Dec 2012) $')
-
   module Graphics
 
     module Styles