ctioga2 0.4 → 0.5

data/lib/ctioga2/graphics/legends/items.rb

@@ -18,7 +18,7 @@ require 'ctioga2/graphics/styles'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 345 $', '$Date: 2012-12-24 10:43:37 +0100 (Mon, 24 Dec 2012) $')
+  Version::register_svn_info('$Revision: 386 $', '$Date: 2013-03-11 22:57:16 +0100 (Mon, 11 Mar 2013) $')
 
   module Graphics
 
@@ -64,8 +64,31 @@ module CTioga2
 
         # Returns the _y_ value for the baseline of the text in terms
         # of figure coordinates.
+        #
+        # This is plain wrong, I think...
         def get_baseline_y(t, legend_style, y)
-          return y - Types::Dimension.new(:dy,1.0,:y).to_figure(t) 
+          w , h = size(t, legend_style)
+          return y - h          # This is wrong, but not as bad ;-)...
+        end
+
+        # Computes the text size
+        def text_size(t, legend_style)
+          height = legend_style.dy_to_figure(t)
+
+          width = 0.0
+
+          info = t.get_text_size(legend_name)
+          
+          if info.key? 'width'
+            width += t.convert_output_to_figure_dx(10*info['width'])
+
+            h = t.convert_output_to_figure_dy(10*info['height'])
+            if h > height
+              height = h
+            end
+          end
+
+          return [ width, height ]
         end
 
 
@@ -98,17 +121,7 @@ module CTioga2
         # Computes the size of the line. Height should always be
         # accurate, but width can be 0 sometimes...
         def size(t, legend_style)
-          height = legend_style.dy.to_figure(t)
-
-          width = 0.0
-
-          info = t.get_text_size(legend_name)
-          
-          if info.key? 'width'
-            width += t.convert_output_to_figure_dx(10*info['width'])
-          end
-
-          return [ width, height ]
+          return text_size(t, legend_style)
         end
         
       end
@@ -155,23 +168,21 @@ module CTioga2
                       legend_style.picto_to_text.to_figure(t), 
                       'y' => y, 'text' => @curve_style.legend,
                       'measure' => legend_name,
-                      'justification' => Tioga::FigureConstants::LEFT_JUSTIFIED)
+                      'justification' => Tioga::FigureConstants::LEFT_JUSTIFIED,
+                      'alignment' => Tioga::FigureConstants::ALIGNED_AT_BASELINE)
         end
 
         # Computes the size of the line. Height should always
         # be accurate, but width can be 0 sometimes...
         def size(t, legend_style)
-          height = legend_style.dy.to_figure(t)
-
-          width = legend_style.picto_width.to_figure(t) + 
+          width, height = text_size(t, legend_style)
+          width += legend_style.picto_width.to_figure(t) + 
             legend_style.picto_to_text.to_figure(t) 
-
-          info = t.get_text_size(legend_name)
-          
-          if info.key? 'width'
-            width += t.convert_output_to_figure_dx(10*info['width'])
+          lh = Types::Dimension.new(:dy, 1, :y).to_figure(t,:y)
+          if lh > height
+            height = lh
           end
-
+            
           return [ width, height ]
         end
         

data/lib/ctioga2/graphics/legends/multicols.rb

@@ -0,0 +1,132 @@
+# items.rb: individual legend items
+# 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/styles'
+
+module CTioga2
+
+  Version::register_svn_info('$Revision$', '$Date$')
+
+  module Graphics
+
+    module Legends
+
+      # This class is an item that holds other items, and displays
+      # them in columns.
+      #
+      # @todo Add support for tiling on lines too ;-)...
+      #
+      # @todo Add support for filling up to some width/height.
+      #
+      # @todo Choose the order (vert first or horiz first)
+      class MultiColumnLegend < LegendItem
+
+        # The underlying storage
+        attr_accessor :storage
+
+        # The style
+        attr_accessor :style
+
+        def initialize(cols = 2)
+          super()
+          @storage = LegendStorage.new
+          @style = Styles::MultiColumnLegendStyle.new
+        end
+
+        # Adds an item to the underlying storage.
+        def add_item(item)
+          @storage.add_item(item)
+        end
+
+        # Draws all the legends
+        def draw(t, legend_style, x, y)
+          items = storage.harvest_contents()
+          size(t, legend_style)
+
+          index = 0
+          
+          dy = 0
+          dx = 0
+          cur_height = legend_style.dy_to_figure(t)
+          
+          for it in items
+            w, h = it.size(t, legend_style)
+            col = index % @style.columns
+
+            # Flush
+            if col == 0
+              dy -= cur_height unless index == 0
+              dx = 0
+              cur_height = h
+            else
+              dx += @column_widths[col - 1]
+            end
+
+
+            if cur_height < h
+              cur_height = h
+            end
+
+            it.draw(t, legend_style, x + dx, y + dy)
+            index += 1
+          end
+          
+        end
+
+        # Computes the size of all the legends, and also update the
+        # @column_widths array.
+        def size(t, legend_style)
+          items = storage.harvest_contents()
+
+          # Always that much !
+          cur_height = legend_style.dy_to_figure(t)
+          widths = [0] * @style.columns
+          height = 0
+          index = 0
+          for it in items
+            w,h = it.size(t, legend_style)
+            col = index % @style.columns
+
+            # Flush
+            if col == 0
+              height += cur_height unless index == 0
+              cur_height = h
+            end
+            if widths[col] < w
+              widths[col] = w
+            end
+            if cur_height < h
+              cur_height = h
+            end
+            index += 1
+          end
+
+          height += cur_height
+          # Now add padding to the columns widths:
+          (widths.size()-1).times do |i|
+            widths[i] += @style.dx.to_figure(t, :x)
+          end
+
+          @column_widths = widths
+          width = widths.reduce(:+) # Do padding !
+          return [width, height]
+        end
+        
+      end
+    end
+
+  end
+end

data/lib/ctioga2/graphics/styles.rb

@@ -19,10 +19,10 @@ require 'ctioga2/graphics/styles/box'
 require 'ctioga2/graphics/styles/location'
 require 'ctioga2/graphics/styles/texts'
 require 'ctioga2/graphics/styles/carrays'
-require 'ctioga2/graphics/styles/curve'
 
 require 'ctioga2/graphics/styles/gradients'
 require 'ctioga2/graphics/styles/colormap'
+require 'ctioga2/graphics/styles/contour'
 
 
 require 'ctioga2/graphics/styles/errorbar'
@@ -37,6 +37,8 @@ require 'ctioga2/graphics/styles/plot'
 require 'ctioga2/graphics/styles/legend'
 
 
+require 'ctioga2/graphics/styles/curve'
+
 require 'ctioga2/graphics/styles/factory'
 
 # Style sheets

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 357 $', '$Date: 2012-12-26 00:49:11 +0100 (Wed, 26 Dec 2012) $')
+  Version::register_svn_info('$Revision: 435 $', '$Date: 2013-08-26 22:03:19 +0200 (Mon, 26 Aug 2013) $')
 
   module Graphics
 
@@ -72,6 +72,8 @@ module CTioga2
         typed_attribute :minor_tick_length, 'float'
         typed_attribute :minor_tick_width, 'float'
 
+        typed_attribute :ticks_side, 'ticks-side'
+
 
         # Creates a new AxisStyle object at the given location with
         # the given style.
@@ -80,8 +82,10 @@ module CTioga2
           @decoration = decoration
 
           @tick_label_style = FullTextStyle.new
+          @tick_label_style.scale = Types::Dimension.new(:dy, 0.8)
           @axis_label = TextLabel.new(label)
           @log = false
+          @ticks_side = {}
         end
 
         # Draws the axis within the current plot. Boundaries are the
@@ -96,7 +100,7 @@ module CTioga2
         def draw_axis(t)
           spec = get_axis_specification(t)
           # Add tick label style:
-          spec.merge!(@tick_label_style.to_hash)
+          spec.merge!(@tick_label_style.hash_for_tioga(t))
 
           # Direct copy of attributes 
           for key in %w(stroke_color major_tick_length major_tick_width
@@ -106,6 +110,8 @@ minor_tick_length minor_tick_width)
               spec[key] = val
             end
           end
+
+          spec.update(@ticks_side)
           t.show_axis(spec)
           @axis_label.loc = @location
           default = vertical? ? 'ylabel' : 'xlabel'
@@ -213,8 +219,8 @@ minor_tick_length minor_tick_width)
         def get_ticks_parameters(t)
           i = t.axis_information({'location' => @location.tioga_location})
           retval = []
-          retval << (@tick_label_style.shift || i['shift'])
-          retval << (@tick_label_style.scale || i['scale'])
+          retval << (@tick_label_style.shift_dy(t) || i['shift'])
+          retval << (@tick_label_style.scale_dy(t) || i['scale'])
 
           retval[0] += 1
           return retval

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 370 $', '$Date: 2012-12-28 17:40:18 +0100 (Fri, 28 Dec 2012) $')
+  Version::register_svn_info('$Revision: 433 $', '$Date: 2013-08-26 22:03:14 +0200 (Mon, 26 Aug 2013) $')
 
   module Graphics
 
@@ -30,6 +30,12 @@ module CTioga2
 
         OldAttrAccessor = method(:attr_accessor)
 
+        AllStyles = []
+
+        def self.inherited(cls)
+          AllStyles << cls
+        end
+
         # This redefinition of attr_accessor allows to track for the
         # names of the attributes, while still showing them up
         # properly documented in rdoc.
@@ -37,10 +43,6 @@ module CTioga2
           @attributes ||= []
           @attributes << symbol
           OldAttrAccessor.call(symbol)
-          # cl = caller()
-          # if not cl[0] =~ /typed_attribute/
-          #   puts "old-style attribute: #{cl[0]}"
-          # end
         end
 
         # Returns the list of attributes.
@@ -53,6 +55,19 @@ module CTioga2
             end
         end
 
+        # Returns the type of all attributes (chaining to the parent
+        # when applicable)
+        def self.attribute_types
+          return ( @attribute_types || {} ).
+            merge(
+                  if superclass.respond_to?(:attribute_types)
+                    superclass.attribute_types
+                  else
+                    {}
+                  end
+                  )
+        end
+
         # This function should be the main way now of declaring
         # attributes, as it allows one to automatically generate an
         # options hash for Command
@@ -70,21 +85,57 @@ module CTioga2
           type = CmdArg.new(type) unless type.respond_to? :string_to_type
           @attribute_types ||= {}
           @attribute_types[sym] = type
+          return type
+        end
+
+        # Returns the type of an attribute, or _nil_ if there is no
+        # attribute of that name. Handles sub-styles correctly.
+        def self.attribute_type(symbol, fmt = "%s")
+          name = symbol.to_s
+
+          for k,v in attribute_types
+            if (fmt % k.to_s) == name
+              if v.respond_to? :type
+                return v.type
+              else
+                return v
+              end
+            end
+          end
+
+          if @sub_styles        # Not always present too
+            for sub in @sub_styles
+              sym, cls, fmt2, fc = *sub
+              f = fmt % fmt2
+              ret = cls.attribute_type(symbol, f)
+              return ret if ret
+            end
+          end
+          return nil
+        end
+
+        # Adds a deprecated typed attribute
+        def self.deprecated_attribute(symbol, type, message = true)
+          type = self.typed_attribute(symbol, type)
+          type.option_deprecated = message
         end
 
         # Defines an accessor for an attribute which is a BasicStyle
         # subclass in itself.
         #
-        # _format_ is the thing fed to the subclass for the
+        # _fmt_ is the thing fed to the subclass for the
         # _from_hash_ function.
-        def self.sub_style(symbol, cls, fmt = nil)
+        #
+        # if _force_create_ is on, then the corresponding sub-object
+        # is created even if no property we set within. 
+        def self.sub_style(symbol, cls, fmt = nil, force_create = false)
           @sub_styles ||= []    # A list of [symbol, cls, fmt]
           
           if ! fmt
             fmt = "#{symbol.to_s}_%s"
           end
           
-          @sub_styles << [symbol, cls, fmt]
+          @sub_styles << [symbol, cls, fmt, force_create]
           # Define the accessor
           OldAttrAccessor.call(symbol)
         end
@@ -107,7 +158,7 @@ module CTioga2
             
           if @sub_styles        # Not always present too
             for sub in @sub_styles
-              sym, cls, fmt = *sub
+              sym, cls, fmt, fc = *sub
               fmt = key % fmt
               ret.merge!(cls.options_hash(fmt))
             end
@@ -146,7 +197,7 @@ module CTioga2
 
           if self.class.sub_styles
             for sub in self.class.sub_styles
-              sym, cls, fmt = *sub
+              sym, cls, fmt, fc = *sub
               cur_var = self.send(sym)
               if ! cur_var        # Create if not present
                 cur_var = cls.new
@@ -154,7 +205,10 @@ module CTioga2
               end
               fmt = name % fmt
               nb = cur_var.set_from_hash(hash, fmt)
-              if nb > 0 and set_after
+
+              # Here, this means that missing attributes do not get
+              # created.
+              if (nb > 0 or fc)  and set_after
                 self.send("#{sym}=", cur_var)
               end
               nb_set += nb

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 199 $', '$Date: 2010-11-30 00:48:26 +0100 (Tue, 30 Nov 2010) $')
+  Version::register_svn_info('$Revision: 377 $', '$Date: 2013-02-01 12:10:20 +0100 (Fri, 01 Feb 2013) $')
 
   module Graphics
 
@@ -226,6 +226,7 @@ module CTioga2
           return [t.create_colormap(dict), zvs.first, zvs.last]
         end
 
+
         protected
 
         # Returns a Dvector holding z values corresponding to each of