ctioga2 0.10 → 0.10.1

data/Changelog

@@ -1,3 +1,10 @@
+ctioga2 (0.10.1)
+
+  * Fix problems with Ruby1.8
+  * Fix clipping of regions
+
+ -- Vincent <vincent.fourmond@9online.fr>  Wed 26 Mar 22:13:47 CET 2014
+
 ctioga2 (0.10)
 
   * A draw-image function to include JPEG and PNG images

data/bin/ct2-make-movie

@@ -139,6 +139,8 @@ encoders = [ EncodingJob.new ]
 cur_enc = encoders.first
 
 
+ct2_extra_args = []
+
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: #$0 [options] file.ct2 arguments..."
 
@@ -197,6 +199,20 @@ opts = OptionParser.new do |opts|
   end
 
 
+  opts.on("", "--ctioga2-args ARGS", "Extra args for ctioga2") do |v|
+    ct2_extra_args += Shellwords.split(v)
+  end
+
+  opts.on("-s", "--set EXPR", "Sets the given variable") do |t|
+    l = t.split(/\s*=\s*/, 2)
+    if l.size != 2
+      puts "The argument of --set must be in the form 'variable=value'"
+      exit 1
+    end
+    ct2_extra_args += ['--set', *l]
+  end
+
+
 end
 
 opts.parse!(ARGV)
@@ -260,6 +276,7 @@ for f in args
   name = format % index
 
   ct2_cmdline = [ct2, 
+                 *ct2_extra_args,
                  "--set", "arg", f, 
                  "--set", "index", "#{index}", 
                 "-f", file, "--name", name, "-r", ct2_page_size]

data/lib/ctioga2/graphics/elements/primitive.rb

@@ -114,7 +114,7 @@ module CTioga2
           
           # Now, create the command
           cmd_args = comp.map do |x|
-            if x.respond_to?(:type)
+            if x.is_a? CmdArg
               x
             else
               CmdArg.new(x)
@@ -123,7 +123,7 @@ module CTioga2
 
           cmd_opts = {}
           for k,v in opts
-            cmd_opts[k] = if v.respond_to?(:type)
+            cmd_opts[k] = if v.is_a? CmdArg
                             v
                           else
                             CmdArg.new(v)

data/lib/ctioga2/graphics/elements/redirecting-container.rb

@@ -15,6 +15,8 @@
 require 'ctioga2/utils'
 require 'ctioga2/log'
 
+require 'forwardable'
+
 module CTioga2
 
   module Graphics
@@ -24,6 +26,8 @@ module CTioga2
       # A Container that redirect most of its trafic to the parents.
       class RedirectingContainer < Container
 
+        extend Forwardable
+
         ###########################################
         # The following functions are plain redirections to the
         # parent.
@@ -32,27 +36,10 @@ module CTioga2
         # redirection in the form of an accessor. Using forwardable
         # should do
 
-        def style(*a)
-          return parent.style(*a)
-        end
-
-        def add_legend_item(item)
-          return parent.add_legend_item(item)
-        end
-
-        def legend_area=(l)
-          return parent.legend_area = l
-        end
-
         undef :gp_cache, :gp_cache=
-        
-        def gp_cache
-          return parent.gp_cache
-        end
 
-        def gp_cache=(c)
-          return parent.gp_cache = c
-        end
+        def_delegators :parent, :style, :add_legend_item, :legend_area=, 
+                                 :gp_cache, :gp_cache=, :set_user_boundaries
 
         def each_item(leaf_only = true, recursive = false, tl = true, &blk)
           if tl

data/lib/ctioga2/graphics/elements/region.rb

@@ -41,6 +41,7 @@ module CTioga2
         # Creates a new empty region
         def initialize(parent = nil, root = nil)
           @parent = parent
+          @clipped = true       # clipped by default !
           
           # elements to be given to tioga
           @curves = []
@@ -85,7 +86,7 @@ module CTioga2
         def real_do(t)
           # This function will be called with the proper figure
           # coordinates.
-          
+
           if @fill_style.color
             t.context do
               @fill_style.setup_fill(t)

data/lib/ctioga2/graphics/elements/tangent.rb

@@ -85,7 +85,8 @@ module CTioga2
           style = Styles::StyleSheet.style_for(Styles::ArrowStyle ,st_name)
           style.set_from_hash(options)
 
-          style.draw_arrow(t, *options['tail'], *options['head'])
+          coords = options['tail'] + options['head']
+          style.draw_arrow(t, *coords)
         end
       end
 

data/lib/ctioga2/graphics/styles/image.rb

@@ -66,7 +66,7 @@ EOD
           dict = info.dup
           dict.merge!('ul' => ul,
                       'll' => ll,
-                      'lr' => lr,)
+                      'lr' => lr)
           
           # @todo provide a way to reuse images ?
           t.context do

data/lib/ctioga2/version.rb

@@ -2,7 +2,7 @@
 module CTioga2
 
   module Version
-GIT_VERSION = '0.10'
-GIT_DATE = 'Sun 16 Mar 18:22:35 CET 2014'
+GIT_VERSION = '0.10.1'
+GIT_DATE = 'Wed 26 Mar 22:14:59 CET 2014'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.10'
+  version: 0.10.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga