ctioga2 0.0 → 0.1

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 53 $', '$Date: 2009-05-20 01:05:32 +0200 (Wed, 20 May 2009) $')
+  Version::register_svn_info('$Revision: 196 $', '$Date: 2010-11-25 20:15:32 +0100 (Thu, 25 Nov 2010) $')
 
   module Graphics
 
@@ -190,7 +190,7 @@ module CTioga2
         # specification. Splits up the text at a comma and
         def self.from_text(text, default = :figure)
           if not text =~ /^\s*([btlrc]{2})(?::([^,]+),\s*(.*))?\s*$/
-            return "Invalid format for #{text}"
+            raise "Invalid format for aligned point: #{text}"
           end
 
           specs = $1

data/lib/ctioga2/log.rb

@@ -16,7 +16,7 @@ require 'logger'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 90 $', '$Date: 2009-06-22 23:28:01 +0200 (Mon, 22 Jun 2009) $')
+  Version::register_svn_info('$Revision: 152 $', '$Date: 2010-06-20 01:55:50 +0200 (Sun, 20 Jun 2010) $')
 
   # This module should be included (or extended) by every class that
   # need logging/debugging facilities.
@@ -24,28 +24,28 @@ module CTioga2
 
     # Prints a debug message, on channel _channel_. Channel handling
     # is not implemented yet.
-    def debug(message, channel = nil)
-      @@logger.debug(message)
+    def debug(channel = nil)
+      @@logger.debug {yield}
     end
 
     # Prints a warning message
-    def warn(message)
-      @@logger.warn(message)
+    def warn
+      @@logger.warn {yield}
     end
 
     # Prints an informational message
-    def info(message)
-      @@logger.info(message)
+    def info
+      @@logger.info {yield}
     end
 
     # Prints an error message
-    def error(message)
-      @@logger.error(message)
+    def error
+      @@logger.error {yield}
     end
 
     # Prints a fatal error message and initiates program termination.
-    def fatal(message)
-      @@logger.fatal(message)
+    def fatal
+      @@logger.fatal {yield}
       exit 1                    # Fatal error.
     end
 
@@ -76,13 +76,13 @@ module CTioga2
     # A logged replacement for system
     def spawn(cmd, priority = :info)
       retval = system(cmd)
-      self.send(priority, "Spawned #{cmd} -> " + 
-                if retval
-                  "success"
-                else
-                  "failure"
-                end
-                )
+      self.send(priority) { "Spawned #{cmd} -> " + 
+        if retval
+          "success"
+        else
+          "failure"
+        end
+      }
       return retval
     end
 

data/lib/ctioga2/metabuilder/type.rb

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 18 $', '$Date: 2009-04-28 23:43:54 +0200 (Tue, 28 Apr 2009) $')
+  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
   
 
   # The MetaBuilder module contains a framework to perform
@@ -100,6 +100,10 @@ module CTioga2
       # many of them here.
       attr_accessor :re_shortcuts
 
+      # If the given string matches this regular expression, it is
+      # passed through without further modification.
+      attr_accessor :passthrough
+
       # A default constructor. It should be safe to use it directly for
       # children, unless something more specific is needed. Any descendent
       # should *always* register _type_ as @type - or, even better, call
@@ -118,6 +122,10 @@ module CTioga2
             end
           end
         end
+        if @type[:passthrough]
+          @passthrough = @type[:passthrough]
+        end
+
       end
 
       # This class function actually registers the current type
@@ -126,8 +134,8 @@ module CTioga2
       # creates a #type_name instance method returning this value.
       def self.type_name(name, public_name = nil, default_value = nil)
         if @@types.has_key?(name)
-          warn "Redefining type #{name} " +
-            "from #{@@types[name]} to #{self}"
+          warn { "Redefining type #{name} " +
+            "from #{@@types[name]} to #{self}" }
         end
         @@types[name] = self
         self.send(:define_method,:type_name) do
@@ -177,6 +185,10 @@ module CTioga2
       # is recommanded to define a #string_to_type_internal function
       # rather to redefine #string_to_type
       def string_to_type(string)
+        # First, passthrough
+        if @passthrough && @passthrough === string
+          return stt_run_hook(string)
+        end
         # First, shortcuts:
         if @shortcuts and @shortcuts.key? string
           return stt_run_hook(@shortcuts[string])

data/lib/ctioga2/metabuilder/types.rb

@@ -33,7 +33,7 @@ for file in files.uniq
   begin
     require "ctioga2/metabuilder/types/#{file}"
   rescue Exception => e
-    warn "There was a problem trying to load 'ctioga2/metabuilder/types/#{file}'" 
-    warn "#{e.inspect}"
+    warn { "There was a problem trying to load 'ctioga2/metabuilder/types/#{file}'" }
+    warn { "#{e.inspect}" }
   end
 end

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 67 $', '$Date: 2009-05-30 23:38:00 +0200 (Sat, 30 May 2009) $')
+  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
 
   module MetaBuilder
     module Types
@@ -100,6 +100,8 @@ module CTioga2
         def string_to_type_internal(str)
           default = @type[:default] || :frame
           case str
+          when Graphics::Types::GridBox::GridBoxRE
+            return Graphics::Types::GridBox::from_text(str)
           when Graphics::Types::PointBasedBox::PointBasedBoxRE
             return Graphics::Types::PointBasedBox::from_text(str, default)
           else
@@ -119,6 +121,16 @@ module CTioga2
 
       end
 
+      class LocationType < Type
+        
+        type_name :location, 'location'
+        
+        def string_to_type_internal(str)
+          return Graphics::Types::PlotLocation.from_text(str)
+        end
+
+      end
+
     end
   end
 end

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

@@ -0,0 +1,50 @@
+# styles.rb : Different Types to deal with various style arguments.
+# 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: 171 $', '$Date: 2010-10-22 17:07:52 +0200 (Fri, 22 Oct 2010) $')
+
+  module MetaBuilder
+    module Types
+
+      class DataPointType < Type
+        
+        type_name :data_point, 'data-point'
+        
+        def string_to_type_internal(str)
+          return Data::DataPoint.from_text(PlotMaker.plotmaker,str)
+        end
+      end
+
+      class LevelType < Type
+        
+        type_name :level, 'level'
+        
+        # @todo This should be modified eventually to mirror the
+        # DataPoint, but for now, no.
+        def string_to_type_internal(str)
+          return [str.to_f, PlotMaker.plotmaker.data_stack.last]
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+# generic.rb: conversion-function based type (or the Death of MetaBuilder)
+# you can choose among several possibilities
+# Copyright (C) 2010 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
+
+    module Types
+
+      # A type based on a conversion function from_text from a given
+      # class/module.
+      class FunctionBasedType < Type
+
+        type_name :function_based
+        
+        def type_name
+          return 'function_based'
+        end
+
+
+        def initialize(type)
+          super
+          raise "type must have a :class key" unless type.has_key?(:class)
+          # We make a copy for our own purposes.
+          @cls = type[:class]
+          @func_name = type[:func_name] || :from_text
+        end
+
+        def string_to_type_internal(str)
+          return @cls.send(@func_name, str)
+        end
+
+        def type_to_string_internal(val)
+          return val.to_s
+        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: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
+  Version::register_svn_info('$Revision: 222 $', '$Date: 2011-01-11 00:52:31 +0100 (Tue, 11 Jan 2011) $')
 
 
   module MetaBuilder
@@ -107,6 +107,38 @@ module CTioga2
         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
@@ -142,14 +174,14 @@ module CTioga2
       # A Type used for sets for Graphics::Styles::CircularArray
       # objects.
       #
-      # TODO: write a gradient stuff !!!
+      # \todo write a gradient stuff !!!
       class SetParameter < ArrayParameter
         type_name :set
 
         def initialize(type)
           super
           @separator = /\s*\|\s*/
-          @sepatarot_out = '|'
+          @separator_out = '|'
         end
 
         def type_name
@@ -157,28 +189,33 @@ module CTioga2
         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
+                     1.0/(nb - 1)     # The famous off-by one...
+                   else
+                     warn { "Incorrect gradient number: #{nb}" }
+                     1.0
+                   end
             array = []
             nb.times do |i|
-              a = []
-              f = i * fact
-              e.each_index do |c|
-                a << s[c] * (1 - f) + e[c] * f
-              end
-              array << a
+              array << Utils::mix_objects(e,s, i * fact)
             end
-            return array
           else
-            return super
+            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

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

@@ -20,28 +20,36 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 96 $', '$Date: 2009-06-27 20:56:17 +0200 (Sat, 27 Jun 2009) $')
+  Version::register_svn_info('$Revision: 222 $', '$Date: 2011-01-11 00:52:31 +0100 (Tue, 11 Jan 2011) $')
 
   module MetaBuilder
     module Types
 
-      # A color for use with Tioga, ie an [red, green, blue] array
-      # of values between 0 and 1.0. It accepts HTML-like colors, or
+      # A color for use with Tioga, ie a [red, green, blue] array of
+      # values between 0 and 1.0. It accepts HTML-like colors, or
       # three comma-separated values between 0 and 1.
       class TiogaColorType < Type
         
         type_name :tioga_color, 'color'
+
+        HLSRegexp = /(?:hls):/i
         
         def string_to_type_internal(str)
+          if str =~ HLSRegexp
+            hls = true
+            str = str.gsub(HLSRegexp,'')
+          else
+            hls = false
+          end
           if str =~ /^\s*#([0-9a-fA-F]{6})\s*$/
-              value =  $1.scan(/../).map {
+            value =  $1.scan(/../).map {
               |i| i.to_i(16)/255.0 
             }
           elsif str =~ /^\s*#([0-9a-fA-F]{3})\s*$/
-              value =  $1.scan(/../).map {
+            value =  $1.scan(/./).map {
               |i| i.to_i(16)/15.0 
             }
-          else 
+          else
             value = str.split(/\s*,\s*/).map do |s|
               s.to_f
             end
@@ -49,6 +57,10 @@ module CTioga2
           if value.size != 3
             raise IncorrectInput, "You need exactly three values to make up a color"
           end
+          if hls
+            # Requires Tioga r599
+            value = Tioga::FigureMaker.hls_to_rgb(value)
+          end
           return value
         end
       end
@@ -74,7 +86,6 @@ module CTioga2
           else
             phase = 0
           end
-          p specs
           return [ specs.map { |s| s.to_f }, phase]
         end
       end
@@ -125,51 +136,21 @@ module CTioga2
         end
       end
 
-      # Justification (horizontal alignement)
-      class JustificationType < Type
-
-        include Tioga::FigureConstants
-
-        ValidTypes = {
-          /l(eft)?/i => LEFT_JUSTIFIED,
-          /c(enter)?/i => CENTERED,
-          /r(ight)?/ => RIGHT_JUSTIFIED
-        }
-        
-        type_name :tioga_justification, 'halign'
+      # LaTeX font
+      class LaTeXFontBaseType < Type
+        type_name :latex_font, 'latex font'
         
         def string_to_type_internal(str)
-          for k,v in ValidTypes
-            if str =~ /^\s*#{k}\s*/
-                return v
-            end
-          end
-          raise IncorrectInput, "Not a justification: #{str}"
+          return Graphics::Styles::LaTeXFont.from_text(str)
         end
       end
 
-      # Vertical alignement
-      class AlignmentType < Type
-
-        include Tioga::FigureConstants
-
-        type_name :tioga_align, 'valign'
-        
-        ValidTypes = {
-          /t(op)?/i => ALIGNED_AT_TOP,
-          /c(enter)|m(idheight)/i => ALIGNED_AT_MIDHEIGHT,
-          /B|Baseline|baseline/ => ALIGNED_AT_BASELINE,
-          /b(ottom)?/ => ALIGNED_AT_BOTTOM
-        }
-        
+      # Colormap
+      class LaTeXFontBaseType < Type
+        type_name :colormap, 'color map'
         
         def string_to_type_internal(str)
-          for k,v in ValidTypes
-            if str =~ /^\s*#{k}\s*/
-                return v
-            end
-          end
-          raise IncorrectInput, "Not a vertical alignment: #{str}"
+          return Graphics::Styles::ColorMap.from_text(str)
         end
       end