ctioga2 0.5 → 0.6

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

@@ -19,7 +19,7 @@ require 'ctioga2/graphics/coordinates'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 432 $', '$Date: 2013-08-23 19:06:36 +0200 (Fri, 23 Aug 2013) $')
+  Version::register_svn_info('$Revision: 488 $', '$Date: 2013-09-03 00:31:36 +0200 (Tue, 03 Sep 2013) $')
 
   module Graphics
 
@@ -368,7 +368,62 @@ EOH
                  <<"EOH", AxisGroup)
 This command can be used to set various aspects of the style of the 
 given axis, through its various options, which are documented in more details 
-in the {command: define-axis-style} command.
+in the {command: define-axis-style} command -- excepted for the @ticks@ bit
+which are documented in the {command: ticks} command.
+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 = ""
+        end
+      end
+      ClearAxesCommand.
+        describe("Clear all axes",
+                 <<"EOH", AxisGroup)
+Removes all the axes and their associated labels
+EOH
+
+      
+      TicksCommand = 
+          Cmd.new("ticks",nil,"--ticks", 
+                  [
+                   CmdArg.new('axis'),
+                  ], Styles::AxisTicks.options_hash) do |plotmaker, which, opts|
+        style = AxisStyle.current_axis_style(plotmaker, which)
+        style.ticks.set_from_hash(opts)
+      end
+      TicksCommand.
+        describe("Sets the ticks of the given axis", 
+                 <<"EOH", AxisGroup)
+
+This command can be used to control the location of major and minor
+ticks and the text of their labels for the given axis. Options
+available:
+
+ * @format@ the format of the tick labels, using a @sprintf@-like
+   syntax (see below)
+ * @format-last@ the format of the last of the tick labels (useful to
+   include an overall "power-of-ten" factor
+ * @major@ a space or comma-separated list of the positions of the
+   major (labeled) ticks
+ * @minor@ same for the minor ticks
+ * @label@ a comma-separated list of the tick labels (must be the same
+   number of elements as that of the @major@ list). If you must
+   include a comma inside, then use @||@ as a separator.
+
+Format is a normal @sprintf@ format, with the following additional
+special codes:
+
+ * @%p@ the "common power of 10": if you divide the tick values by 10
+   to the power @%p@, the smallest absolute value will be between 1
+   and 10 (excluding 0 of course)
+ * @%b...@ is the tick value divided by this common power of 10. You
+   *must* follow this spec by a usual @sprintf@ format: @%b.3g@ would
+   get you a number with 3 significant digits
 EOH
 
       BackgroundLinesCommand = 

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 161 $', '$Date: 2010-08-03 12:07:49 +0200 (Tue, 03 Aug 2010) $')
+  Version::register_svn_info('$Revision: 467 $', '$Date: 2013-08-31 14:10:52 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -39,6 +39,8 @@ module CTioga2
           [DarkMagenta, DarkGreen, OrangeRed, DarkRed, DarkBlue ],
           "gradient2" => 
           [LightPlum, PaleGreen, Gold, RedBrown, SkyBlue ],
+          "gnuplot" => 
+          [Red, [0,1.0,0], Blue, Magenta, Cyan, Yellow, Black, Coral, Gray],
 
         }
 

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
+  Version::register_svn_info('$Revision: 478 $', '$Date: 2013-09-01 11:24:02 +0200 (Sun, 01 Sep 2013) $')
 
   module Graphics
 
@@ -259,11 +259,14 @@ module CTioga2
           return (@vertical_scale || 1.0) * (@scale || 1.0)
         end
       end
-      
+
+
       # A LaTeX font. It should be applied to text using the function
       # #fontify.
       #
       # \todo add real font attributes (family, and so on...)
+      #
+      # @todo Deprecate in favor of the latter class
       class LaTeXFont
         # The font command (bf, sf...). Naive but effective !
         attr_accessor :font_command
@@ -289,6 +292,45 @@ module CTioga2
         end
         
       end
+
+      # Full font information
+      #
+      # @todo There is a whole bunch of work to be done on the Tioga
+      # side to make sure that things work.
+      class FullLatexFont < BasicStyle
+        
+        # The size of the text
+        typed_attribute :size, 'float'
+
+        # I remove those since they don't work for the time being
+
+        # # Font family
+        # typed_attribute :family, 'text'
+
+        # # Font series
+        # typed_attribute :series, 'text'
+
+        # # Font shape
+        # typed_attribute :shape, 'text'
+        
+
+        # Set global font information based on this style
+        #
+        # This only works from within a figure !
+        def set_global_font(t)
+          # for a in %w(family series shape)
+          #   v = self.send(a)
+          #   t.send("tex_font#{a}=", v) if v
+          # end
+
+
+          if @size
+            fact = @size/t.default_font_size
+            t.rescale_text(fact)
+          end
+        end
+
+      end
       
 
     end

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

@@ -0,0 +1,109 @@
+# ticks.rb: all aspects of axis ticks
+# copyright (c) 2013 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'
+
+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
+
+      
+      # This class describes where to place ticks on the target axis
+      # and how to label them.
+      class AxisTicks < BasicStyle
+
+        include Log
+
+        # The format of the tick labels.
+        #
+        # It is either a standard sprintf format or composed of one or
+        # more of the following:
+        # 
+        # * %b followed by any usual format specifier: the tick value
+        #   divided by the common power of 10
+        # * %p the power of 10
+        typed_attribute :format, "text"
+
+        # The format of the last of the tick labels
+        typed_attribute :format_last, "text"
+
+        # The list of the position of major ticks
+        #
+        # @todo make it possible to provide a function to generate that ?
+        typed_attribute :major, 'float-list'
+
+        # The list of the position of minor ticks
+        typed_attribute :minor, 'float-list'
+        
+        # The list of labels
+        typed_attribute :labels, 'text-list'
+
+        def self.tweak_format_string(str)
+          return str.gsub("%b", "%2$").gsub("%p", "%3$d")
+        end
+
+        # Returns the specifications that should be added to the
+        # information
+        def ticks_specs(t, info, transform)
+          ret = {}
+          for k in %w{major_ticks minor_ticks labels}
+            ret[k] = info[k]
+          end
+          if info['major']
+            ret['minor_ticks'] = info['minor']
+            ret['major_ticks'] = info['major']
+          end
+          fmt = @format
+
+          if @major
+            ret['minor_ticks'] = Dobjects::Dvector.new
+            ret['major_ticks'] = Dobjects::Dvector.new(@major)
+
+            fmt ||= "$%g$"
+          end
+
+          if @minor
+            ret['minor_ticks'] = Dobjects::Dvector.new(@minor)
+          end
+
+          fmt_last = @format_last || fmt
+
+          if @labels
+            ret['labels'] = @labels
+          elsif fmt
+            ret['labels'] = []
+            fmt = AxisTicks.tweak_format_string(fmt)
+            fmt_last = AxisTicks.tweak_format_string(fmt_last)
+            i = ret['major_ticks'].size
+            common = Utils::common_pow10(ret['major_ticks'])
+            fact = 10**(-common)
+            for v in ret['major_ticks']
+              i -= 1
+              ret['labels'] << (i > 0 ? fmt : fmt_last) % [v, v*fact, common]
+            end
+          end
+          return ret
+        end
+      end
+
+    end
+  end
+end

data/lib/ctioga2/graphics/types.rb

@@ -17,6 +17,7 @@ require 'ctioga2/graphics/types/boundaries'
 require 'ctioga2/graphics/types/boxes'
 require 'ctioga2/graphics/types/bijection'
 require 'ctioga2/graphics/types/location'
+require 'ctioga2/graphics/types/fill'
 
 
 require 'ctioga2/graphics/types/grid'
@@ -25,7 +26,7 @@ require 'ctioga2/graphics/types/grid'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 376 $', '$Date: 2013-01-23 22:52:47 +0100 (Wed, 23 Jan 2013) $')
+  Version::register_svn_info('$Revision: 466 $', '$Date: 2013-08-31 13:10:38 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -65,22 +66,6 @@ EOD
 A {type: color}, or false to say that nothing should be drawn.
 EOD
 
-    CurveFillUntilType = CmdType.new('fill-until', {
-                                       :type => :float,
-                                       :shortcuts => {
-                                         /x?axis/i => 0.0,
-                                         /b(?:ot(?:tom)?)?/i => :bottom,
-                                         /t(?:op)?/i => :top,
-                                         /no(?:ne)?/i => false
-                                       }
-                                     }, <<EOD)
-The Y values until which a filled curve will be filled. Generally a number, 
-but it can also be:
- * @axis@ (or @xaxis@), which means 0
- * @bottom@, to fill until the bottom of the graph
- * @top@, to fill until the top 
- * @none@, meaning no fill
-EOD
 
     RegionSideType = 
       CmdType.new('region-side', {

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
+  Version::register_svn_info('$Revision: 469 $', '$Date: 2013-08-31 14:10:56 +0200 (Sat, 31 Aug 2013) $')
 
   module Graphics
 
@@ -133,7 +133,7 @@ module CTioga2
         def self.from_text(text, orientation, default = :figure)
           # Absolute or :dy dimension
           if text =~ DimensionRegexp
-            value = Float($1)
+            value = Utils::txt_to_float($1)
             unit = $2
             if ! unit
               unit = default

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

@@ -0,0 +1,126 @@
+# fill.rb: fill-related types
+# copyright (c) 2013 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'
+
+module CTioga2
+
+  Version::register_svn_info('$Revision$', '$Date$')
+
+  module Graphics
+
+    module Types
+
+      # This class provides a way to close a path in order to fill a
+      # curve.
+      class FillUntil 
+
+        # The type of closing: :top, :bottom, :left, :right, :x, :y,
+        # :close, :xy or :none
+        attr_accessor :type
+        
+        # An accessory value (when necessary)
+        attr_accessor :value
+
+        # Builds from text
+        def self.from_text(str)
+          ret = FillUntil.new
+          case str
+          when /^\s*(left|right|top|bottom)\s*$/
+            ret.type = $1.downcase.to_sym
+          when /^\s*axis|xaxis\s*$/
+            ret.type = :y
+            ret.value = 0
+          when /^\s*yaxis\s*$/
+            ret.type = :x
+            ret.value = 0
+          when /^\s*(x|y)\s*[:=]\s*(.*)$/
+            ret.type = $1.downcase.to_sym
+            ret.value = $2.to_f
+          when /^\s*close\s*$/
+            ret.type = :close
+          when /^\s*xy\s*[:=]\s*(.*)$/
+            ret.type = :xy
+            ret.value = Point.from_text($1)
+          else
+            ret.type = :y
+            ret.value = str.to_f
+          end
+
+          return ret
+        end
+
+        # If there is actually a closing
+        def fill?
+          return @type != :none
+        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
+          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
+            t.append_point_to_path(target, last[1])
+            t.append_point_to_path(target, first[1])
+          when :y
+            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))
+          when :close
+          else
+            raise "Should not be here"
+          end
+          t.close_path
+        end
+
+      end
+
+      # Something meant to be fed to PlotStyle#get_axis_style
+      FillType = 
+        CmdType.new('fill-until', { :type => :function_based,
+                      :class => Graphics::Types::FillUntil
+                                 }, <<EOD)
+How to close the path of a curve to fill it. Can be:
+ * @bottom@, @top@, @left@, @right@ to fill until the named side of the
+   plot
+ * @axis@ or @xaxis@ to fill until the X axis (ie y = 0)
+ * @yaxis@ to fill until the Y axis (ie x = 0)
+ * @x:value@ or @x=value@ to fill until the given X value
+ * @y:value@ or @y=value@ to fill until the given Y value
+ * @close@ for just closing the path (doesn't look good in general)
+ * @none@ for no fill
+EOD
+
+
+      
+    end
+  end
+end
+