ctioga2 0.9 → 0.10

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

@@ -240,20 +240,20 @@ larger than the other ones, while the second row is four times larger
 than the first.
 EOH
 
-    ZoomCommand =         
-      Cmd.new("zoom-inset",nil,"--zoom-inset", 
-              [
-               CmdArg.new('box'),
-              ]) do |plotmaker, box|
-      subplot = plotmaker.root_object.subplot
-      subplot.subframe = box
-      raise YetUnimplemented.new("zooms are not yet implemented !")
-    end
+#     ZoomCommand =         
+#       Cmd.new("zoom-inset",nil,"--zoom-inset", 
+#               [
+#                CmdArg.new('box'),
+#               ]) do |plotmaker, box|
+#       subplot = plotmaker.root_object.subplot
+#       subplot.subframe = box
+#       raise YetUnimplemented.new("zooms are not yet implemented !")
+#     end
     
-    ZoomCommand.describe('Starts an inset ',
-                          <<EOD, SubplotsGroup)
-Zooms are currently not implemented yet.
-EOD
+#     ZoomCommand.describe('Starts an inset ',
+#                           <<EOD, SubplotsGroup)
+# Zooms are currently not implemented yet.
+# EOD
 
 
   end

data/lib/ctioga2/graphics/types.rb

@@ -43,7 +43,8 @@ module CTioga2
       Dot_Long_Dash = Line_Type_Dot_Long_Dash
       Dash_Dot_Dot = Line_Type_Dash_Dot_Dot
     end
-
+    
+    NoRE = /no(ne)?|off/i
 
     ColorType = CmdType.new('color', {
                               :type => :tioga_color,
@@ -61,7 +62,9 @@ EOD
       CmdType.new('color-or-false', {
                     :type => :tioga_color,
                     :namespace => Tioga::ColorConstants,
-                    :shortcuts => {'none' => false }
+                    :shortcuts => { 
+                      NoRE => false 
+                    }
                   }, <<EOD)
 A {type: color}, or none to say that nothing should be drawn.
 EOD
@@ -91,7 +94,7 @@ EOD
                     :type => :tioga_line_style,
                     :namespace => LineStyles,
                     :shortcuts => {
-                      /no(ne)?|off/i => false,
+                      NoRE => false,
                     }
                   }, <<EOD)
 A line style, which is one of @solid@, @dots@, @dashes@, @small_dots@,
@@ -104,11 +107,9 @@ EOD
                     :type => :tioga_marker,
                     :namespace => Tioga::MarkerConstants,
                     :shortcuts => {
-                      'None' => 'None',
-                      'no' => 'None',
-                      'none' => 'None',
-                      'off' => 'None', 
-                    },}, <<EOD)
+                      NoRE  => 'None' 
+                    }
+                  }, <<EOD)
 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,
@@ -140,12 +141,30 @@ EOD
     JustificationType = 
       CmdType.new('justification', {:type => :re_list,
                     :list => JustificationRE}, <<EOD)
-Horizontal aligment for text. Can be one of:
+Horizontal aligment of the (with respect to its location). Can be one of:
  * @l@ or @left@
  * @c@, @center@
  * @r@, @right@
 EOD
 
+    TextAlignType = 
+      CmdType.new('text-align', 
+                  {:type => :re_list,
+                    :list => JustificationRE,
+                    :shortcut => {
+                      NoRE => :no
+                    }
+                  }, <<EOD)
+Horizontal aligment for text within its box. Only of use
+for texts with a given text width.
+Can be one of:
+ * @l@ or @left@
+ * @c@, @center@
+ * @r@, @right@
+ * @no@ or @none@ to not issue aligning commands, in which case you get 
+full LaTeX-justified paragraphs (probably with a lot of hyphens).
+EOD
+
    # Regular expression for vertical alignment
    AlignmentRE = {
       /t(op)?/i => Tioga::FigureConstants::ALIGNED_AT_TOP,
@@ -222,7 +241,7 @@ EOD
       CmdType.new('axis-decoration', :tioga_axis_type, <<EOD)
 Kinds of decoration on a axis line, such as nothing, lines, ticks, 
 tick labels. Possible values:
- * @hidden@ or @off@: no axis at all
+ * @hidden@, @off@, @no@, @none@: no axis at all
  * @line@: only a line
  * @ticks@: only ticks
  * @major@: only major ticks
@@ -264,8 +283,21 @@ where @value@ is a number and unit can be one of @pt@,
 line), @figure@ or @f@ (for figure coordinates, i.e. the coordinates of the
 plot), @frame@ or @F@ (@1.0 frame@ is the full size of the current subplot) and
 @page@ or @p@ (@1.0 page@ is the whole height/width of the output file).
+
+It can also be @auto@, which is 1.0 in frame units (ie the width or
+the height of the current plot).
 EOD
 
+
+    DimensionOrNoType = 
+      CmdType.new('dimension-or-no', { :type => :dimension, 
+                    :default => :dy,
+                    :shortcuts => {
+                      NoRE => false
+                    }
+                  }, <<EOD)
+A {type: dimension}, or @no@ or @none@.
+EOD
     # Boxes
 
     BoxType = 

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

@@ -69,13 +69,14 @@ module CTioga2
         # Actually, it even works with normal Range elements !
         def extend(range)
           # Left/right
+          
           if (! @first.is_a? Float) or @first.nan? or
-              (@first > range.first)
+              (range.first && @first > range.first)
             @first = range.first
           end
 
           if (! @last.is_a? Float) or @last.nan? or
-              (@last < range.last)
+              (range.last && @last < range.last)
             @last = range.last
           end
 

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

@@ -84,6 +84,19 @@ module CTioga2
                   1 - @right.to_frame(t), @bottom.to_frame(t)]
         end
 
+        # Converts to output coordinates
+        def to_output(t, fact = 1.0)
+          a = to_frame_coordinates(t)
+          4.times do |i|
+            a[i] = if (i % 2 == 0) 
+                     fact * t.convert_page_to_output_x(t.convert_frame_to_page_x(a[i]))
+                   else
+                     fact * t.convert_page_to_output_y(t.convert_frame_to_page_y(a[i]))
+                   end
+          end
+          return a
+        end
+
         # Returns the dimensions composing the MarginsBox, in the
         # order _left_, _right_, _top_, _bottom_, suitable for feeding
         # to MarginsBox.new.

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

@@ -137,7 +137,10 @@ module CTioga2
         # _default_ parameter.
         def self.from_text(text, orientation, default = :figure)
           # Absolute or :dy dimension
-          if text =~ DimensionRegexp
+
+          if text =~ /^\s*auto\s*$/i
+            Dimension.new(:frame, 1.0, orientation)
+          elsif text =~ DimensionRegexp
             value = Utils::txt_to_float($1)
             unit = $2
             if ! unit

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

@@ -197,8 +197,17 @@ module CTioga2
         #
         # So far, no real parsing
         def self.from_text(str)
-          str = str.gsub(/-/,"_") # Avoid problems with frozen strings
-          return PlotLocation.new(str.to_sym)
+          loc = nil
+          case str
+          when /^\s*(left|right|top|bottom|at_y_origin|at_x_origin)\s*$/i
+            loc = $1.downcase.to_sym
+          when /^s*(x|y)0\s*$/i
+            loc = "at_#{$1}_origin".downcase.to_sym
+          end
+          if ! loc
+            raise "Unkown spec for axis location: '#{str}'"
+          end
+          return PlotLocation.new(loc)
         end
 
         
@@ -213,6 +222,8 @@ A position on the plot, referenced with respect to the sides. Can be:
  * @right@
  * @top@
  * @bottom@
+ * @x0@, for the @x = 0@ position
+ * @y0@, for the @y = 0@ position
 
 In addition, there will one day be the possibility to specify an 
 offset from these locations. But that is still something to do.

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

@@ -113,6 +113,92 @@ module CTioga2
         end
       end
 
+      class Rect 
+        attr_accessor :tl
+        attr_accessor :br
+
+        def initialize(tl, br)
+          @tl = tl
+          @br = br
+        end
+
+        # Returns the [height, width] of the rectangle in postscript points
+        def dimensions(t)
+          xl, yt = @tl.to_figure_xy(t)
+          xr, yb = @br.to_figure_xy(t)
+
+          return [t.convert_figure_to_output_dx(xr - xl) * 10,
+                  t.convert_figure_to_output_dy(yb - yt) * 10]
+        end
+
+        # Returns an array of [ul, ll, lr] coordinates. If an aspect
+        # ratio is specified, the coordinates will be expanded or
+        # contracted to fit the aspect ratio (keeping the center
+        # identical).
+        def make_corners(t, swap = false, ratio_pol = :ignore, 
+                         ratio = nil)
+          
+          ul = @tl.to_figure_xy(t)
+          lr = @br.to_figure_xy(t)
+
+          width, height = *dimensions(t)
+
+          # First, swap the coords
+          if swap
+            if width < 0
+              ul[0], lr[0] = lr[0], ul[0]
+            end
+            if height > 0
+              ul[1], lr[1] = lr[1], ul[1]
+            end
+          end
+
+          # Now, we take the aspect ratio into account
+          if ratio && ratio_pol != :ignore
+
+            xc = 0.5 * (ul[0] + lr[0])
+            yc = 0.5 * (ul[1] + lr[1])
+            dx = lr[0] - ul[0]
+            dy = lr[1] - ul[1]
+
+            fact = ((width/height) / ratio).abs
+
+            what = nil
+
+            if ratio_pol == :expand
+              if fact > 1       # must increase height
+                what = :y
+              else
+                fact = 1/fact
+                what = :x
+              end
+            elsif ratio_pol == :contract
+              if fact > 1       # must decrease width
+                what = :x
+                fact = 1/fact
+              else
+                what = :y
+              end
+            else
+              raise "Unkown aspect ratio policy: #{ratio_pol}"
+            end
+
+            if what == :y
+              lr[1] = yc + fact * 0.5 * dy
+              ul[1] = yc - fact * 0.5 * dy
+            else
+              lr[0] = xc + fact * 0.5 * dx
+              ul[0] = xc - fact * 0.5 * dx
+            end
+          end
+
+          ll = [ul[0], lr[1]]
+
+          return [ul, ll, lr]
+        end
+
+      end
+
       # A Point, but with alignment facilities.
       class AlignedPoint < Point
         # Vertical alignement (:top, :center, :bottom)

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

@@ -141,7 +141,7 @@ module CTioga2
         include Tioga::FigureConstants
 
         ValidTypes = {
-          /hidden|off/i => AXIS_HIDDEN,
+          /hidden|off|no|none/i => AXIS_HIDDEN,
           /line/i => AXIS_LINE_ONLY, 
           /ticks/i => AXIS_WITH_TICKS_ONLY,
           /major/i => AXIS_WITH_MAJOR_TICKS_ONLY, 
@@ -157,7 +157,7 @@ module CTioga2
                 return v
             end
           end
-          raise IncorrectInput, "Not an axis type: '#{str}'"
+          raise IncorrectInput, "Not an axis decoration: '#{str}'"
         end
       end
 

data/lib/ctioga2/plotmaker.rb

@@ -112,6 +112,9 @@ require 'pathname'
 # Maybe, maybe, maybe... We need tioga ?
 require 'Tioga/FigureMaker'
 
+# Interaction with Ruby code
+require 'ctioga2/ruby'
+
 
 # Command interpreter
 require 'ctioga2/commands/interpreter'

data/lib/ctioga2/ruby.rb

@@ -0,0 +1,49 @@
+# ruby.rb: interaction with user-supplied Ruby code
+# copyright (c) 2014 by Vincent Fourmond
+  
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+  
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details (in the COPYING file).
+
+
+module CTioga2
+
+  # The class in charge of the interaction with Ruby code
+  class Ruby
+
+    # Module where all instance methods declared become immediately
+    # class methods.
+    class MetaModule < Module
+
+      include Math
+      
+      def method_added(meth)
+        module_function meth
+      end
+
+    end
+    
+    @module = MetaModule.new
+    
+    def self.run_code(str)
+      @module.send(:module_eval,str)
+    end
+
+    def self.run_file(file)
+      File.open(file) do |f|
+        run_code(f.read)
+      end
+    end
+    
+    def self.compute_formula(col, vals, mods = [])
+      return Dobjects::Dvector.compute_formula(col, vals, [@module] + mods)
+    end
+  end
+end
+

data/lib/ctioga2/utils.rb

@@ -141,6 +141,40 @@ module CTioga2
       return formula
     end
 
+
+    def self.suffix_numeric_sort(strings)
+      strings.sort do |a,b|
+        a =~ /.*?(\d+)$/
+        a_i = $1 ? $1.to_i : nil
+        b =~ /.*?(\d+)$/
+        b_i = $1 ? $1.to_i : nil
+        
+        if a_i && b_i
+          a_i <=> b_i
+        else
+          a <=> b
+        end
+      end
+    end
+
+
+    # Groups the given strings by prefixes
+
+    def self.group_by_prefix(strings, pref_re)
+      sets_by_prefix = {}
+      for s in strings
+        pref = s
+        if s =~ pref_re
+          pref = $1
+        end
+        sets_by_prefix[pref] ||= []
+        sets_by_prefix[pref] << s
+      end
+      return sets_by_prefix
+    end
+
+
+
     NaturalSubdivisions = [1.0, 2.0, 5.0, 10.0]
 
     # Returns the closest element of the correct power of ten of

data/lib/ctioga2/version.rb

@@ -2,7 +2,7 @@
 module CTioga2
 
   module Version
-GIT_VERSION = '0.9'
-GIT_DATE = 'Thu  6 Feb 22:05:21 CET 2014'
+GIT_VERSION = '0.10'
+GIT_DATE = 'Sun 16 Mar 18:22:35 CET 2014'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.9'
+  version: '0.10'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.17'
+        version: '1.18'
 description: ! 'ctioga2 is a command-driven plotting program that produces
 
   high quality PDF files. It can be used both from the command-line
@@ -89,12 +89,14 @@ files:
 - lib/ctioga2/graphics/elements/primitive.rb
 - lib/ctioga2/graphics/elements/element.rb
 - lib/ctioga2/graphics/elements/xyz-contour.rb
+- lib/ctioga2/graphics/elements/style-lists.rb
 - lib/ctioga2/graphics/elements/curve2d.rb
 - lib/ctioga2/graphics/elements/subplot.rb
 - lib/ctioga2/graphics/elements/containers.rb
 - lib/ctioga2/graphics/styles/arrows.rb
 - lib/ctioga2/graphics/styles/colormap.rb
 - lib/ctioga2/graphics/styles/box.rb
+- lib/ctioga2/graphics/styles/image.rb
 - lib/ctioga2/graphics/styles/carrays.rb
 - lib/ctioga2/graphics/styles/location.rb
 - lib/ctioga2/graphics/styles/contour.rb
@@ -106,6 +108,7 @@ files:
 - lib/ctioga2/graphics/styles/sheet.rb
 - lib/ctioga2/graphics/styles/axes.rb
 - lib/ctioga2/graphics/styles/base.rb
+- lib/ctioga2/graphics/styles/colorbrewer.rb
 - lib/ctioga2/graphics/styles/gradients.rb
 - lib/ctioga2/graphics/styles/ticks.rb
 - lib/ctioga2/graphics/styles/legend.rb
@@ -153,6 +156,7 @@ files:
 - lib/ctioga2/metabuilder/type.rb
 - lib/ctioga2/metabuilder/types.rb
 - lib/ctioga2/plotmaker.rb
+- lib/ctioga2/ruby.rb
 - COPYING
 - Changelog
 - setup.rb