ctioga2 0.8 → 0.9

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

@@ -54,9 +54,12 @@ module CTioga2
 
           @subframe = nil       # Automatic by default.
 
+          @prev_subframe = nil
+
           @style = style || Styles::PlotStyle.new
 
           @user_boundaries = {}
+
         end
 
         # Returns the boundaries that apply for the given _curve_ --
@@ -87,7 +90,16 @@ module CTioga2
         end
 
         def actual_subframe(t)
-          return @subframe || @style.estimate_margins(t)
+          if @subframe
+            return @subframe
+          else
+            if @prev_subframe
+              @style.compute_margins(t, @prev_subframe)
+            else
+              @prev_subframe = @style.estimate_margins(t)
+              return @prev_subframe
+            end
+          end
         end
 
         # In general, subplot's boundaries do not count for the parent

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

@@ -81,6 +81,7 @@ module CTioga2
         # * a transform is set
         # * ticks are set
 
+        @@text_size_index = 0
 
         # Creates a new AxisStyle object at the given location with
         # the given style.
@@ -94,6 +95,9 @@ module CTioga2
           @log = false
           @ticks_side = {}
           @ticks = AxisTicks.new
+
+          @index = @@text_size_index
+          @@text_size_index += 1
         end
 
         # Draws the axis within the current plot. Boundaries are the
@@ -105,7 +109,9 @@ module CTioga2
         #   where it should be...
         # * non-linear axes (or linear, for that matter, but with
         #   a transformation)
-        def draw_axis(t)
+        #
+        # _watcher_ is a TextSizeWatcher object.
+        def draw_axis(t, watcher = nil)
           spec = get_axis_specification(t)
 
           info = t.axis_information(spec)
@@ -129,7 +135,11 @@ minor_tick_length minor_tick_width)
           t.show_axis(spec)
           @axis_label.loc = @location
           default = vertical? ? 'ylabel' : 'xlabel'
-          @axis_label.draw(t, default)
+          nm = "axis-label#{@index}"
+          @axis_label.draw(t, default, nm)
+          if watcher
+            watcher.watch(nm)
+          end
         end
 
         # Sets the current boundaries of the _t_ object to the _range_

data/lib/ctioga2/graphics/styles/map-axes.rb

@@ -67,7 +67,7 @@ module CTioga2
 
         end
 
-        def draw_axis(t)
+        def draw_axis(t, watcher = nil)
           # Not beautiful at all
           size = Types::Dimension.new(:dy, extension(t), 
                                       @location.orientation)

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

@@ -76,6 +76,12 @@ module CTioga2
         # mode. A Dimension.
         attr_accessor :padding
 
+        # Mode for auto-adjust
+        attr_accessor :text_auto_adjust
+
+
+        @@current_index = 0
+
         def initialize
           # Default style for the plots.
           @axes = {}
@@ -110,8 +116,20 @@ module CTioga2
           @background = 
             StyleSheet.style_for(BackgroundStyle, 'background')
 
-          # A padding of 4bp ? Why ?? Why not ?
-          @padding = Types::Dimension.new(:bp, 4)
+          # A padding of 6bp ? Why ?? Why not ?
+          @padding = Types::Dimension.new(:bp, 6)
+
+
+          
+          @text_size_index = @@current_index
+          @@current_index += 1
+
+          # Automatic adjustment of text sizes...
+          @text_sizes = TextSizeWatcher.new
+          @text_sizes.watch("title-#{@text_size_index}")
+
+          @text_auto_adjust = :both
+
         end
 
         # Apply (destructively) the current transformations to the
@@ -120,7 +138,6 @@ module CTioga2
           @transforms.transform_2d!(dataset)
         end
 
-
         # Whether to use log scale for the given axis.
         #
         # Now the question is: how should that affect user-defined
@@ -235,7 +252,7 @@ module CTioga2
             t.context do
               begin
                 axis.set_bounds_for_axis(t, bounds[which])
-                axis.draw_axis(t)
+                axis.draw_axis(t, @text_sizes)
               rescue Exception => e
                 error { "Impossible to draw axis #{which}: #{e.message}" }
                 debug { "Full message: #{e.inspect}\n#{e.backtrace.join("\n")}" }
@@ -243,7 +260,7 @@ module CTioga2
             end
           end
           # We draw the title last
-          title.draw(t, 'title')
+          title.draw(t, 'title', "title-#{@text_size_index}")
         end
 
         # Draws all axes background lines for the plot.
@@ -302,6 +319,31 @@ module CTioga2
           return box
         end
 
+        # Computes the margins based on the text information.
+        #
+        # This is very different from the one above, since this one
+        # relies on measured texts to get it right !
+        def compute_margins(t, prev_margins)
+          margins = estimate_margins(t)
+          if @text_auto_adjust == :old
+            return margins
+          else
+            pad = if @padding
+                    @padding.to_bp(t)
+                  else
+                    4
+                  end
+            nm =  @text_sizes.update_margins(t, prev_margins, pad)
+
+            # We include the old margins, unless we have the :measure
+            # text adjust mode
+            if @text_auto_adjust != :measure
+              nm.expand_to!(t, margins)
+            end
+            return nm
+          end
+        end
+
         protected
 
         # Takes a string and returns a Symbol suitable for use with
@@ -394,7 +436,7 @@ EOH
         [:left, :right, :top, :bottom].each do |loc|
           style = AxisStyle.current_axis_style(plotmaker, loc)
           style.decoration = Tioga::FigureConstants::AXIS_HIDDEN
-          style.axis_label.text = ""
+          style.axis_label.text = false
         end
       end
       ClearAxesCommand.

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

@@ -1,5 +1,5 @@
 # texts.rb: style for textual objects
-# copyright (c) 2009 by Vincent Fourmond
+# copyright (c) 2009, 2010, 2012, 2013, 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
@@ -47,6 +47,9 @@ module CTioga2
         # The horizontal alignment
         typed_attribute :justification, 'justification'
 
+        # A text width
+        typed_attribute :text_width, "text"
+
         # 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).
@@ -81,6 +84,7 @@ module CTioga2
             dim = dict['scale']
             dict['scale'] = dim.to_dy(t)
           end
+          dict.delete('text_width')
           return dict
         end
 
@@ -89,6 +93,10 @@ module CTioga2
         # 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
 
           if y

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

@@ -48,8 +48,22 @@ module CTioga2
         # @todo make it possible to provide a function to generate that ?
         typed_attribute :major, 'float-list'
 
+        # Separation between major ticks. Overriden by the major list
+        typed_attribute :major_delta, "float"
+
+        # Approximate number of major ticks
+        typed_attribute :major_number, "integer"
+
         # The list of the position of minor ticks
         typed_attribute :minor, 'float-list'
+
+        # Separation between minor ticks
+        typed_attribute :minor_delta, "float"
+
+        # Number of minor ticks between major ticks
+        typed_attribute :minor_number, "integer"
+
+
         
         # The list of labels
         typed_attribute :labels, 'text-list'
@@ -71,15 +85,35 @@ module CTioga2
           end
           fmt = @format
 
+          # beginning or end of the axis. Not specifically x
+          xl, xr = * (if info['vertical']
+                        [info['y0'], info['y1']]
+                      else
+                        [info['x0'], info['x1']]
+                      end)
+
+          if xl > xr
+            xl, xr = xr, xl
+          end
+
           if @major
             ret['minor_ticks'] = Dobjects::Dvector.new
             ret['major_ticks'] = Dobjects::Dvector.new(@major)
 
             fmt ||= "$%g$"
+          elsif @major_delta || @major_number
+            delta = @major_delta || Utils::closest_subdivision(( (xr - xl)/@major_number))
+            ret['major_ticks'] = Utils::integer_subdivisions(xl, xr, 
+                                                             delta)
+            fmt ||= "$%g$"
           end
 
           if @minor
             ret['minor_ticks'] = Dobjects::Dvector.new(@minor)
+          elsif @minor_delta || delta
+            dt = @minor_delta || delta/((@minor_number || 3)+1)
+            ret['minor_ticks'] = Utils::integer_subdivisions(xl, xr, 
+                                                             dt)
           end
 
           fmt_last = @format_last || fmt

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

@@ -57,6 +57,41 @@ When the {command: frame-margins} is set to automatic, ctioga2 leaves
 that much space around the plot on the sides where there are no labels.
 EOH
 
+    
+    TARE = {
+      /^\s*old/i => :old,
+      /^\s*both/i => :both,
+      /^\s*measure/i => :measure,
+    }
+
+    TEType = 
+      CmdType.new('text-adjust-mode', 
+                  {:type => :re_list,
+                    :list => TARE}, <<EOD)
+Mode for text size adjustment
+ * @old@ for the old style heuristics
+ * @both@ for both the old style heuristics and the measures, taking
+   whichever of those is the biggest
+ * @measure@ for only measured text size (but watch out for axis ticks !)
+EOD
+
+
+    TAACommand = 
+      Cmd.new("text-adjust-mode",nil,"--text-adjust-mode", 
+              [
+               CmdArg.new('text-adjust-mode'),
+              ]) do |plotmaker, tf|
+      
+      Styles::PlotStyle.current_plot_style(plotmaker).text_auto_adjust = tf
+    end
+
+    TAACommand.describe('Enables or disables the automatic detection of text size',
+                            <<EOH, SubplotsGroup)
+When this is on (the default), @ctioga2@ tries to be smart about the
+size of the text bits around the plot. However, this can be bothersome
+at times, so you can disable that with this command.
+EOH
+
 
     InsetCommand =         
       Cmd.new("inset",nil,"--inset", 

data/lib/ctioga2/graphics/types.rb

@@ -176,7 +176,27 @@ EOD
     AlignedPointType = 
       CmdType.new('aligned-point', {:type => :aligned_point, 
                     :default => :frame}, <<EOD)
-A point together with alignment specifications.
+A point together with alignment specifications, used to place some 
+elements such as legends for instance, that require alignment information. 
+
+The first two letters represent the alignment:
+
+ * @t@ for top
+ * @b@ for bottom
+ * @c@ for center
+ * @l@ for left and
+ * @r@ for right
+
+These letters can optionally be followed by the exact location of the
+point in frame coordinates. If not provided, a reasonable default
+value is chosen.
+
+Examples:
+
+ * @tl@ is a point at the top left of the frame aligned to the top
+   and left;
+ * @cl:0.1,0.6@ is vertically centered and aligned to the left, and
+   positioned 10% from the left and 60% from the bottom.
 EOD
 
     FrameMarginsType = 
@@ -250,10 +270,16 @@ EOD
 
     BoxType = 
       CmdType.new('box', :box, <<EOD)
-The specification for a box, such as an inset. Specifications vary for
-now... 
+The specification for a box, such as an inset. It can be a grid
+specification, such as @grid:0,1@. For this to work, a grid must have
+been setup beforehand using {command: setup-grid}.
+
+It can also be an {type: aligned-point} together with a width and
+optionally a height in frame coordinates, such as:
 
-@todo to be written later on.
+ * @cc:0.3@: a box in the center of size 30% width and 30% height;
+ * @bl:0.1,0.2:0.7,0.2@ a box starting from the point at 10% from the left
+   and 20% from the bottom, with a width of 70% and a height of 20%.
 EOD
 
     # Coordinate transformations

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

@@ -91,6 +91,19 @@ module CTioga2
           return [@left, @right, @top, @bottom]
         end
 
+        # Augments the margins so that they also encompass those given
+        # in other. Based on the current interpretation of the
+        # measures as bp.
+        def expand_to!(t, other)
+          for w in %w(left right top bottom)
+            mine = self.send(w)
+            theirs = other.send(w)
+            if mine.to_bp(t) < theirs.to_bp(t)
+              self.send("#{w}=", theirs)
+            end
+          end
+        end
+
       end
 
       # A box defined by an AlignedPoint and two dimensions

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

@@ -81,6 +81,13 @@ module CTioga2
           return fig/t.default_text_height_dy
         end
 
+        # Converts the dimension into big points
+        def to_bp(t, orientation = nil)
+          orientation ||= @orientation
+          return t.send("convert_figure_to_output_d#{orientation}", 
+                        to_figure(t, orientation)) / 10.0
+        end
+
         # Converts the Dimension to the *frame* coordinates of the
         # *current* frame in _t_.
         def to_frame(t, orientation = nil)

data/lib/ctioga2/plotmaker.rb

@@ -752,6 +752,7 @@ EOH
               {
                 'oversampling' => CmdArg.new('float'),
                 'scale' => CmdArg.new('float'),
+                'pdftoppm' => CmdArg.new('boolean'),
               }) do |plotmaker,res, opts|
       if res =~ /^\s*(\d+)\s*x\s*(\d+)\s*$/
         size = [$1.to_i, $2.to_i]
@@ -761,6 +762,7 @@ EOH
         end
         scale = opts['scale'] || 1
         plotmaker.postprocess.png_scale = scale
+        plotmaker.postprocess.png_pdftoppm = opts['pdftoppm']
         page_size = size.map { |n| (n/(1.0 *scale)).to_s + "bp" }.join('x')
         plotmaker.root_object.set_page_size(page_size)
       else

data/lib/ctioga2/postprocess.rb

@@ -43,6 +43,13 @@ module CTioga2
     # Are we converting to EPS using pdftops ? 
     attr_accessor :eps
 
+
+    # @todo Maybe all the PNG stuff should be it is own class ?
+
+    # If on, we use pdftoppm rather than imagemagick (gs, used by
+    # pdftoppm is much slower than pdftoppm)
+    attr_accessor :png_pdftoppm
+
     # PNG resolution
     attr_accessor :png_res
 
@@ -62,6 +69,7 @@ module CTioga2
       @png_res = nil 
       @png_oversampling = 2
       @png_scale = 1
+      @png_pdftoppm = false
 
       @processed_files = []
     end
@@ -114,9 +122,14 @@ module CTioga2
 
       # Converts to PNG if applicable
       if @png_res
-        target = file.sub(/(\.pdf)?$/,'.png')
+        tbase = file.sub(/(\.pdf)?$/,'')
         info { "Converting #{file} to PNG" }
-        spawn "convert -density #{(@png_oversampling * @png_scale * 72).to_i} #{file} -resize #{@png_res.join('x')} #{target}"
+        
+        if @png_pdftoppm
+          spawn "pdftoppm -singlefile -png -r #{(@png_scale * 72).to_i} #{file} #{tbase}"
+        else
+          spawn "convert -density #{(@png_oversampling * @png_scale * 72).to_i} #{file} -resize #{@png_res.join('x')} #{tbase}.png"
+        end
       end
 
       # View produced PDF or PNG files...