ctioga2 0.2 → 0.3

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 133 $', '$Date: 2010-01-18 21:37:36 +0100 (Mon, 18 Jan 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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: 202 $', '$Date: 2010-11-30 22:21:17 +0100 (Tue, 30 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 
@@ -55,6 +55,8 @@ module CTioga2
         attr_accessor :plot_margin
 
         # Coordinate tranforms
+        #
+        # @todo they should be axis-specific.
         attr_accessor :transforms
 
         # Style of the background of the plot
@@ -101,6 +103,13 @@ module CTioga2
           @padding = Types::Dimension.new(:bp, 4)
         end
 
+        # Apply (destructively) the current transformations to the
+        # given dataset
+        def apply_transforms!(dataset)
+          @transforms.transform_2d!(dataset)
+        end
+
+
         # Whether to use log scale for the given axis.
         #
         # Now the question is: how should that affect user-defined

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$', '$Date$')
 
   module Graphics
 

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: 197 $', '$Date: 2010-11-29 14:26:12 +0100 (Mon, 29 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 214 $', '$Date: 2010-12-31 02:50:03 +0100 (Fri, 31 Dec 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

data/lib/ctioga2/graphics/types.rb

@@ -25,7 +25,7 @@ require 'ctioga2/graphics/types/grid'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 249 $', '$Date: 2011-01-29 14:05:04 +0100 (Sat, 29 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 125 $', '$Date: 2010-01-12 00:56:15 +0100 (Tue, 12 Jan 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   # This module contains all graphical elements of CTioga2
   module Graphics

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 92 $', '$Date: 2009-06-24 01:17:46 +0200 (Wed, 24 Jun 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   # This module contains all graphical elements of CTioga2
   module Graphics

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -19,7 +19,7 @@ require 'ctioga2/graphics/types/boxes'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 147 $', '$Date: 2010-04-06 21:13:28 +0200 (Tue, 06 Apr 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 223 $', '$Date: 2011-01-11 01:07:48 +0100 (Tue, 11 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 196 $', '$Date: 2010-11-25 20:15:32 +0100 (Thu, 25 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module Graphics
 

data/lib/ctioga2/log.rb

@@ -16,10 +16,13 @@ require 'logger'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 152 $', '$Date: 2010-06-20 01:55:50 +0200 (Sun, 20 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   # This module should be included (or extended) by every class that
   # need logging/debugging facilities.
+  #
+  # @todo The debug information should contain the command being
+  # currently executed.
   module Log
 
     # Prints a debug message, on channel _channel_. Channel handling

data/lib/ctioga2/metabuilder/type.rb

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
   
 
   # The MetaBuilder module contains a framework to perform

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module MetaBuilder
     module Types

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 171 $', '$Date: 2010-10-22 17:07:52 +0200 (Fri, 22 Oct 2010) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module MetaBuilder
     module Types

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

@@ -19,7 +19,7 @@ require 'time'
 require 'ctioga2/utils'
 
 module CTioga2
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module MetaBuilder
 

data/lib/ctioga2/metabuilder/types/generic.rb~

@@ -0,0 +1,225 @@
+# lists.rb : Different Types to deal with types where
+# you can choose among several possibilities
+# Copyright (C) 2006, 2009 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.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+require 'ctioga2/utils'
+
+module CTioga2
+
+  Version::register_svn_info('$Revision$', '$Date$')
+
+
+  module MetaBuilder
+
+    # The module Types should be used for all subclasses of
+    # Type, to keep the place clean and tidy.
+    module Types
+
+      # A regular expression matching true
+      TRUE_RE = /^\s*(true|yes|on)\s*$/i
+
+      # A regular expression matching false
+      FALSE_RE = /^\s*(false|no(ne)?|off)\s*$/i
+
+
+      # A boolean parameter
+      class BooleanParameter < Type
+
+        type_name :boolean
+        
+        def type_name
+          return 'bool'
+        end
+
+        # Yes, this *really* is a boolean !
+        def boolean?
+          return true
+        end
+        
+        def string_to_type_internal(str)
+          if str == true or str =~ TRUE_RE
+            return true
+          else
+            return false
+          end
+        end
+
+        def type_to_string_internal(val)
+          if val
+            return "true"
+          else
+            return "false"
+          end
+        end
+
+        # Booleans are a special case for option parser, as they
+        # are handled completely differently
+        def option_parser_long_option(name, biniou = nil)
+          return "--[no-]#{name}"
+        end
+      end
+
+      # A list of symbols. A hash :list must be provided that states
+      # the correspondance between the legal symbols that can be
+      # accepted by this parameter and their "english" name.
+      # This parameter can typically be used to prompt the user
+      # for different choices.
+      class ListParameter < Type
+
+        type_name :list
+
+        def initialize(type)
+          super
+          raise "type must have a :list key" unless type.has_key?(:list)
+          # We make a copy for our own purposes.
+          @hash = type[:list].dup
+        end
+        
+        def type_name
+          return 'list'
+        end
+        
+        def string_to_type_internal(str)
+          if @hash.has_key?(str.to_sym)
+            return str.to_sym
+          else
+            raise IncorrectInput, "Invalid input: #{str} should be one of " +
+              @hash.keys.map {|s| s.to_s}.join(',')
+          end
+        end
+
+        def type_to_string_internal(val)
+          return val.to_s
+        end
+      end
+
+
+      # A choice between different symbols based on regular expressions.
+      class REListParameter < Type
+
+        type_name :re_list
+
+        def initialize(type)
+          super
+          raise "type must have a :list key" unless type.has_key?(:list)
+          # We make a copy for our own purposes.
+          @re_hash = type[:list].dup
+        end
+        
+        def type_name
+          return 'relist'
+        end
+        
+        def string_to_type_internal(str)
+          for k,v in @re_hash
+            if str =~ /^\s*#{k}\s*$/
+              return v
+            end
+          end
+          raise IncorrectInput, "Invalid input: #{str} should match " +
+            @re_hash.keys.map {|s| s.to_s}.join(',')
+        end
+
+        def type_to_string_internal(val)
+          return val.to_s
+        end
+      end
+
+      # An array of identical elements of type specified by :subtype. Defaults
+      # to String
+      class ArrayParameter < Type
+        type_name :array
+
+        def initialize(type)
+          super
+          # We make a copy for our own purposes.
+          subtype = type[:subtype] || {:type => :string}
+          @subtype = Type.get_type(subtype)
+          @separator = /\s*,\s*/
+          @separator_out = ','
+        end
+
+        def type_name
+          return 'array'
+        end
+
+        def string_to_type_internal(str)
+          ary = str.split(@separator)
+          return ary.map do |a|
+            @subtype.string_to_type(a)
+          end
+        end
+
+        def type_to_string_internal(val)
+          return val.map do |a|
+            @subtype.type_to_string(a)
+          end.join(@separator_out)
+        end
+      end
+
+      # A Type used for sets for Graphics::Styles::CircularArray
+      # objects.
+      #
+      # \todo write a gradient stuff !!!
+      class SetParameter < ArrayParameter
+        type_name :set
+
+        def initialize(type)
+          super
+          @separator = /\s*\|\s*/
+          @separator_out = '|'
+        end
+
+        def type_name
+          return 'set'
+        end
+
+        def string_to_type_internal(str)
+          multiply = nil
+          if str =~ /(.*)\*\s*(\d+)\s*$/
+            multiply = $2.to_i
+            str = $1
+          end
+          if str =~ /^\s*gradient:(.+)--(.+),(\d+)\s*$/
+            s,e,nb = $1, $2, $3.to_i
+            s,e = @subtype.string_to_type(s),@subtype.string_to_type(e)
+            fact = if nb > 1
+                     1.0/(nb - 1)     # The famous off-by one...
+                   else
+                     warn { "Incorrect gradient number: #{nb}" }
+                     1.0
+                   end
+            array = []
+            nb.times do |i|
+              array << Utils::mix_objects(e,s, i * fact)
+            end
+          else
+            array = super
+          end
+          if multiply
+            # Seems that I've finally managed to understand what zip
+            # is useful for !
+            array = array.zip(*([array]*(multiply-1))).flatten(1)
+          end
+          return array
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 222 $', '$Date: 2011-01-11 00:52:31 +0100 (Tue, 11 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
 
   module MetaBuilder

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   module MetaBuilder