ctioga2 0.6.1 → 0.7

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

@@ -22,7 +22,7 @@ require 'shellwords'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 391 $', '$Date: 2013-03-14 11:04:36 +0100 (Thu, 14 Mar 2013) $')
+  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
 
   module Graphics
 
@@ -83,6 +83,22 @@ module CTioga2
           @options = options
         end
 
+        undef :clipped, :clipped=
+
+        def clipped
+          if @options.key? 'clipped'
+            return @options['clipped']
+          else
+            return true         # Defaults to clipped
+          end
+        end
+
+        undef :depth, :depth=
+          
+        def depth
+          @options['depth'] || 50
+        end
+
         @known_primitives = {}
 
         PrimitiveCommands = {}
@@ -111,7 +127,9 @@ module CTioga2
                             CmdArg.new(v)
                           end
           end
-          
+
+          cmd_opts['clipped'] = CmdArg.new('boolean')
+          cmd_opts['depth'] = CmdArg.new('integer')
           cmd = Cmd.new("draw-#{name}",nil,"--draw-#{name}", 
                         cmd_args, cmd_opts) do |plotmaker, *rest|
             options = rest.pop

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 329 $', '$Date: 2012-12-11 00:13:17 +0100 (Tue, 11 Dec 2012) $')
+  Version::register_svn_info('$Revision: 540 $', '$Date: 2013-10-04 00:05:23 +0200 (Fri, 04 Oct 2013) $')
 
   module Graphics
 
@@ -132,6 +132,24 @@ module CTioga2
         end
 
 
+        def clip_and_plot(t, elements)
+          clusters = Utils::cluster_by_value(elements, :clipped)
+          
+          for clst in clusters
+            t.context do
+              if clst[0].clipped
+                t.clip_to_frame
+              end
+              for element in clst 
+                t.context do 
+                  t.set_bounds(get_el_boundaries(element).to_a)
+                  element.do(t)
+                end
+              end
+            end
+          end
+        end
+
 
         # Plots all the objects inside the plot.
         def real_do(t)
@@ -151,24 +169,44 @@ module CTioga2
             # Manually creating the plot:
             t.set_bounds(real_boundaries.to_a)
 
+            # First, gather up all elements by depth
+
+            els_by_depth = Utils::sort_by_value(@elements, :depth)
+
+            background = []
+            mid = []
+            fore = []
+
+            # Organize by depth
+            for depth in els_by_depth.keys.sort.reverse
+              v = els_by_depth[depth]
+              if depth && (depth >= 90)
+                background += v
+              elsif depth && depth <= 10
+                fore += v
+              else
+                mid += v
+              end
+            end
+
             # Drawing the background elements:
+
+            clip_and_plot(t, background)
+
             t.context do
               t.clip_to_frame
 
               @style.background.draw_background(t)
 
               @style.draw_all_background_lines(t)
-              i = 0
-              for element in @elements 
-                t.context do 
-                  t.set_bounds(get_el_boundaries(element).to_a)
-                  element.do(t)
-                end
-                i += 1
-              end
             end
+
+            clip_and_plot(t, mid)
+
             @style.draw_all_axes(t, @computed_boundaries)
 
+            clip_and_plot(t, fore)
+
             # Now drawing legends:
             if @legend_area
               a, b = @legend_area.partition_frame(t, self)

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

@@ -26,14 +26,11 @@ module CTioga2
     module Elements
 
       # This class displays a XYZ element using contour lines.
-      class XYZContour  < TiogaElement
+      class XYZContour  < 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.
         #
@@ -44,7 +41,6 @@ module CTioga2
         attr_accessor :table
 
 
-        undef :location=, :location
         
         # Creates a new XYZContour object with the given _dataset_ and
         # _style_.
@@ -63,11 +59,6 @@ module CTioga2
         
         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

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

@@ -19,7 +19,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
+  Version::register_svn_info('$Revision: 535 $', '$Date: 2013-10-02 20:31:21 +0200 (Wed, 02 Oct 2013) $')
 
   module Graphics
 
@@ -30,26 +30,15 @@ module CTioga2
       #
       # @todo There should be a way to automatically display level
       # lines, and possibly only that.
-      class XYZMap  < TiogaElement
+      class XYZMap  < 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
-
         # The IndexedTable object representing the underlying data
         attr_accessor :table
 
 
-        undef :location=, :location
-        
         # Creates a new XYZMap object with the given _dataset_ and
         # _style_.
         def initialize(dataset, style = nil)
@@ -65,12 +54,6 @@ module CTioga2
         
         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 @table.xy_boundaries

data/lib/ctioga2/graphics/generator.rb

@@ -16,9 +16,12 @@ require 'ctioga2/log'
 
 require 'ctioga2/graphics/coordinates'
 
+require 'ctioga2/graphics/styles/base'
+require 'ctioga2/graphics/styles/plot-types'
+
 module CTioga2
 
-  Version::register_svn_info('$Revision: 481 $', '$Date: 2013-09-01 12:08:37 +0200 (Sun, 01 Sep 2013) $')
+  Version::register_svn_info('$Revision: 513 $', '$Date: 2013-09-19 00:43:28 +0200 (Thu, 19 Sep 2013) $')
 
   module Graphics
 
@@ -41,11 +44,22 @@ module CTioga2
       # The current kind of generated. It is a symbol
       attr_accessor :current_curves
 
+      # Information used for the various curve types. They are not
+      # strictly speaking curve styles or would simply clutter the
+      # overall curve styles with many meaningless
+      # parameters/options. They therefore belong here.
+
+      # A ParametricPlotStyle object handling the style of the
+      # parametric plots.
+      attr_accessor :xy_parametric_parameters
+
       # Creates a CurveGenerator object.
       def initialize
         @legend_provider = Legends::LegendProvider.new
         @style_factory = Styles::CurveStyleFactory.new
         @current_curves = :xy_plot
+
+        @xy_parametric_parameters = Styles::ParametricPlotStyle.new
       end
 
       PlotOptions = { 
@@ -105,8 +119,8 @@ module CTioga2
         style.legend ||= legend # The legend specified as option to
                                 # the --plot command has precedence
                                 # over the one specified by --legend.
-        curve = Graphics::Elements::Parametric2D.new(dataset, style)
-        style
+        curve = Graphics::Elements::Parametric2D.
+          new(dataset, style, @xy_parametric_parameters.dup)
         return curve
       end
 
@@ -148,8 +162,11 @@ module CTioga2
     
 
     XYParametricPlotCommand = 
-      Cmd.new("xy-parametric",nil,"--xy-parametric") do |plotmaker|
+      Cmd.new("xy-parametric",nil,"--xy-parametric", 
+              [], Styles::ParametricPlotStyle.options_hash) do |plotmaker, opts|
       plotmaker.curve_generator.current_curves = :xy_parametric
+      plotmaker.curve_generator.
+        xy_parametric_parameters.set_from_hash(opts)
     end
     
     XYParametricPlotCommand.describe('select XY parametric plots', 

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

@@ -23,6 +23,18 @@ module CTioga2
 
     # All the styles
     module Styles
+      BoxShapeRE = {
+        /^square$/i => :square,
+        /^round(ed)?$/i => :round,
+      }
+
+      BoxShape = 
+        CmdType.new('box-shape', {:type => :re_list,
+                      :list => BoxShapeRE}, <<EOD)
+The shape of a box. It can be:
+ * @square@ for a plain square box
+ * @round@ for a rounded box
+EOD
 
       # This class represents styles attached to a box
       #
@@ -31,6 +43,55 @@ module CTioga2
 
         sub_style 'fill', FillStyle
 
+        typed_attribute 'shape', 'box-shape'
+
+        # Radius of rounded box
+        typed_attribute 'radius', 'dimension'
+
+        def initialize
+          @shape = :square
+          @radius = Types::Dimension::new(:dy, 1.0)
+        end
+
+        def prepare_path(t, x1, y1, x2, y2)
+          case @shape
+          when :square
+            t.append_rect_to_path(x1, y1, x2 - x1, y2 - y1)
+          when :round
+            dx = @radius.to_figure(t, :x)
+            dy = @radius.to_figure(t, :y)
+
+            xl = x1
+            xr = x2
+            xl,xr = xr, xl if xl > xr
+
+            yt = y1
+            yb = y2
+            yb,yt = yt,yb if yb > yt
+            
+            t.move_to_point(xl, yt - dy)
+            t.append_curve_to_path(xl, yt - 0.5 * dy, # First control point
+                                   xl + 0.5 * dx, yt, 
+                                   xl + dx, yt)
+            t.append_point_to_path(xr - dx, yt)
+            t.append_curve_to_path(xr - 0.5 * dx, yt,
+                                   xr, yt - 0.5 * dy, 
+                                   xr, yt - dy)
+
+            t.append_point_to_path(xr, yb + dy)
+            t.append_curve_to_path(xr, yb + 0.5 * dy, # First control point
+                                   xr - 0.5 * dx, yb, 
+                                   xr - dx, yb)
+            t.append_point_to_path(xl + dx, yb)
+            t.append_curve_to_path(xl + 0.5 * dx, yb, # First control point
+                                   xl, yb + 0.5 * dy, 
+                                   xl, yb + dy)
+            t.close_path
+          else
+            raise "Unknown box shape: #{@shape}"
+          end
+        end
+
         def draw_box(t, x1, y1, x2, y2)
           t.context do
             t.discard_path
@@ -38,12 +99,12 @@ module CTioga2
             ## @todo Rounded rects!
             if fill && fill.color
               fill.setup_fill(t)
-              t.append_rect_to_path(x1, y1, x2 - x1, y2 - y1)
+              prepare_path(t, x1, y1, x2, y2)
               fill.do_fill(t)
             end
             if color
               set_stroke_style(t)
-              t.append_rect_to_path(x1, y1, x2 - x1, y2 - y1)
+              prepare_path(t, x1, y1, x2, y2)
               t.stroke
             end
           end

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 377 $', '$Date: 2013-02-01 12:10:20 +0100 (Fri, 01 Feb 2013) $')
+  Version::register_svn_info('$Revision: 540 $', '$Date: 2013-10-04 00:05:23 +0200 (Fri, 04 Oct 2013) $')
 
   module Graphics
 
@@ -255,7 +255,7 @@ module CTioga2
               if last_value + 1 < i
                 (last_value+1).upto(i - 1) do |j|
                   frac = (j - last_value)/(i - last_value + 1.0)
-                  p [last_value, j, i, frac]
+                  # p [last_value, j, i, frac]
                   z_values[j] = z_values[last_value] * frac + 
                     z_values[i] * (1 - frac)
                 end

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 416 $', '$Date: 2013-08-23 00:35:49 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
 
   module Graphics
 
@@ -52,6 +52,12 @@ module CTioga2
         # the filled region.
         typed_attribute :region_position, "region-side"
 
+        # Wether that element is clipped or not.
+        typed_attribute :clipped, 'boolean'
+
+        # The depth. 
+        typed_attribute :depth, 'integer'
+
         # A path style.
         #
         # @todo Ideas for a path style include
@@ -79,6 +85,11 @@ module CTioga2
         # A colormap for markers (only for XYZ data) 
         typed_attribute :marker_color_map, 'colormap'
 
+        # If this is specified when choosing the marker scale as a
+        # function of a given Z value, then the original Z segment is
+        # mapped to min_scale -> scale.
+        typed_attribute :marker_min_scale, 'float-or-false'
+
         # Whether the XY display should split on NaN values (wherever)
         typed_attribute :split_on_nan, 'boolean'
 
@@ -92,6 +103,11 @@ module CTioga2
         # Generator#curve_from_dataset
         attr_accessor :target
 
+        def initialize()
+          @clipped = true
+          @depth = 50
+        end
+
         # True if a line should be drawn.
         def has_line?
           return @line && @line.style

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: 489 $', '$Date: 2013-09-03 01:03:12 +0200 (Tue, 03 Sep 2013) $')
+  Version::register_svn_info('$Revision: 531 $', '$Date: 2013-09-29 00:07:44 +0200 (Sun, 29 Sep 2013) $')
 
   module Graphics
 
@@ -246,7 +246,8 @@ module CTioga2
             'line_style' => LineStyles::Solid,
             'marker_marker' => false,
             'marker_scale' => 0.5,
-            'fill_color' => '=color'.to_sym
+            'fill_color' => '=color'.to_sym,
+            'error_bar_color' => '=marker_color'.to_sym
           }
           @parameters_carrays = {}
           for target, param in self.class.parameters
@@ -336,6 +337,8 @@ module CTioga2
 
         simple_parameter 'marker_scale', "marker scale", Sets::LineWidthSets
 
+        simple_parameter 'marker_min_scale', "marker scale", nil
+
         # Error bars:
         simple_parameter 'error_bar_color', "error bar color", 
         Sets::ColorSets
@@ -353,6 +356,10 @@ module CTioga2
 
         simple_parameter 'fill_color', "fill color", Sets::ColorSets
 
+        simple_parameter 'clipped', "clipped", nil
+
+        simple_parameter 'depth', "depth", nil
+
         simple_parameter 'fill_transparency', 'fill transparency', {}
 
         # Region handling