ctioga2 0.9 → 0.10

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

@@ -49,17 +49,23 @@ module CTioga2
         # @todo These are currently not implemented.
         attr_accessor :below, :above
 
-        # Whether the map follows RGB (true) or HLS (false). On by
-        # default.
+        # Whether the map is interpolated in the RGB (true) or HLS
+        # (false) color space. On by default.
         #
         # It does not change anything with respect to how the colors
         # are interpreted: whatever happens, the values are RGB.
         attr_accessor :rgb
 
+        # Whether or not the map should be considered symmetric around
+        # a given value.
+        attr_accessor :symmetry_center
+
         def initialize(values = [], colors = [])
           @values = values.dup
           @colors = colors.dup
 
+          @symmetry_center = nil
+
           @rgb = true
         end
         
@@ -77,12 +83,33 @@ module CTioga2
         def self.from_text(str)
           str = str.dup
           hls = false
-          re = /natural:?/i     # Not too bad ?
+          re = /(natural|hls|wheel):?/i     # Not too bad ?
           if str =~ re
             str.sub!(re,'')
             hls = true
           end
 
+          sym = nil
+
+          re = /:(?:sym|around):(.*)$/i
+          if str =~ re
+            sym = $1.to_f
+            str.sub!(re,'')
+          end
+
+          # We first try to see if it could be a color set ?
+          colorsettype = Commands::CommandType.get_type('color-set')
+
+          begin 
+            set = colorsettype.string_to_type(str)
+            cm = ColorMap.new([nil] * set.size, set)
+            cm.rgb = ! hls
+            cm.symmetry_center = sym
+            return cm
+          rescue Exception => e
+            # This is not a color set
+          end
+
           l = str.split(/::/)
           
 
@@ -141,6 +168,7 @@ module CTioga2
           cm.above = above
           cm.below = below
           cm.rgb = ! hls
+          cm.symmetry_center = sym
           return cm
         end
 
@@ -241,6 +269,19 @@ module CTioga2
         def z_values(zmin, zmax)
           # Real Z values.
           z_values = @values.dup
+
+          # We tweak the zmin and zmax to be symmetric around the
+          # symmetry_center should that be needed.
+          if @symmetry_center
+            dmin = (zmin - @symmetry_center).abs
+            dmax = (zmax - @symmetry_center).abs
+            
+            dfin = [dmin, dmax].max
+            zmin = @symmetry_center - dfin
+            zmax = @symmetry_center + dfin
+            
+          end
+
           z_values[0] ||= zmin
           z_values[-1] ||= zmax
 
@@ -252,10 +293,9 @@ module CTioga2
             if z_values[i]
               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]
-                  z_values[j] = z_values[last_value] * frac + 
-                    z_values[i] * (1 - frac)
+                  frac = (j - last_value )/(i - last_value*1.0)
+                  z_values[j] = z_values[last_value] * (1 - frac) + 
+                    z_values[i] * frac
                 end
               end
               last_value = i

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

@@ -0,0 +1,83 @@
+# image.rb: style of images
+# 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).
+
+require 'ctioga2/utils'
+require 'ctioga2/log'
+
+# This module contains all the classes used by ctioga
+module CTioga2
+
+  module Graphics
+
+    # All the styles
+    module Styles
+
+      AspectRatioRE = {
+        /ignore/i => :ignore,
+        /expand/i => :expand,
+        /contract/i => :contract,
+      }
+      
+      AspectRatioType = 
+        CmdType.new('aspect-ratio', 
+                    {:type => :re_list,
+                      :list => AspectRatioRE}, <<EOD)
+How the {command: draw-image} command respects the original image
+aspect ratio:
+ * @ignore@ (the default) ignores the original aspect ratio
+ * @expand@ expand the original box to respect aspect ratio
+ * @contract@ contract the original box to respect aspect ratio
+EOD
+        
+
+
+      # This class represents the style for an image
+      class ImageStyle < BasicStyle
+        # The line style
+        typed_attribute :aspect_ratio, 'aspect-ratio'
+
+        # The line width
+        typed_attribute :transparency, 'float'
+
+        # Automatically rotate
+        typed_attribute :auto_rotate, 'boolean'
+
+        # Draws an image according to this
+        def draw_image(t, file, tl, br)
+          info = t.jpg_info(file)
+          if ! info
+            info = t.load_png(file)
+          end
+
+          r = Types::Rect.new(tl, br)
+          ul, ll, lr = r.make_corners(t, (@auto_rotate == nil ? true : @auto_rotate), @aspect_ratio || :ignore,
+                                      info['width']*1.0/info['height'])
+
+          dict = info.dup
+          dict.merge!('ul' => ul,
+                      'll' => ll,
+                      'lr' => lr,)
+          
+          # @todo provide a way to reuse images ?
+          t.context do
+            if @transparency
+              t.fill_opacity = 1 - @transparency
+            end
+            t.show_image(dict)
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -79,6 +79,11 @@ module CTioga2
         # Mode for auto-adjust
         attr_accessor :text_auto_adjust
 
+        # If not nil, then the boundaries are computed from the real
+        # dimensions of the plot frame, using the given number as a
+        # conversion factor from the output dimensions.
+        attr_accessor :frame_real_size
+
 
         @@current_index = 0
 
@@ -108,7 +113,6 @@ module CTioga2
             StyleSheet.style_for(TextLabel, 'title',
                                  nil, 
                                  Types::PlotLocation.new(:top))
-
           @plot_margin = nil
 
           @transforms = CoordinateTransforms.new
@@ -307,7 +311,7 @@ module CTioga2
               exts << @title.label_extension(t, 'title', @title.loc) * 
                 (@text_scale || 1)
             end
-            Types::Dimension.new(:dy, exts.max)
+            Types::Dimension.new(:dy, exts.max || 0)
           end
 
           box = Types::MarginsBox.new(*margins)
@@ -319,6 +323,15 @@ module CTioga2
           return box
         end
 
+        # Clear all axes
+        def clear_axes()
+          [:left, :right, :top, :bottom].each do |loc|
+            style = get_axis_style(loc)
+            style.decoration = Tioga::FigureConstants::AXIS_HIDDEN
+            style.axis_label.text = false
+          end
+        end
+
         # Computes the margins based on the text information.
         #
         # This is very different from the one above, since this one
@@ -433,11 +446,7 @@ EOH
       ClearAxesCommand = 
           Cmd.new("clear-axes",nil,"--clear-axes"
                   ) do |plotmaker, opts|
-        [:left, :right, :top, :bottom].each do |loc|
-          style = AxisStyle.current_axis_style(plotmaker, loc)
-          style.decoration = Tioga::FigureConstants::AXIS_HIDDEN
-          style.axis_label.text = false
-        end
+        PlotStyle.current_plot_style(plotmaker).clear_axes
       end
       ClearAxesCommand.
         describe("Clear all axes",
@@ -445,6 +454,33 @@ EOH
 Removes all the axes and their associated labels
 EOH
 
+      DrawingFrameCommand = 
+        Cmd.new("drawing-frame",nil,"--drawing-frame", [],
+                { 'units' => CmdArg.new('text') 
+                }) do |plotmaker, opts|
+        style = PlotStyle.current_plot_style(plotmaker)
+        style.clear_axes
+        style.padding = nil
+        u = opts['units'] || 'cm'
+        if u =~ /([\d.]+)?\s*(cm|in|bp|pt|mm)/
+          nb = $1 ? $1.to_f : 1.0
+          un = $2
+          style.frame_real_size = 10 * nb * 
+            Types::Dimension::DimensionConversion.fetch(un)
+        else
+          raise 'Invalid unit'
+        end
+      end
+      DrawingFrameCommand.
+        describe("Setup a drawing frame",
+                 <<"EOH", AxisGroup)
+Setup a drawing frame, ie a frame in which the top-left point is at
+0,0, with X and Y values positive over the whole frame, and counted in
+centimeters (or with the unit given using the @/units@ option, ie
+@/units=mm@ expressed in millimeters or @/units=12pt@ expressed in
+multiple of 12 TeX points).
+EOH
+
       
       TicksCommand = 
           Cmd.new("ticks",nil,"--ticks", 

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

@@ -1,5 +1,5 @@
-# carrays.rb: 'circular arrays'
-# copyright (c) 2009 by Vincent Fourmond
+# sets.rb: sets
+# copyright (c) 2009, 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
@@ -14,6 +14,8 @@
 require 'ctioga2/utils'
 require 'ctioga2/log'
 
+require 'ctioga2/graphics/styles/colorbrewer'
+
 # This module contains all the classes used by ctioga
 module CTioga2
 
@@ -39,16 +41,56 @@ module CTioga2
           [LightPlum, PaleGreen, Gold, RedBrown, SkyBlue ],
           "gnuplot" => 
           [Red, [0,1.0,0], Blue, Magenta, Cyan, Yellow, Black, Coral, Gray],
-
         }
+        
+        begin
+          t = Tioga::FigureMaker.new
+          lst = []
+          10.times do |i|
+            lst << t.hls_to_rgb([36*i, 0.5, 1.0])
+          end
+          ColorSets['wheel10'] = lst
+
+          lst = []
+          20.times do |i|
+            lst << t.hls_to_rgb([18*i, 0.5, 1.0])
+          end
+          ColorSets['wheel20'] = lst
+
+          colortype = Commands::CommandType.get_type('color')
+          for k,v in ColorBrewerSets
+            for n, a in v
+              if n > 4
+                ColorSets["cb-#{k.downcase}-#{n}"] = a.map do |c|
+                  colortype.string_to_type(c)
+                end
+              end
+            end
+          end
+          
+        end
 
         MarkerSets = { 
           "default" => 
-          [Bullet, TriangleUp, Square, Plus, Times],
+          [Bullet, TriangleUp, Square, Plus, Times, Diamond, TriangleDown],
           "open" => 
-          [BulletOpen, TriangleUpOpen, SquareOpen, PlusOpen, TimesOpen],
+          [BulletOpen, TriangleUpOpen, SquareOpen, PlusOpen, TimesOpen, 
+           DiamondOpen, TriangleDownOpen],
         }
 
+        for k, b in { 
+            'number1' => 171, 
+            'number2' => 181, 
+            'number3' => 191, 
+            'number4' => 201
+          }
+          lst = []
+          1.upto(10) do |i|
+            lst << [14, b + i]
+          end
+          MarkerSets[k] = lst
+        end
+
         LineWidthSets = {
           'default' => [1.0]
         }

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

@@ -152,6 +152,15 @@ module CTioga2
         def self.current_sheet()
           return @sheet
         end
+
+
+        # Updates the style sheet concerning the _what_ of class _cls_
+        # with the given values
+        def self.update_style(cls, what, values)
+          StyleSheet.current_sheet.own_styles[cls] ||= {}
+          StyleSheet.current_sheet.own_styles[cls][what] ||= {}
+          StyleSheet.current_sheet.own_styles[cls][what].merge!(values)
+        end
         
       end
 
@@ -183,6 +192,7 @@ EOD
                ['marker', MarkerStringStyle, 'marker'],
                ['box', BoxStyle, 'boxes'],
                ['arrow', ArrowStyle, 'arrows'],
+               ['image', ImageStyle, 'image'],
                ['line', StrokeStyle, 'lines']
               ]
 
@@ -200,9 +210,7 @@ EOD
                   ], 
                   cls.options_hash
                   ) do |plotmaker, what, opts|
-          StyleSheet.current_sheet.own_styles[cls] ||= {}
-          StyleSheet.current_sheet.own_styles[cls][what] ||= {}
-          StyleSheet.current_sheet.own_styles[cls][what].merge!(opts)
+          StyleSheet.update_style(cls, what, opts)
         end
         StyleSheetCommands[name].
           describe("Sets the default style for the given #{desc}.", 
@@ -340,7 +348,14 @@ Axis styles have lots of parameters:
  * @background-lines-@ parameters define the style of background lines, 
    as in {command: define-line-style}
 EOD
+
+
+      # Here, a few defaults styles
       
+      StyleSheet.update_style(TextLabel, 'title', {
+                                'text_width' => 
+                                Types::Dimension.new(:frame, 1.0, :x)
+                              })
     end
   end
 end

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

@@ -44,15 +44,23 @@ module CTioga2
         # The vertical alignment 
         typed_attribute :alignment, 'alignment'
 
+        alias_for :valign, :alignment
+
         # The horizontal alignment
         typed_attribute :justification, 'justification'
 
+        alias_for :halign, :justification
+
         # A text width
-        typed_attribute :text_width, "text"
+        typed_attribute :text_width, "dimension-or-no"
+
+        # A text alignment within the box, only useful if text_width
+        # is specified.
+        typed_attribute :text_align, 'text-align'
 
         # Draw the _text_ at the given location with the given style.
-        # If _y_ is _nil_, then _x_or_loc_ is taken to be a location
-        # (see FigureMaker#show_text).
+        # If _y_ is _nil_, or [:pos, _value_] then _x_or_loc_ is taken
+        # to be a location (see FigureMaker#show_text).
         def draw_text(t, text, x_or_loc, y = nil, measure = nil)
           t.context do
             dict = prepare_show_text_dict(t, text, x_or_loc, y, measure)
@@ -88,18 +96,24 @@ module CTioga2
           return dict
         end
 
+        def vertical?(loc)
+          if loc
+            return Types::PlotLocation.new(loc).vertical?
+          else
+            ang = angle || 0
+            return Math.sin(ang*3.14/180)**2 > 0.5
+          end
+        end
+
         protected
         
         # Prepares the dictionnary for use with show_text
         def prepare_show_text_dict(t, text, x_or_loc, y = nil, measure = nil)
           dict = self.hash_for_tioga(t)
-          if @text_width
-            text = "\\parbox{#{@text_width}}{#{text}}"
-          end
 
-          dict['text'] = text
+          loc = nil
 
-          if y
+          if y && (! y.is_a?(Array))
             dict['at'] = [x_or_loc, y]
           else
             # Perform automatic conversion on the location
@@ -107,13 +121,40 @@ module CTioga2
             when Symbol, Types::PlotLocation
               ## @todo It won't be easy to implement shifts for this,
               ## though it may be useful eventually.
+              loc = x_or_loc
               x_or_loc = Types::PlotLocation.new(x_or_loc).tioga_location
             end
             dict['loc'] = x_or_loc
+            if y
+              dict['position'] = y[1]
+            end
           end
           if measure
             dict['measure'] = measure
           end
+
+          if @text_width
+            dir = (vertical?(loc) ? :y : :x)
+            dim = @text_width.to_bp(t, dir)
+            dim /= t.default_text_scale
+
+            aln = @text_align || @justification || Tioga::FigureConstants::CENTERED
+            cmd = 
+              case aln
+              when Tioga::FigureConstants::CENTERED
+                '\centering{}'
+              when Tioga::FigureConstants::LEFT_JUSTIFIED
+                '\raggedright{}'
+              when Tioga::FigureConstants::RIGHT_JUSTIFIED
+                '\raggedleft{}'
+              else
+                ''
+              end
+            text = "\\parbox{#{dim}bp}{#{cmd}#{text}}"
+          end
+
+          dict['text'] = text
+
           return dict
         end
       end