ctioga2 0.3 → 0.4

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 214 $', '$Date: 2010-12-31 02:50:03 +0100 (Fri, 31 Dec 2010) $')
 
   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$', '$Date$')
+  Version::register_svn_info('$Revision: 344 $', '$Date: 2012-12-23 22:45:22 +0100 (Sun, 23 Dec 2012) $')
 
   module Graphics
 
@@ -48,7 +48,6 @@ module CTioga2
 
     ColorType = CmdType.new('color', {
                               :type => :tioga_color,
-                              :namespace => Tioga::ColorConstants
                             }, <<EOD)
 A color. It can take three forms:
  * a named color, see 
@@ -61,7 +60,6 @@ EOD
     ColorOrFalseType = 
       CmdType.new('color-or-false', {
                     :type => :tioga_color,
-                    :namespace => Tioga::ColorConstants,
                     :shortcuts => {'none' => false }
                   }, <<EOD)
 A {type: color}, or false to say that nothing should be drawn.

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

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

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 125 $', '$Date: 2010-01-12 00:56:15 +0100 (Tue, 12 Jan 2010) $')
 
   # 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$', '$Date$')
+  Version::register_svn_info('$Revision: 92 $', '$Date: 2009-06-24 01:17:46 +0200 (Wed, 24 Jun 2009) $')
 
   # 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$', '$Date$')
+  Version::register_svn_info('$Revision: 328 $', '$Date: 2012-11-28 15:11:49 +0100 (Wed, 28 Nov 2012) $')
 
   module Graphics
 
@@ -150,7 +150,7 @@ module CTioga2
             end
             return Dimension.new(unit, value, orientation)
           else
-            raise "Unkown Dimension specification: '#{text}'"
+            raise "Unknown Dimension specification: '#{text}'"
           end
         end
         

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

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

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 360 $', '$Date: 2012-12-26 11:09:11 +0100 (Wed, 26 Dec 2012) $')
 
   module Graphics
 
@@ -199,7 +199,7 @@ module CTioga2
         #
         # So far, no real parsing
         def self.from_text(str)
-          str.gsub!(/-/,"_")
+          str = str.gsub(/-/,"_") # Avoid problems with frozen strings
           return PlotLocation.new(str.to_sym)
         end
 

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

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

data/lib/ctioga2/log.rb

@@ -16,7 +16,7 @@ require 'logger'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 327 $', '$Date: 2012-11-28 14:47:52 +0100 (Wed, 28 Nov 2012) $')
 
   # This module should be included (or extended) by every class that
   # need logging/debugging facilities.
@@ -25,30 +25,34 @@ module CTioga2
   # currently executed.
   module Log
 
+    def self.context
+      return " while processing #{PlotMaker.plotmaker.interpreter.context.to_s}"
+    end
+
     # Prints a debug message, on channel _channel_. Channel handling
     # is not implemented yet.
     def debug(channel = nil)
-      @@logger.debug {yield}
+      @@logger.debug {yield + Log.context}
     end
 
     # Prints a warning message
     def warn
-      @@logger.warn {yield}
+      @@logger.warn {yield + Log.context} 
     end
 
     # Prints an informational message
     def info
-      @@logger.info {yield}
+      @@logger.info {yield + Log.context}
     end
 
     # Prints an error message
     def error
-      @@logger.error {yield}
+      @@logger.error {yield + Log.context}
     end
 
     # Prints a fatal error message and initiates program termination.
     def fatal
-      @@logger.fatal {yield}
+      @@logger.fatal {yield + Log.context}
       exit 1                    # Fatal error.
     end
 

data/lib/ctioga2/metabuilder/type.rb

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  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

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 198 $', '$Date: 2010-11-30 00:48:23 +0100 (Tue, 30 Nov 2010) $')
 
   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$', '$Date$')
+  Version::register_svn_info('$Revision: 171 $', '$Date: 2010-10-22 17:07:52 +0200 (Fri, 22 Oct 2010) $')
 
   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$', '$Date$')
+  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
 
   module MetaBuilder
 

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

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

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

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

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

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

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

@@ -20,7 +20,7 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 351 $', '$Date: 2012-12-25 22:48:10 +0100 (Tue, 25 Dec 2012) $')
 
   module MetaBuilder
     module Types
@@ -33,8 +33,8 @@ module CTioga2
         type_name :tioga_color, 'color'
 
         HLSRegexp = /(?:hls):/i
-        
-        def string_to_type_internal(str)
+
+        def parse_one_color(str)
           if str =~ HLSRegexp
             hls = true
             str = str.gsub(HLSRegexp,'')
@@ -50,6 +50,13 @@ module CTioga2
               |i| i.to_i(16)/15.0 
             }
           else
+            begin 
+              if Tioga::ColorConstants::const_defined?(str)
+                value = Tioga::ColorConstants::const_get(str)
+                return value
+              end
+            rescue
+            end
             value = str.split(/\s*,\s*/).map do |s|
               s.to_f
             end
@@ -63,6 +70,26 @@ module CTioga2
           end
           return value
         end
+
+        def string_to_type_internal(str)
+          # We implement a xcolor-like color mix stuff
+          elems = str.split(/!(\d+(?:\.\d+)?)!?/)
+          if (elems.size % 2) == 0
+            elems << "White"    # Implicit mix with white
+          end
+          
+          temp = parse_one_color(elems.shift).dup
+          
+          while elems.size > 0
+            frac = elems.shift.to_f/100.0
+            new_color = parse_one_color(elems.shift)
+            3.times do |i|
+              temp[i] = frac * temp[i] + (1 - frac) * new_color[i]
+            end
+          end
+
+          return temp
+        end
       end
 
       # A line style for Tioga. It will be represented as:

data/lib/ctioga2/plotmaker.rb

@@ -155,7 +155,7 @@ require 'ctioga2/postprocess'
 # displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 314 $', '$Date: 2012-08-10 11:59:35 +0200 (Fri, 10 Aug 2012) $')
 
   # This class is the core of ctioga. It parses the command-line arguments,
   # reads all necessary files and plots graphs. Most of its functionality

data/lib/ctioga2/postprocess.rb

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
+  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
 
   # What happens to generated PDF files ?
   #

data/lib/ctioga2/utils.rb

@@ -34,7 +34,7 @@ module CTioga2
     # arguments and have the Date and Revision svn:keyword:. Use this
     # way:
     #
-    #  Version::register_svn_info('$Revision$', '$Date$')
+    #  Version::register_svn_info('$Revision: 354 $', '$Date: 2012-12-25 23:39:59 +0100 (Tue, 25 Dec 2012) $')
     #
     # To set the correct properties, the following command-line can be
     # used:
@@ -74,7 +74,7 @@ module CTioga2
     }
 
     # The position of the URL, used for getting the version
-    SVN_URL = '$HeadURL$'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.4/lib/ctioga2/utils.rb $'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -83,7 +83,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision$', '$Date$')
+    register_svn_info('$Revision: 354 $', '$Date: 2012-12-25 23:39:59 +0100 (Tue, 25 Dec 2012) $')
 
   end
 
@@ -165,6 +165,81 @@ module CTioga2
 
   end
 
+  # This class implements a Hash whose values can also be retrieved by
+  # pattern matching.
+  class RegexpHash
+
+    # Hash for non regexp keys
+    attr_accessor :hash
+
+    # Hash for regexp keys
+    attr_accessor :regexp_hash
+
+    def initialize()
+      @hash = {}
+      @regexp_kv = []
+    end
+
+    # Sets the key to the given value
+    def []=(key, value)
+      if Regexp === key
+        @regexp_kv <<  [key, value]
+      else
+        @hash[key] = value
+      end
+    end
+
+    # Gets the value corresponding to the key, using pattern matching
+    # should the need arise.
+    #
+    # If there are several regexps matching a given key, the
+    # implementation guarantees that the last one to have been
+    # inserted that matches is taken
+    def [](key)
+      if @hash.key?(key)
+        return @hash[key]
+      else
+        for k,v in @regexp_kv.reverse
+          if k === key
+            return v
+          end
+        end
+      end
+      return nil
+    end
+
+    def keys_for(value)
+      ret = []
+      for k,v in @hash
+        if value == v
+          ret << k
+        end
+      end
+      return ret
+    end
+
+  end
+
+end
+
+# Here, we define an additional function in the Hash class: without
+class Hash
+
+  # Returns a copy of the hash without the given keys
+  def without(*args)
+    ret = self.dup
+    for a in args.flatten
+      ret.delete(a)
+    end
+    return ret
+  end
+
+  # Renames the given key
+  def rename_key(old, new)
+    self[new] = self[old]
+    self.delete(old)
+  end
+
 end
 
 begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -75,6 +75,7 @@ files:
 - lib/ctioga2/commands/variables.rb
 - lib/ctioga2/commands/parsers/file.rb
 - lib/ctioga2/commands/parsers/command-line.rb
+- lib/ctioga2/commands/context.rb
 - lib/ctioga2/commands/groups.rb
 - lib/ctioga2/commands/interpreter.rb
 - lib/ctioga2/commands/arguments.rb
@@ -84,9 +85,11 @@ files:
 - lib/ctioga2/graphics/styles/errorbar.rb
 - lib/ctioga2/graphics/styles/gradients.rb
 - lib/ctioga2/graphics/styles/factory.rb
+- lib/ctioga2/graphics/styles/sheet.rb
 - lib/ctioga2/graphics/styles/carrays.rb
 - lib/ctioga2/graphics/styles/location.rb
 - lib/ctioga2/graphics/styles/map-axes.rb
+- lib/ctioga2/graphics/styles/arrows.rb
 - lib/ctioga2/graphics/styles/drawable.rb
 - lib/ctioga2/graphics/styles/axes.rb
 - lib/ctioga2/graphics/styles/background.rb
@@ -96,6 +99,7 @@ files:
 - lib/ctioga2/graphics/styles/colormap.rb
 - lib/ctioga2/graphics/styles/texts.rb
 - lib/ctioga2/graphics/styles/legend.rb
+- lib/ctioga2/graphics/styles/box.rb
 - lib/ctioga2/graphics/styles.rb
 - lib/ctioga2/graphics/coordinates.rb
 - lib/ctioga2/graphics/legends/area.rb
@@ -104,7 +108,6 @@ files:
 - lib/ctioga2/graphics/legends/provider.rb
 - lib/ctioga2/graphics/types.rb
 - lib/ctioga2/graphics/elements/subplot.rb
-- lib/ctioga2/graphics/elements/redirecting-container.rb~
 - lib/ctioga2/graphics/elements/parametric2d.rb
 - lib/ctioga2/graphics/elements/redirecting-container.rb
 - lib/ctioga2/graphics/elements/primitive.rb
@@ -128,7 +131,6 @@ files:
 - lib/ctioga2/graphics/types/grid.rb
 - lib/ctioga2/graphics/root.rb
 - lib/ctioga2/utils.rb
-- lib/ctioga2/git-fools-svn.rb
 - lib/ctioga2/postprocess.rb
 - lib/ctioga2/metabuilder/type.rb
 - lib/ctioga2/metabuilder/types.rb
@@ -138,7 +140,6 @@ files:
 - lib/ctioga2/metabuilder/types/styles.rb
 - lib/ctioga2/metabuilder/types/strings.rb
 - lib/ctioga2/metabuilder/types/coordinates.rb
-- lib/ctioga2/metabuilder/types/generic.rb~
 - lib/ctioga2/metabuilder/types/data.rb
 - lib/ctioga2/metabuilder/types/generic.rb
 - COPYING