ctioga2 0.7 → 0.8
Sign up to get free protection for your applications and to get access to all the features.
- data/Changelog +8 -0
- data/lib/ctioga2/commands/arguments.rb +0 -2
- data/lib/ctioga2/commands/commands.rb +0 -2
- data/lib/ctioga2/commands/context.rb +0 -2
- data/lib/ctioga2/commands/doc/doc.rb +0 -2
- data/lib/ctioga2/commands/doc/documentation-commands.rb +0 -2
- data/lib/ctioga2/commands/doc/help.rb +0 -2
- data/lib/ctioga2/commands/doc/html.rb +0 -2
- data/lib/ctioga2/commands/doc/introspection.rb +0 -2
- data/lib/ctioga2/commands/doc/man.rb +0 -2
- data/lib/ctioga2/commands/doc/markup.rb +0 -2
- data/lib/ctioga2/commands/doc/wordwrap.rb +0 -2
- data/lib/ctioga2/commands/general-commands.rb +0 -2
- data/lib/ctioga2/commands/general-types.rb +0 -2
- data/lib/ctioga2/commands/groups.rb +0 -2
- data/lib/ctioga2/commands/interpreter.rb +0 -2
- data/lib/ctioga2/commands/parsers/command-line.rb +0 -2
- data/lib/ctioga2/commands/parsers/file.rb +0 -2
- data/lib/ctioga2/commands/parsers/old-file.rb +0 -2
- data/lib/ctioga2/commands/strings.rb +0 -2
- data/lib/ctioga2/commands/type.rb +0 -2
- data/lib/ctioga2/commands/variables.rb +0 -2
- data/lib/ctioga2/data/backends/backend.rb +0 -3
- data/lib/ctioga2/data/backends/backends/direct.rb +0 -3
- data/lib/ctioga2/data/backends/backends/gnuplot.rb +0 -3
- data/lib/ctioga2/data/backends/backends/math.rb +0 -2
- data/lib/ctioga2/data/backends/backends/text.rb +0 -3
- data/lib/ctioga2/data/backends/description.rb +0 -3
- data/lib/ctioga2/data/backends/factory.rb +18 -2
- data/lib/ctioga2/data/backends/parameter.rb +0 -2
- data/lib/ctioga2/data/datacolumn.rb +0 -2
- data/lib/ctioga2/data/dataset.rb +5 -3
- data/lib/ctioga2/data/filters.rb +0 -3
- data/lib/ctioga2/data/indexed-dtable.rb +0 -3
- data/lib/ctioga2/data/point.rb +0 -3
- data/lib/ctioga2/data/stack.rb +2 -4
- data/lib/ctioga2/graphics/coordinates.rb +0 -2
- data/lib/ctioga2/graphics/elements.rb +1 -2
- data/lib/ctioga2/graphics/elements/containers.rb +32 -2
- data/lib/ctioga2/graphics/elements/contour.rb +0 -2
- data/lib/ctioga2/graphics/elements/curve2d.rb +0 -2
- data/lib/ctioga2/graphics/elements/element.rb +4 -2
- data/lib/ctioga2/graphics/elements/gradient-region.rb +0 -2
- data/lib/ctioga2/graphics/elements/histogram.rb +298 -0
- data/lib/ctioga2/graphics/elements/parametric2d.rb +7 -3
- data/lib/ctioga2/graphics/elements/primitive.rb +0 -2
- data/lib/ctioga2/graphics/elements/redirecting-container.rb +21 -2
- data/lib/ctioga2/graphics/elements/region.rb +0 -2
- data/lib/ctioga2/graphics/elements/subplot.rb +0 -2
- data/lib/ctioga2/graphics/elements/tangent.rb +0 -2
- data/lib/ctioga2/graphics/elements/xyz-contour.rb +0 -2
- data/lib/ctioga2/graphics/elements/xyz-map.rb +0 -2
- data/lib/ctioga2/graphics/generator.rb +47 -42
- data/lib/ctioga2/graphics/legends.rb +0 -2
- data/lib/ctioga2/graphics/legends/area.rb +0 -2
- data/lib/ctioga2/graphics/legends/items.rb +0 -2
- data/lib/ctioga2/graphics/legends/multicols.rb +0 -2
- data/lib/ctioga2/graphics/legends/provider.rb +0 -2
- data/lib/ctioga2/graphics/legends/storage.rb +0 -2
- data/lib/ctioga2/graphics/root.rb +0 -2
- data/lib/ctioga2/graphics/styles/arrows.rb +0 -2
- data/lib/ctioga2/graphics/styles/axes.rb +0 -2
- data/lib/ctioga2/graphics/styles/background.rb +0 -2
- data/lib/ctioga2/graphics/styles/base.rb +4 -2
- data/lib/ctioga2/graphics/styles/box.rb +0 -2
- data/lib/ctioga2/graphics/styles/carrays.rb +0 -2
- data/lib/ctioga2/graphics/styles/colormap.rb +0 -2
- data/lib/ctioga2/graphics/styles/contour.rb +0 -2
- data/lib/ctioga2/graphics/styles/curve.rb +0 -2
- data/lib/ctioga2/graphics/styles/drawable.rb +0 -2
- data/lib/ctioga2/graphics/styles/errorbar.rb +0 -2
- data/lib/ctioga2/graphics/styles/factory.rb +0 -2
- data/lib/ctioga2/graphics/styles/gradients.rb +0 -2
- data/lib/ctioga2/graphics/styles/legend.rb +0 -2
- data/lib/ctioga2/graphics/styles/location.rb +0 -2
- data/lib/ctioga2/graphics/styles/map-axes.rb +0 -2
- data/lib/ctioga2/graphics/styles/plot-types.rb +51 -3
- data/lib/ctioga2/graphics/styles/plot.rb +0 -2
- data/lib/ctioga2/graphics/styles/sets.rb +0 -2
- data/lib/ctioga2/graphics/styles/sheet.rb +0 -2
- data/lib/ctioga2/graphics/styles/texts.rb +0 -2
- data/lib/ctioga2/graphics/styles/ticks.rb +0 -2
- data/lib/ctioga2/graphics/subplot-commands.rb +0 -2
- data/lib/ctioga2/graphics/types.rb +11 -4
- data/lib/ctioga2/graphics/types/bijection.rb +0 -2
- data/lib/ctioga2/graphics/types/boundaries.rb +0 -2
- data/lib/ctioga2/graphics/types/boxes.rb +0 -2
- data/lib/ctioga2/graphics/types/dimensions.rb +0 -2
- data/lib/ctioga2/graphics/types/fill.rb +27 -15
- data/lib/ctioga2/graphics/types/grid.rb +0 -2
- data/lib/ctioga2/graphics/types/location.rb +0 -2
- data/lib/ctioga2/graphics/types/point.rb +0 -2
- data/lib/ctioga2/log.rb +0 -2
- data/lib/ctioga2/metabuilder/type.rb +0 -2
- data/lib/ctioga2/metabuilder/types/coordinates.rb +0 -2
- data/lib/ctioga2/metabuilder/types/data.rb +0 -2
- data/lib/ctioga2/metabuilder/types/dates.rb +0 -1
- data/lib/ctioga2/metabuilder/types/generic.rb +0 -3
- data/lib/ctioga2/metabuilder/types/lists.rb +25 -3
- data/lib/ctioga2/metabuilder/types/numbers.rb +0 -2
- data/lib/ctioga2/metabuilder/types/strings.rb +0 -3
- data/lib/ctioga2/metabuilder/types/styles.rb +0 -2
- data/lib/ctioga2/plotmaker.rb +2 -4
- data/lib/ctioga2/postprocess.rb +0 -2
- data/lib/ctioga2/utils.rb +6 -64
- data/lib/ctioga2/version.rb +8 -0
- metadata +6 -4
data/Changelog
CHANGED
@@ -1,3 +1,11 @@
|
|
1
|
+
ctioga2 (0.8)
|
2
|
+
|
3
|
+
* New plot type for making histograms (including cumulative histograms)
|
4
|
+
* xcolor-style set mixing specification (ie --fill-color default!10)
|
5
|
+
* Bug fixes and documentation updates
|
6
|
+
|
7
|
+
-- Vincent <vincent.fourmond@9online.fr> Fri 27 Dec 00:01:50 CET 2013
|
8
|
+
|
1
9
|
ctioga2 (0.7)
|
2
10
|
|
3
11
|
* It is now possible to index marker size index on Z values for
|
@@ -17,8 +17,6 @@ require 'ctioga2/commands/groups'
|
|
17
17
|
|
18
18
|
module CTioga2
|
19
19
|
|
20
|
-
Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
|
21
|
-
|
22
20
|
module Commands
|
23
21
|
|
24
22
|
# An exception raised when the command is called with an insufficient
|
@@ -21,8 +21,6 @@ require 'ctioga2/commands/doc/doc'
|
|
21
21
|
|
22
22
|
module CTioga2
|
23
23
|
|
24
|
-
Version::register_svn_info('$Revision: 512 $', '$Date: 2013-09-11 13:20:24 +0200 (Wed, 11 Sep 2013) $')
|
25
|
-
|
26
24
|
# This module contains the real core of ctioga2: a set of classes
|
27
25
|
# that implement the concept of commands. Each command translates
|
28
26
|
# into an action (of any kind).
|
@@ -17,8 +17,6 @@ require 'ctioga2/commands/commands'
|
|
17
17
|
|
18
18
|
module CTioga2
|
19
19
|
|
20
|
-
Version::register_svn_info('$Revision: 327 $', '$Date: 2012-11-28 14:47:52 +0100 (Wed, 28 Nov 2012) $')
|
21
|
-
|
22
20
|
module Commands
|
23
21
|
|
24
22
|
# In this modules are classes that parse a source of commands, and
|
@@ -21,9 +21,6 @@ require 'ctioga2/data/backends/description'
|
|
21
21
|
|
22
22
|
module CTioga2
|
23
23
|
|
24
|
-
Version::register_svn_info('$Revision: 155 $', '$Date: 2010-06-21 21:41:32 +0200 (Mon, 21 Jun 2010) $')
|
25
|
-
|
26
|
-
|
27
24
|
module Data
|
28
25
|
|
29
26
|
# The Backends are in charge of acquiring DataSet from various
|
@@ -16,12 +16,11 @@
|
|
16
16
|
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
17
17
|
|
18
18
|
require 'ctioga2/utils'
|
19
|
+
require 'ctioga2/log'
|
19
20
|
require 'ctioga2/data/backends/backend'
|
20
21
|
|
21
22
|
module CTioga2
|
22
23
|
|
23
|
-
Version::register_svn_info('$Revision: 2 $', '$Date: 2009-04-25 14:03:30 +0200 (Sat, 25 Apr 2009) $')
|
24
|
-
|
25
24
|
module Data
|
26
25
|
|
27
26
|
module Backends
|
@@ -30,6 +29,8 @@ module CTioga2
|
|
30
29
|
# available, and features a 'current backend'.
|
31
30
|
class BackendFactory
|
32
31
|
|
32
|
+
include Log
|
33
|
+
|
33
34
|
# A hash name (as in Description#name) -> Backend
|
34
35
|
attr_accessor :backends
|
35
36
|
|
@@ -58,6 +59,21 @@ module CTioga2
|
|
58
59
|
@current = @backends[backend]
|
59
60
|
end
|
60
61
|
|
62
|
+
# Returns the backend named in the 'as' key of options, or the
|
63
|
+
# current backend if there isn't
|
64
|
+
def specified_backend(options = {})
|
65
|
+
if options.key? 'as'
|
66
|
+
k = options['as']
|
67
|
+
if @backends.key? k
|
68
|
+
return @backends[k]
|
69
|
+
else
|
70
|
+
error { "No such backend: #{k}, ignoring" }
|
71
|
+
end
|
72
|
+
else
|
73
|
+
return @current
|
74
|
+
end
|
75
|
+
end
|
76
|
+
|
61
77
|
|
62
78
|
# Sets the (raw) value of the parameter of the given backend
|
63
79
|
def set_backend_parameter_value(backend, param, value)
|
@@ -17,8 +17,6 @@ require 'ctioga2/utils'
|
|
17
17
|
# This module contains all the classes used by ctioga
|
18
18
|
module CTioga2
|
19
19
|
|
20
|
-
Version::register_svn_info('$Revision: 402 $', '$Date: 2013-08-19 17:30:02 +0200 (Mon, 19 Aug 2013) $')
|
21
|
-
|
22
20
|
module Data
|
23
21
|
|
24
22
|
# This class holds one column, possibly with error bars.
|
data/lib/ctioga2/data/dataset.rb
CHANGED
@@ -18,9 +18,6 @@ require 'ctioga2/data/indexed-dtable'
|
|
18
18
|
|
19
19
|
module CTioga2
|
20
20
|
|
21
|
-
Version::register_svn_info('$Revision: 451 $', '$Date: 2013-08-29 01:28:30 +0200 (Thu, 29 Aug 2013) $')
|
22
|
-
|
23
|
-
|
24
21
|
# \todo now, port the backend infrastructure...
|
25
22
|
|
26
23
|
# This module holds all the code that deals with manipulation and
|
@@ -172,6 +169,11 @@ module CTioga2
|
|
172
169
|
return 1 + @ys.size
|
173
170
|
end
|
174
171
|
|
172
|
+
# The number of Z columns
|
173
|
+
def z_columns
|
174
|
+
return @ys.size - 1
|
175
|
+
end
|
176
|
+
|
175
177
|
# Concatenates another Dataset to this one
|
176
178
|
def <<(dataset)
|
177
179
|
if dataset.size != self.size
|
data/lib/ctioga2/data/filters.rb
CHANGED
@@ -19,9 +19,6 @@ require 'ctioga2/data/backends/factory'
|
|
19
19
|
# This module contains all the classes used by ctioga
|
20
20
|
module CTioga2
|
21
21
|
|
22
|
-
Version::register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
|
23
|
-
|
24
|
-
|
25
22
|
module Data
|
26
23
|
|
27
24
|
# A series of commands that can be used as "filters", as they act
|
data/lib/ctioga2/data/point.rb
CHANGED
data/lib/ctioga2/data/stack.rb
CHANGED
@@ -25,9 +25,6 @@ require 'ctioga2/data/filters'
|
|
25
25
|
# This module contains all the classes used by ctioga
|
26
26
|
module CTioga2
|
27
27
|
|
28
|
-
Version::register_svn_info('$Revision: 518 $', '$Date: 2013-09-19 21:43:58 +0200 (Thu, 19 Sep 2013) $')
|
29
|
-
|
30
|
-
|
31
28
|
module Data
|
32
29
|
|
33
30
|
# This is the central class for acquisition and handling of
|
@@ -92,7 +89,7 @@ EOH
|
|
92
89
|
# backend, retrieves corresponding Dataset objects, pushes them
|
93
90
|
# onto the stack and returns them.
|
94
91
|
def get_datasets(set, options = {})
|
95
|
-
backend = @backend_factory.
|
92
|
+
backend = @backend_factory.specified_backend(options)
|
96
93
|
sets = backend.expand_sets(set)
|
97
94
|
datasets = []
|
98
95
|
for s in sets
|
@@ -319,6 +316,7 @@ EOH
|
|
319
316
|
|
320
317
|
LoadDatasetOptions = {
|
321
318
|
'name' => CmdArg.new('text'),
|
319
|
+
'as' => CmdArg.new('text'),
|
322
320
|
'where' => CmdArg.new('text'),
|
323
321
|
'ignore_hooks' => CmdArg.new('boolean')
|
324
322
|
}
|