ctioga2 0.7 → 0.8

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 387 $', '$Date: 2013-03-12 09:33:37 +0100 (Tue, 12 Mar 2013) $')
-
   module Graphics
 
     module Styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # 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
 
     # All the styles

data/lib/ctioga2/graphics/styles/map-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$', '$Date$')
-
   module Graphics
 
     module Styles

data/lib/ctioga2/graphics/styles/plot-types.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
@@ -56,15 +54,21 @@ EOD
 
         def prepare
           @reversed = {}
-          
+
           2.times do |i|
             val = self.send("z#{i+1}")
             if val
               @reversed[val] = i
+              @needed = i+1
             end
           end
         end
 
+        # The number of Z columns needed for the style. 
+        def z_columns_needed
+          return @needed || 0
+        end
+
         # Returns the marker style for the given Z values.
         #
         # This will only work if #prepare has been called first !
@@ -116,6 +120,50 @@ EOD
         end
 
       end
+
+      CumulativeHistogramsType = 
+        CmdType.new('cumulative-histograms',
+                    {
+                      :type => :integer,
+                      :shortcuts => {
+                        /next/i => :next,
+                        /no|false/i => false
+                      }
+                    }, <<EOD)
+How to specify that histograms should be stacked. Can be:
+ * a positive number, in which case the following histograms
+   will be added to the numbered one (0 is the first)
+ * no/false, in which case the following histograms are not stacked
+ * next, in which case the following histograms get stacked on a new slot
+EOD
+
+
+      # This class defines various informations about the look of
+      # histograms.
+      class HistogramStyle < BasicStyle 
+
+        # Separation between the histograms inside a group of histogram
+        typed_attribute :intra_sep, 'dimension'
+
+        # Separation between the histograms of different groups
+        typed_attribute :gap, 'dimension'
+
+        # Specs for cumulative 
+        typed_attribute :cumulative, 'cumulative-histograms'
+
+        def set_from_hash(hash, name = "%s")
+          super
+
+          if @cumulative == :next
+            @last_neg ||= 0
+            @last_neg -= 1
+            @cumulative = @last_neg
+          end
+            
+        end
+
+
+      end
     end
 
   end

data/lib/ctioga2/graphics/styles/plot.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: 521 $', '$Date: 2013-09-21 18:55:05 +0200 (Sat, 21 Sep 2013) $')
-
   module Graphics
 
     module Styles

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

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

data/lib/ctioga2/graphics/styles/sheet.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$', '$Date$')
-
   module Graphics
 
     module Styles

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

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 478 $', '$Date: 2013-09-01 11:24:02 +0200 (Sun, 01 Sep 2013) $')
-
   module Graphics
 
     module Styles

data/lib/ctioga2/graphics/styles/ticks.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$', '$Date$')
-
   module Graphics
 
     module Styles

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 214 $', '$Date: 2010-12-31 02:50:03 +0100 (Fri, 31 Dec 2010) $')
-
   module Graphics
 
     # The group containing all commands linked to subplots and other

data/lib/ctioga2/graphics/types.rb

@@ -26,8 +26,6 @@ require 'ctioga2/graphics/types/grid'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 523 $', '$Date: 2013-09-22 15:31:16 +0200 (Sun, 22 Sep 2013) $')
-
   module Graphics
 
     # A small convenience module for line styles
@@ -96,7 +94,9 @@ EOD
                       /no(ne)?|off/i => false,
                     }
                   }, <<EOD)
-A line style, or @no@, @none@ or @off@ to mean no line.
+A line style, which is one of @solid@, @dots@, @dashes@, @small_dots@,
+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
 
     MarkerType = 
@@ -109,7 +109,14 @@ EOD
                       'none' => 'None',
                       'off' => 'None', 
                     },}, <<EOD)
-A Tioga Marker.
+A Tioga Marker, ie either a name from the list at {url:
+http://tioga.rubyforge.org/doc/Tioga/MarkerConstants.html}, such as
+@Box@, @Star@, @Spade@ or two or three comma-separated numbers,
+_font_, _number_ and _width_. _font_ defines the font (standard PDF
+fonts, from 1 to 14), _number_ the number of the character within the
+font (between 0 and 255), and if _width_ is specified, the marker is
+stroked and not filled, and the number is the line width for the
+stroke.
 EOD
 
     PointType = 

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
-
   module Graphics
 
     module Types

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 125 $', '$Date: 2010-01-12 00:56:15 +0100 (Tue, 12 Jan 2010) $')
-
   # This module contains all graphical elements of CTioga2
   module Graphics
 

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 92 $', '$Date: 2009-06-24 01:17:46 +0200 (Wed, 24 Jun 2009) $')
-
   # This module contains all graphical elements of CTioga2
   module Graphics
 

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 469 $', '$Date: 2013-08-31 14:10:56 +0200 (Sat, 31 Aug 2013) $')
-
   module Graphics
 
     module Types

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Graphics
 
     module Types
@@ -66,33 +64,47 @@ module CTioga2
           return @type != :none
         end
 
+        # Wether we are closing by a vertical line
+        def vertical?
+          return (@type == :x || @type == :left || @type = :right)
+        end
+
+        # Wether we are closing with a horizontal line
+        def horizontal?
+          return (@type == :y || @type == :bottom || @type = :top)
+        end
+
+        # Returns the effective value of the 
+        def effective_value(bounds)
+          case @type
+          when :bottom, :top
+            return bounds.send(@type)
+          when :left, :right
+            return bounds.send(@type)
+          else
+            return @value
+          end
+        end
+
         # Closes the current path according to the current style, based on:
         #  * _bounds_, the boundaries of the plot
         #  * _first_, the first point ([x, y])
         #  * _last_, the last point
         def close_path(t, bounds, first, last)
           tp = @type
-          target = @value
+          target = effective_value(bounds)
+
           case tp
           when :none
             raise "Close the path !"
-          when :bottom, :top
-            target = bounds.send(tp)
-            tp = :y
-          when :left, :right
-            target = bounds.send(tp)
-            tp = :x
-          end
-
-          case tp
-          when :x
+          when :x, :left, :right
             t.append_point_to_path(target, last[1])
             t.append_point_to_path(target, first[1])
-          when :y
+          when :y, :bottom, :top
             t.append_point_to_path(last[0], target)
             t.append_point_to_path(first[0], target)
           when :xy
-            t.append_point_to_path(* @value.to_figure_xy(t))
+            t.append_point_to_path(* target.to_figure_xy(t))
           when :close
           else
             raise "Should not be here"

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

@@ -19,8 +19,6 @@ require 'ctioga2/graphics/types/boxes'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 147 $', '$Date: 2010-04-06 21:13:28 +0200 (Tue, 06 Apr 2010) $')
-
   module Graphics
 
     module Types

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 360 $', '$Date: 2012-12-26 11:09:11 +0100 (Wed, 26 Dec 2012) $')
-
   module Graphics
 
     module Types

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

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 196 $', '$Date: 2010-11-25 20:15:32 +0100 (Thu, 25 Nov 2010) $')
-
   module Graphics
 
     module Types

data/lib/ctioga2/log.rb

@@ -16,8 +16,6 @@ require 'logger'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 522 $', '$Date: 2013-09-22 12:02:48 +0200 (Sun, 22 Sep 2013) $')
-
   # This module should be included (or extended) by every class that
   # need logging/debugging facilities.
   #

data/lib/ctioga2/metabuilder/type.rb

@@ -19,8 +19,6 @@
 require 'ctioga2/utils'
 
 module CTioga2
-
-  Version::register_svn_info('$Revision: 523 $', '$Date: 2013-09-22 15:31:16 +0200 (Sun, 22 Sep 2013) $')
   
 
   # The MetaBuilder module contains a framework to perform

data/lib/ctioga2/metabuilder/types/coordinates.rb

@@ -20,8 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
-
   module MetaBuilder
     module Types
 

data/lib/ctioga2/metabuilder/types/data.rb

@@ -20,8 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 171 $', '$Date: 2010-10-22 17:07:52 +0200 (Fri, 22 Oct 2010) $')
-
   module MetaBuilder
     module Types
 

data/lib/ctioga2/metabuilder/types/dates.rb

@@ -19,7 +19,6 @@ require 'time'
 require 'ctioga2/utils'
 
 module CTioga2
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
 
   module MetaBuilder
 

data/lib/ctioga2/metabuilder/types/generic.rb

@@ -20,9 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
-
   module MetaBuilder
 
     module Types

data/lib/ctioga2/metabuilder/types/lists.rb

@@ -20,9 +20,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 484 $', '$Date: 2013-09-02 22:44:42 +0200 (Mon, 02 Sep 2013) $')
-
-
   module MetaBuilder
 
     # The module Types should be used for all subclasses of
@@ -213,6 +210,31 @@ module CTioga2
             nb.times do |i|
               array << Utils::mix_objects(e,s, i * fact)
             end
+          elsif str =~ /(.*)!(\d+)(?:!(.*))?\s*$/
+            # We have a mixing
+            nb = $2.to_i
+            fact = nb*0.01
+            if fact > 1.0 || fact < 0.0
+              error { "Invalid number for mixing: #{nb}, using 50"}
+              fact = 0.5
+            end
+            st1 = $1
+            st2 = $3 || 'White' # default to colors !
+
+            ar1 = string_to_type(st1)
+            ar2 = string_to_type(st2)
+            
+            # Make all the sequential combinations until we fall back
+            # on the first one.
+            ts = ar1.size.lcm(ar2.size)
+            ar1 *= ts/ar1.size
+            ar2 *= ts/ar2.size
+
+            arf = []
+            ar1.each_index do |i|
+              arf << Utils::mix_objects(ar1[i], ar2[i], fact)
+            end
+            return arf
           else
             array = super
           end