ctioga2 0.2 → 0.3

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

@@ -19,7 +19,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

data/lib/ctioga2/metabuilder/types/styles.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
     module Types

data/lib/ctioga2/plotmaker.rb

@@ -102,6 +102,8 @@
 require 'ctioga2/utils'
 require 'ctioga2/log'
 
+CTioga2::Log::init_logger
+
 require 'shellwords'
 
 # Maybe, maybe, maybe... We need tioga ?
@@ -146,9 +148,14 @@ require 'ctioga2/postprocess'
 # * CTioga2::Data
 #
 # Have fun hacking...
+#
+# \section todo Various things and ideas...
+#
+# @li have a way to make one axis scale slave to another one (ie, for
+# displays of rate constants vs potentials)
 module CTioga2
 
-  Version::register_svn_info('$Revision: 244 $', '$Date: 2011-01-23 23:36:02 +0100 (Sun, 23 Jan 2011) $')
+  Version::register_svn_info('$Revision$', '$Date$')
 
   # This class is the core of ctioga. It parses the command-line arguments,
   # reads all necessary files and plots graphs. Most of its functionality
@@ -388,12 +395,6 @@ module CTioga2
         return
       end
       for set in sets
-        # We first trim elements from options that are not inside
-        # Graphics::Styles::CurveStyleFactory::PlotCommandOptions
-        options.delete_if { |k,v|
-          ! Graphics::Styles::
-          CurveStyleFactory::PlotCommandOptions.key?(k)
-        }
         add_curve(set, options)
       end
     end
@@ -442,6 +443,10 @@ module CTioga2
       raise "Duplicated option between PlotCommandOptions and LoadDatasetOptions"
     end
 
+    PlotOptions.merge!(Graphics::CurveGenerator::PlotOptions) do |key, oldval, newval| 
+      raise "Duplicated option between PlotCommandOptions and LoadDatasetOptions"
+    end
+
     PlotCommand = 
       Cmd.new("plot",nil,"--plot", 
               [ CmdArg.new('dataset') ], 

data/lib/ctioga2/postprocess.rb

@@ -17,7 +17,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$')
 
   # 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: 286 $', '$Date: 2011-02-22 21:12:50 +0100 (Tue, 22 Feb 2011) $')
+    #  Version::register_svn_info('$Revision$', '$Date$')
     #
     # 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+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.2/lib/ctioga2/utils.rb $'
+    SVN_URL = '$HeadURL$'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -83,7 +83,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision: 286 $', '$Date: 2011-02-22 21:12:50 +0100 (Tue, 22 Feb 2011) $')
+    register_svn_info('$Revision$', '$Date$')
 
   end
 
@@ -137,6 +137,30 @@ module CTioga2
       k.downto(1) {|i| res = res/i }
       return res
     end
+
+    # This converts a text formula that can contain:
+    # * any litteral thing
+    # * references to columns in the form of \$1 for column 1 (ie the
+    #   second one)
+    # * references to named columns in the form $name$
+    # * references to parameters
+    #
+    # The return value is ready to be passed to Dvector.compute_formula
+    def self.parse_formula(formula, parameters = nil, header = nil)
+      formula = formula.dup
+      if parameters
+        for k,v in parameters
+          formula.gsub!(/\b#{k}\b/, v.to_s)
+        end
+      end
+      formula.gsub!(/\$(\d+)/, 'column[\1]')
+      if header
+        for k,v in header
+          formula.gsub!("$#{k}$", "column[#{v}]")
+        end
+      end
+      return formula
+    end
     
 
   end

metadata

@@ -1,52 +1,48 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ctioga2
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  version: "0.2"
+version: !ruby/object:Gem::Version
+  version: '0.3'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Vincent Fourmond <vincent.fourmond@9online.fr>
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-23 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: tioga
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 13
-        version: "1.13"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.15'
   type: :runtime
-  version_requirements: *id001
-description: |
-  ctioga2 is a command-driven plotting program that produces
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.15'
+description: ! 'ctioga2 is a command-driven plotting program that produces
+
   high quality PDF files. It can be used both from the command-line
+
   and using command files (at the same time).
-  
-  It is based on Tioga.
 
+
+  It is based on Tioga (http://tioga.rubyforge.org).
+
+'
 email: vincent.fourmond@9online.fr
-executables: 
+executables:
 - ctioga2
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/ctioga2/data/indexed-dtable.rb
 - lib/ctioga2/data/datacolumn.rb
 - lib/ctioga2/data/point.rb
@@ -61,6 +57,7 @@ files:
 - lib/ctioga2/data/backends/backends/math.rb
 - lib/ctioga2/data/backends/backends/text.rb
 - lib/ctioga2/data/backends/backends/gnuplot.rb
+- lib/ctioga2/data/backends/backends/direct.rb
 - lib/ctioga2/log.rb
 - lib/ctioga2/plotmaker.rb
 - lib/ctioga2/commands/type.rb
@@ -107,6 +104,7 @@ 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
@@ -130,6 +128,7 @@ 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
@@ -139,45 +138,35 @@ 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
 - Changelog
 - setup.rb
 - bin/ctioga2
-has_rdoc: true
 homepage: http://ctioga2.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ctioga2
-rubygems_version: 1.3.7
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ctioga2 - the polymorphic plotting program
 test_files: []
-