ctioga2 0.13.1 → 0.14

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

@@ -133,7 +133,13 @@ module CTioga2
           end
           for k, b in bounds
             if ! b.valid?
-              error { "Invalid computed range, you probably have only empty datasets" }
+              if b.nan?
+                error { "Invalid computed range, you have NaNs in your data (missing data ?)" }
+              elsif b.infinite?
+                error { "Infinite computed range, you have infinite numbers in your data" }
+              else
+                error { "Invalid computed range, you probably have only empty datasets" }
+              end
               bounds[k] = Types::SimpleRange.new(0.0,1.0)
             end
           end

data/lib/ctioga2/graphics/generator.rb

@@ -88,8 +88,7 @@ module CTioga2
         old_opts = options.dup
         # Now, we trim options unrelated to the plotting
         options.delete_if { |k,v|
-          ! Graphics::Styles::
-          CurveStyleFactory::PlotCommandOptions.key?(k)
+          ! Graphics::Styles::CurveStyleFactory::PlotCommandOptions.key?(k)
         }
 
         begin

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

@@ -79,6 +79,9 @@ module CTioga2
         #
         def display_legend(t, container)
           items = container.legend_storage.harvest_contents
+          if self.hidden
+            return              # Not doing anything
+          end
           t.context do 
 
             ## @todo These two commands should join LegendStyle

data/lib/ctioga2/graphics/root.rb

@@ -137,11 +137,27 @@ module CTioga2
       #
       # For the sake of convenience, returns the newly created
       # Elements::Subplot
-      def subplot(opts)
+      def subplot(opts, box = nil)
         if ! @current_container
           enter_subobject(Elements::Container.new(nil, self, {}))
         end
-        subplot = Elements::Subplot.new(@current_container, self, opts)
+
+        o = opts.dup
+        o["class"] ||= []
+
+        # We add automatic classes from the box
+        #
+        # Most of the time empty, for sure.
+        if box
+          o["class"] += box.classes
+        end
+
+        subplot = Elements::Subplot.new(@current_container, self, o)
+
+        if box
+          subplot.subframe = box
+        end
+
         enter_subobject(subplot)
         return subplot
       end

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

@@ -91,6 +91,12 @@ module CTioga2
         # A colormap for markers (only for XYZ data) 
         typed_attribute :marker_color_map, 'colormap'
 
+        # A colormap for the line of markers (only for XYZ data) 
+        typed_attribute :marker_line_color_map, 'colormap'
+
+        # A colormap for the fill color of markers (only for XYZ data) 
+        typed_attribute :marker_fill_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.

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

@@ -50,10 +50,14 @@ module CTioga2
       class StrokeStyle < LineStyle
         # The color
         typed_attribute :color, 'color-or-false'
+
+        # The line cap
+        typed_attribute :cap, 'line-cap'
         
         # Sets the stroke style to a FigureMaker object, _t_.
         def set_stroke_style(t)
           t.stroke_color = @color if @color
+          t.line_cap = @cap if @cap
           super
         end
 

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

@@ -353,6 +353,8 @@ module CTioga2
 
         simple_parameter 'line_style', 'line style', Sets::LineStyleSets
 
+        simple_parameter 'line_cap', 'line cap', nil
+
         # Markers
         simple_parameter 'marker', 'marker', Sets::MarkerSets, '-m'
 
@@ -409,12 +411,9 @@ module CTioga2
 
         simple_parameter 'zaxis', "name for the Z axis"
 
-        ## @todo For xy-parametric, there should be a way to specify
-        ## to which z value the maps apply (ie lines = y2, marker =
-        ## y3...). Although for readability, it is probably better
-        ## to avoid that...
         simple_parameter 'marker_color_map', 'color map for markers'
-
+        simple_parameter 'marker_line_color_map', 'color map for the lines of markers'
+        simple_parameter 'marker_fill_color_map', 'color map for the lines of markers'
         simple_parameter 'split_on_nan', 'split on NaN'
 
 

data/lib/ctioga2/graphics/styles/plot-types.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 # contour.rb: the style of a contour plot
 # copyright (c) 2009 by Vincent Fourmond
   
@@ -24,6 +25,8 @@ module CTioga2
 
       StyleAspectRE = {
         /^marker[_-]color$/i => :marker_color,
+        /^marker[_-]fill[_-]color$/i => :marker_fill_color,
+        /^marker[_-]line[_-]color$/i => :marker_line_color,
         /^marker[_-](size|scale)$/i => :marker_scale,
       }
 
@@ -48,6 +51,12 @@ EOD
         # What is the z2 axis
         typed_attribute :z2, 'style-aspect'
 
+        # What is the z3 axis
+        typed_attribute :z3, 'style-aspect'
+        
+        # What is the z4 axis
+        typed_attribute :z4, 'style-aspect'
+
         def initialize
           @z1 = :marker_color
         end
@@ -55,7 +64,7 @@ EOD
         def prepare
           @reversed = {}
 
-          2.times do |i|
+          4.times do |i|
             val = self.send("z#{i+1}")
             if val
               @reversed[val] = i
@@ -106,12 +115,18 @@ EOD
 
           end
 
-          if @reversed[:marker_color]
-            idx = @reversed[:marker_color]
-            if idx < zvalue.size
-              style.color = curve_style.marker_color_map.z_color(zvalue[idx], 
-                                                                 zmin[idx], 
-                                                                 zmax[idx])
+          for bs in [:color, :line_color, :fill_color]
+            stl = "marker_#{bs}".to_sym
+            if @reversed[stl]
+              idx = @reversed[stl]
+              if idx < zvalue.size
+                map = curve_style.send("#{stl}_map")
+                if map
+                  style.send("#{bs}=",map.z_color(zvalue[idx], 
+                                                  zmin[idx], 
+                                                  zmax[idx]))
+                end
+              end
             end
           end
 

data/lib/ctioga2/graphics/subplot-commands.rb

@@ -135,8 +135,7 @@ EOD
                CmdArg.new('box'),
               ], Elements::TiogaElement::StyleBaseOptions) do |plotmaker, box, opts|
       Log::debug { "Starting a subplot with specs #{box.inspect}" }
-      subplot = plotmaker.root_object.subplot(opts)
-      subplot.subframe = box
+      subplot = plotmaker.root_object.subplot(opts, box)
     end
     
     InsetCommand.describe('Begins a new inset',
@@ -153,8 +152,7 @@ EOD
                CmdArg.new('box'),
               ], Elements::TiogaElement::StyleBaseOptions) do |plotmaker, box,opts|
       plotmaker.root_object.leave_subobject
-      subplot = plotmaker.root_object.subplot(opts)
-      subplot.subframe = box
+      subplot = plotmaker.root_object.subplot(opts, box)
     end
     
     NextInsetCommand.describe('Ends the previous inset and begins a new one',

data/lib/ctioga2/graphics/types.rb

@@ -102,6 +102,23 @@ a series of comma-separated numbers which are the length of the
 strokes and gaps, or @no@, @none@ or @off@ to mean no line.
 EOD
 
+    LineCapType = 
+      CmdType.new('line-cap', {
+                    :type => :list,
+                    :list => {},
+                    :shortcuts => {
+                      'butt' => Tioga::FigureConstants::LINE_CAP_BUTT,
+                      'round' => Tioga::FigureConstants::LINE_CAP_ROUND,
+                      'square' => Tioga::FigureConstants::LINE_CAP_SQUARE,
+                    }
+                  }, <<EOD)
+A line cap style, i.e. how the line extends beyond its last point.
+Available choices:
+ * @round@ (extends as a half circle default)
+ * @butt@ (does not extend at all)
+ * @square@ (extends as a half square)
+EOD
+
     MarkerType = 
       CmdType.new('marker', {
                     :type => :tioga_marker,

data/lib/ctioga2/graphics/types/boundaries.rb

@@ -51,6 +51,16 @@ module CTioga2
                   Utils::finite_number?(@last))
         end
 
+        def nan?
+          return (Utils::nan_number?(@first) or
+                  Utils::nan_number?(@last))
+        end
+
+        def infinite?
+          return (Utils::infinite_number?(@first) or
+                  Utils::infinite_number?(@last))
+        end
+
         # Minimum value
         def min
           @first < @last ? @first : @last

data/lib/ctioga2/graphics/types/boxes.rb

@@ -44,6 +44,24 @@ module CTioga2
           xl, yt, xr, yb = self.to_frame_coordinates(t)
           return [xl, 1 - xr, 1 - yt, yb]
         end
+
+        # Runs the block within the context of the box.
+        def within_frames(t, frame_coords = true)
+          t.context do
+            t.subfigure(self.to_frame_margins(t)) do
+              if frame_coords
+                t.set_bounds([0, 1, 1, 0])
+              end
+              yield
+            end
+          end
+        end
+
+        # The classes enumerated here get added to the class list of
+        # the subwindow
+        def classes
+          return []
+        end
         
       end
 

data/lib/ctioga2/graphics/types/dimensions.rb

@@ -77,6 +77,10 @@ module CTioga2
           return Dimension.new(@type, -@value, @orientation)
         end
 
+        def *(fct)
+          return Dimension.new(@type, @value*fct, @orientation)
+        end
+
         # Returns a dimension corresponding to the distance.
         def self.get_distance(t, dx, dy)
           dx = make_dimension(dx, :x).to_bp(t)

data/lib/ctioga2/graphics/types/grid.rb

@@ -31,7 +31,7 @@ module CTioga2
 
         OptionHashRE = /([\w-]+)\s*=\s*([^,]+),?\s*/
 
-        GridBoxRE = /^\s*grid:(\d+(?:-\d+)?)\s*,\s*(\d+(?:-\d+)?)(?:,(#{OptionHashRE}+))?\s*$/
+        GridBoxRE = /^\s*grid:(?:(\d+(?:-\d+)?)\s*,\s*(\d+(?:-\d+)?)|(next))(?:,(#{OptionHashRE}+))?\s*$/
 
         # This hash helps to convert from a hash-based representation
         # of frame coordinates to the array-based one.
@@ -44,11 +44,31 @@ module CTioga2
           'yb' => 3
         }
 
+        # The position of the element in the grid (arrays [left,right]
+        # or [top, bottom])
+        attr_accessor :x,:y
+
         def self.from_text(txt)
           if txt =~ GridBoxRE
-            return GridBox.new(GridLayout.current_grid, $1, $2, 
-                               $3) # The latter being to remove
-                                          # the initial comma
+            if $3               # next
+              x = 0
+              y = 0
+              grd = GridLayout.current_grid
+              lastel = grd.elements.last
+              if lastel
+                x = lastel.x.max + 1
+                y = lastel.y.max
+                if x >= grd.xsize
+                  x = 0
+                  y += 1
+                end
+              end
+              return GridBox.new(grd, x, y, $4)
+            else
+              return GridBox.new(GridLayout.current_grid, $1, $2, 
+                                 $4) # The latter being to remove
+            # the initial comma
+            end
           else
             raise "#{txt} is not a grid box."
           end
@@ -63,6 +83,19 @@ module CTioga2
             return [str.to_i, str.to_i]
           end
         end
+
+        # Returns false if the position given by @x and @y are within
+        # the grid
+        def within_grid?
+          if @x.min < 0 || @x.max >= @grid.xsize
+            return false
+          end
+          if @y.min < 0 || @y.max >= @grid.ysize
+            return false
+          end
+          return true
+        end
+          
         
         def initialize(grid, x, y, options = {})
           if options.is_a? String
@@ -83,6 +116,12 @@ module CTioga2
           @x = parse_range(x).sort
           @y = parse_range(y).sort
           @overrides = options || {}
+
+          if ! within_grid?
+            raise "Grid element #{x},#{y} is outside grid boundaries (#{@grid.xsize}x#{@grid.ysize})"
+          end
+
+          @grid.elements << self
         end
 
         def to_frame_coordinates(t)
@@ -99,6 +138,48 @@ module CTioga2
           end
           return a
         end
+
+        def classes
+          rv = []
+          hsh = {
+            'left' => @x.min == 0,
+            'right' => @x.max + 1 == @grid.xsize,
+            'top' => @y.min == 0,
+            'bottom' => @y.max + 1 == @grid.ysize
+          }
+          for k, v in hsh
+            if v
+              rv << "grid-#{k}"
+            else
+              rv << "grid-non-#{k}"
+            end
+          end
+
+          xv = nil
+          yv = nil
+          if @x.min == @x.max
+            xv = @x.min
+            rv << "grid-column-#{xv}"
+            if xv.even?
+              rv << "grid-even-column"
+            else
+              rv << "grid-odd-column"
+            end
+          end
+          if @y.min == @y.max
+            yv = @y.min
+            rv << "grid-row-#{yv}"
+            if yv.even?
+              rv << "grid-even-row"
+            else
+              rv << "grid-odd-row"
+            end
+          end
+          if xv && yv
+            rv << "grid-#{xv}-#{yv}"
+          end
+          return rv
+        end
       end
 
       # This class provides a grid-like layout through the use of a grid
@@ -125,6 +206,9 @@ module CTioga2
         # Vertical scales
         attr_accessor :vscales
 
+        # The GridBox objects we've seen so far
+        attr_accessor :elements
+
         def initialize(nup = "2x2")
           if nup.respond_to?(:split)
             if nup =~ /,/
@@ -156,6 +240,8 @@ module CTioga2
 
           @hscales ||= [1] * @nup[0]
           @vscales ||= [1] * @nup[1]
+
+          @elements = []
         end
 
         # The grid currently in use.
@@ -169,6 +255,14 @@ module CTioga2
           return @current_grid
         end
 
+        def xsize
+          return @hscales.size
+        end
+
+        def ysize
+          return @vscales.size
+        end
+
         # Compute the frame coordinates fo the x,y element of the
         # grid. They are numbered from the top,left element.
         def frame_coordinates(t, x, y)

data/lib/ctioga2/graphics/types/point.rb

@@ -216,6 +216,15 @@ module CTioga2
           @valign = valign
         end
 
+        def self.from_point(pt, halign = :center, valign = :center)
+          a = AlignedPoint.new
+          a.x = pt.x
+          a.y = pt.y
+          a.halign = halign
+          a.valign = valign
+          return a
+        end
+
         # Returns frame coordinates corresponding to the point, the
         # alignment and the given size in figure coordinates
         def to_frame_coordinates(t, width, height)