ctioga2 0.7 → 0.8

data/Changelog

@@ -1,3 +1,11 @@
+ctioga2 (0.8)
+
+  * New plot type for making histograms (including cumulative histograms)
+  * xcolor-style set mixing specification (ie --fill-color default!10)
+  * Bug fixes and documentation updates
+
+ -- Vincent <vincent.fourmond@9online.fr>  Fri 27 Dec 00:01:50 CET 2013
+
 ctioga2 (0.7)
 
   * It is now possible to index marker size index on Z values for

data/lib/ctioga2/commands/arguments.rb

@@ -16,8 +16,6 @@ require 'ctioga2/commands/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 383 $', '$Date: 2013-03-11 21:57:53 +0100 (Mon, 11 Mar 2013) $')
-
   module Commands
 
     # An argument to a Command

data/lib/ctioga2/commands/commands.rb

@@ -17,8 +17,6 @@ require 'ctioga2/commands/groups'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
-
   module Commands
 
     # An exception raised when the command is called with an insufficient

data/lib/ctioga2/commands/context.rb

@@ -16,8 +16,6 @@ require 'ctioga2/commands/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
   module Commands
 
     # Context of parsing, mostly for error reporting

data/lib/ctioga2/commands/doc/doc.rb

@@ -17,8 +17,6 @@ require 'ctioga2/commands/doc/markup'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 138 $', '$Date: 2010-01-21 22:39:55 +0100 (Thu, 21 Jan 2010) $')
-
   module Commands
 
     # The base of the 'self-documentation' of CTioga2

data/lib/ctioga2/commands/doc/documentation-commands.rb

@@ -20,8 +20,6 @@ require 'ctioga2/commands/doc/markup'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 106 $', '$Date: 2009-10-21 01:31:34 +0200 (Wed, 21 Oct 2009) $')
-
   module Commands
 
     # The base of the 'self-documentation' of CTioga2

data/lib/ctioga2/commands/doc/help.rb

@@ -18,8 +18,6 @@ require 'ctioga2/commands/doc/wordwrap'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 532 $', '$Date: 2013-09-29 12:13:33 +0200 (Sun, 29 Sep 2013) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/doc/html.rb

@@ -16,8 +16,6 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 409 $', '$Date: 2013-08-22 21:23:51 +0200 (Thu, 22 Aug 2013) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/doc/introspection.rb

@@ -16,8 +16,6 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 430 $', '$Date: 2013-08-23 14:23:52 +0200 (Fri, 23 Aug 2013) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/doc/man.rb

@@ -18,8 +18,6 @@ require 'ctioga2/commands/parsers/command-line'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 213 $', '$Date: 2010-12-31 02:50:00 +0100 (Fri, 31 Dec 2010) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/doc/markup.rb

@@ -16,8 +16,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 216 $', '$Date: 2010-12-31 16:18:17 +0100 (Fri, 31 Dec 2010) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/doc/wordwrap.rb

@@ -17,8 +17,6 @@ require 'ctioga2/commands/parsers/command-line'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 131 $', '$Date: 2010-01-14 22:51:09 +0100 (Thu, 14 Jan 2010) $')
-
   module Commands
 
     module Documentation

data/lib/ctioga2/commands/general-commands.rb

@@ -17,8 +17,6 @@ require 'ctioga2/commands/parsers/file'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 508 $', '$Date: 2013-09-09 22:13:14 +0200 (Mon, 09 Sep 2013) $')
-
   module Commands
  
     # General scope commands.

data/lib/ctioga2/commands/general-types.rb

@@ -15,8 +15,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 517 $', '$Date: 2013-09-19 18:28:15 +0200 (Thu, 19 Sep 2013) $')
-
   module Commands
  
     # A file name.

data/lib/ctioga2/commands/groups.rb

@@ -16,8 +16,6 @@ require 'ctioga2/metabuilder/types'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 14 $', '$Date: 2009-04-27 21:49:16 +0200 (Mon, 27 Apr 2009) $')
-
   module Commands
 
     # A group of commands, organized along a same theme.

data/lib/ctioga2/commands/interpreter.rb

@@ -21,8 +21,6 @@ require 'ctioga2/commands/doc/doc'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 512 $', '$Date: 2013-09-11 13:20:24 +0200 (Wed, 11 Sep 2013) $')
-
   # This module contains the real core of ctioga2: a set of classes
   # that implement the concept of commands. Each command translates
   # into an action (of any kind).

data/lib/ctioga2/commands/parsers/command-line.rb

@@ -17,8 +17,6 @@ require 'ctioga2/commands/commands'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 327 $', '$Date: 2012-11-28 14:47:52 +0100 (Wed, 28 Nov 2012) $')
-
   module Commands
 
     # In this modules are classes that parse a source of commands, and

data/lib/ctioga2/commands/parsers/file.rb

@@ -20,8 +20,6 @@ require 'ctioga2/commands/parsers/old-file'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 420 $', '$Date: 2013-08-23 01:05:44 +0200 (Fri, 23 Aug 2013) $')
-
   module Commands
 
     module Parsers

data/lib/ctioga2/commands/parsers/old-file.rb

@@ -19,8 +19,6 @@ require 'ctioga2/commands/strings'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 392 $', '$Date: 2013-06-23 01:05:02 +0200 (Sun, 23 Jun 2013) $')
-
   module Commands
 
     module Parsers

data/lib/ctioga2/commands/strings.rb

@@ -16,8 +16,6 @@ require 'stringio'              # For debugging purposes
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 400 $', '$Date: 2013-08-19 17:29:57 +0200 (Mon, 19 Aug 2013) $')
-
   module Commands
 
     class UnterminatedString < Exception

data/lib/ctioga2/commands/type.rb

@@ -16,8 +16,6 @@ require 'ctioga2/metabuilder/types'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 173 $', '$Date: 2010-10-22 21:41:39 +0200 (Fri, 22 Oct 2010) $')
-
   module Commands
 
     # A named type, based on CTioga2::MetaBuilder::Type

data/lib/ctioga2/commands/variables.rb

@@ -16,8 +16,6 @@ require 'ctioga2/commands/strings'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 302 $', '$Date: 2012-01-03 14:02:43 +0100 (Tue, 03 Jan 2012) $')
-
   module Commands
 
     class RecursiveExpansion < Exception

data/lib/ctioga2/data/backends/backend.rb

@@ -21,9 +21,6 @@ require 'ctioga2/data/backends/description'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
-  
-
   module Data
 
     # The Backends are in charge of acquiring DataSet from various

data/lib/ctioga2/data/backends/backends/direct.rb

@@ -25,9 +25,6 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision$', '$Date$')
-
-
   module Data
 
     module Backends

data/lib/ctioga2/data/backends/backends/gnuplot.rb

@@ -25,9 +25,6 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 151 $', '$Date: 2010-06-19 23:45:20 +0200 (Sat, 19 Jun 2010) $')
-
-
   module Data
 
     module Backends

data/lib/ctioga2/data/backends/backends/math.rb

@@ -21,8 +21,6 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 451 $', '$Date: 2013-08-29 01:28:30 +0200 (Thu, 29 Aug 2013) $')
-
   module Data
 
     module Backends

data/lib/ctioga2/data/backends/backends/text.rb

@@ -25,9 +25,6 @@ require 'stringio'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 524 $', '$Date: 2013-09-22 16:18:39 +0200 (Sun, 22 Sep 2013) $')
-
-
   module Data
 
     # A module for easy use of NaN in operations

data/lib/ctioga2/data/backends/description.rb

@@ -22,9 +22,6 @@ require 'ctioga2/commands/groups'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 307 $', '$Date: 2012-01-05 14:50:43 +0100 (Thu, 05 Jan 2012) $')
-  
-
   module Data
 
     module Backends

data/lib/ctioga2/data/backends/factory.rb

@@ -16,12 +16,11 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 require 'ctioga2/utils'
+require 'ctioga2/log'
 require 'ctioga2/data/backends/backend'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
-
   module Data
 
     module Backends
@@ -30,6 +29,8 @@ module CTioga2
       # available, and features a 'current backend'.
       class BackendFactory
 
+        include Log
+
         # A hash name (as in Description#name) -> Backend
         attr_accessor :backends
 
@@ -58,6 +59,21 @@ module CTioga2
           @current = @backends[backend]
         end
 
+        # Returns the backend named in the 'as' key of options, or the
+        # current backend if there isn't
+        def specified_backend(options = {})
+          if options.key? 'as'
+            k = options['as']
+            if @backends.key? k
+              return @backends[k]
+            else
+              error { "No such backend: #{k}, ignoring" }
+            end
+          else
+            return @current
+          end
+        end
+
         
         # Sets the (raw) value of the parameter of the given backend
         def set_backend_parameter_value(backend, param, value)

data/lib/ctioga2/data/backends/parameter.rb

@@ -21,8 +21,6 @@ require 'ctioga2/metabuilder/type'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 17 $', '$Date: 2009-04-28 22:22:22 +0200 (Tue, 28 Apr 2009) $')
-
   module Data
 
     module Backends

data/lib/ctioga2/data/datacolumn.rb

@@ -17,8 +17,6 @@ require 'ctioga2/utils'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 402 $', '$Date: 2013-08-19 17:30:02 +0200 (Mon, 19 Aug 2013) $')
-
   module Data
 
     # This class holds one column, possibly with error bars.

data/lib/ctioga2/data/dataset.rb

@@ -18,9 +18,6 @@ require 'ctioga2/data/indexed-dtable'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 451 $', '$Date: 2013-08-29 01:28:30 +0200 (Thu, 29 Aug 2013) $')
-
-
   # \todo now, port the backend infrastructure...
 
   # This module holds all the code that deals with manipulation and
@@ -172,6 +169,11 @@ module CTioga2
         return 1 + @ys.size
       end
 
+      # The number of Z columns
+      def z_columns
+        return @ys.size - 1
+      end
+
       # Concatenates another Dataset to this one
       def <<(dataset)
         if dataset.size != self.size

data/lib/ctioga2/data/filters.rb

@@ -19,9 +19,6 @@ require 'ctioga2/data/backends/factory'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
-
-
   module Data
 
     # A series of commands that can be used as "filters", as they act

data/lib/ctioga2/data/indexed-dtable.rb

@@ -15,9 +15,6 @@ require 'ctioga2/utils'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 406 $', '$Date: 2013-08-22 21:23:44 +0200 (Thu, 22 Aug 2013) $')
-
-
   module Data
 
     # An indexed Dtable.

data/lib/ctioga2/data/point.rb

@@ -17,9 +17,6 @@ require 'ctioga2/data/dataset'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 112 $', '$Date: 2009-11-09 22:34:12 +0100 (Mon, 09 Nov 2009) $')
-
-
   module Data
 
     # This class represents a datapoint, ie. an index in a given

data/lib/ctioga2/data/stack.rb

@@ -25,9 +25,6 @@ require 'ctioga2/data/filters'
 # This module contains all the classes used by ctioga
 module CTioga2
 
-  Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
-
-
   module Data
 
     # This is the central class for acquisition and handling of
@@ -92,7 +89,7 @@ EOH
       # backend, retrieves corresponding Dataset objects, pushes them
       # onto the stack and returns them.
       def get_datasets(set, options = {})
-        backend = @backend_factory.current
+        backend = @backend_factory.specified_backend(options)
         sets = backend.expand_sets(set)
         datasets = []
         for s in sets
@@ -319,6 +316,7 @@ EOH
 
     LoadDatasetOptions = { 
       'name' => CmdArg.new('text'),
+      'as' => CmdArg.new('text'),
       'where' => CmdArg.new('text'),
       'ignore_hooks' => CmdArg.new('boolean')
     }

data/lib/ctioga2/graphics/coordinates.rb

@@ -17,8 +17,6 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 177 $', '$Date: 2010-10-25 13:22:39 +0200 (Mon, 25 Oct 2010) $')
-
   module Graphics
 
     # Deals with transforming the coordinates of all datasets