ctioga2 0.1 → 0.2

data/Changelog

@@ -1,3 +1,11 @@
+ctioga2 (0.2)
+
+  * Fix small details in the legend positioning in the 'outside' scheme
+  * And added tests to ensure everything now looks (almost) fine
+  * Fixed a few bugs with legends inside regions and gradients
+
+ -- Vincent Fourmond <vincent.fourmond@9online.fr>  Tue Feb 22 21:15:13 CET 2011
+
 ctioga2 (0.1)
 
   * Setting any set now resets its index

data/lib/ctioga2/graphics/elements.rb

@@ -15,6 +15,7 @@
 require 'ctioga2/graphics/types'
 require 'ctioga2/graphics/elements/element'
 require 'ctioga2/graphics/elements/containers'
+require 'ctioga2/graphics/elements/redirecting-container'
 require 'ctioga2/graphics/elements/subplot'
 require 'ctioga2/graphics/elements/region'
 require 'ctioga2/graphics/elements/gradient-region'
@@ -28,7 +29,7 @@ require 'ctioga2/graphics/elements/contour'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 187 $', '$Date: 2010-11-07 11:02:25 +0100 (Sun, 07 Nov 2010) $')
+  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 159 $', '$Date: 2010-07-26 17:29:47 +0200 (Mon, 26 Jul 2010) $')
+  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 
@@ -31,7 +31,7 @@ module CTioga2
       #
       # Like Region It is a fake container in the sense that all the
       # elements are actually forwarded to the parent.
-      class GradientRegion < Container
+      class GradientRegion < RedirectingContainer
 
         undef :elements
         undef :subframe
@@ -70,11 +70,6 @@ module CTioga2
         def set_from_hash(hash)
         end
 
-        # Redirects to the parent's style
-        def style(*a)
-          return parent.style(*a)
-        end
-
         protected 
 
         # Simply sets the color of the curves.

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

@@ -20,7 +20,7 @@ require 'Dobjects/Function'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 229 $', '$Date: 2011-01-17 17:34:57 +0100 (Mon, 17 Jan 2011) $')
+  Version::register_svn_info('$Revision: 284 $', '$Date: 2011-02-13 17:23:43 +0100 (Sun, 13 Feb 2011) $')
 
   module Graphics
 
@@ -31,9 +31,16 @@ module CTioga2
       # transparency, marker scale, marker type (discrete), possibly
       # stroke and fill colors ?
       #
-      # @todo What would be interesting here would be to have indexed
-      # plots, ie draw one curve for each value of Z, with a color
-      # indexed by Z.
+      # @todo Find a mechanism to really say what varies. Ideally, one
+      # would want to say:
+      # * Y2 is marker color
+      # * Y3 is marker size
+      # * Y4 only takes discrete values and represents markers
+      # 
+      # However, this is complex enough to be left out of the curve
+      # factory, I think. Color maps can be used for colors, but for
+      # the rest, things will have to be implemented as parameters to
+      # the curve generator, or even separated commands.
       class Parametric2D  < TiogaElement
 
         include Log

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

@@ -0,0 +1,52 @@
+# containers.rb: drawables that contains other drawables
+# copyright (c) 2011 by Vincent Fourmond
+  
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+  
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details (in the COPYING file).
+
+
+require 'ctioga2/utils'
+require 'ctioga2/log'
+
+module CTioga2
+
+  Version::register_svn_info('$Revision$', '$Date$')
+
+  module Graphics
+
+    module Elements
+
+      # A Container that redirect most of its trafic to the parents.
+      class RedirectingContainer < Container
+
+        ###########################################
+        # The following functions are plain redirections to the
+        # parent.
+        #
+        # \todo a scheme should probably be designed to allow simple
+        # 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
+
+      end
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 139 $', '$Date: 2010-01-22 00:12:17 +0100 (Fri, 22 Jan 2010) $')
+  Version::register_svn_info('$Revision: 288 $', '$Date: 2011-02-22 21:12:58 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 
@@ -26,7 +26,7 @@ module CTioga2
       # A Region is an object that draws filled regions among its
       # "elements". It is a fake container in the sense that all the
       # elements are actually forwarded to the parent.
-      class Region < Container
+      class Region < RedirectingContainer
 
         undef :elements
         undef :subframe
@@ -74,11 +74,6 @@ module CTioga2
           @reversed_fill_style.set_from_hash(hash, 'reversed_%s')
         end
 
-        # Redirects to the parent's style
-        def style(*a)
-          return parent.style(*a)
-        end
-
         protected 
 
         # Creates the appropriate subfigure and draws all its elements

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

@@ -16,7 +16,7 @@ require 'ctioga2/log'
 
 module CTioga2
 
-  Version::register_svn_info('$Revision: 196 $', '$Date: 2010-11-25 20:15:32 +0100 (Thu, 25 Nov 2010) $')
+  Version::register_svn_info('$Revision: 285 $', '$Date: 2011-02-22 21:12:47 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 
@@ -26,6 +26,13 @@ module CTioga2
       # * inclusion of curves
       # * legends
       # * a way to set/get its figure boundaries.
+      #
+      # @todo It would be interesting to feature several layers:
+      # background/normal/foreground, that could be addressed just
+      # using options to drawing commands
+      #
+      # @todo It would also be interesting to offer the possibility to
+      # output non-clipped objects.
       class Subplot < Container
 
         # Various stylistic aspects of the plot, as a

data/lib/ctioga2/graphics/legends/area.rb

@@ -16,7 +16,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: 285 $', '$Date: 2011-02-22 21:12:47 +0100 (Tue, 22 Feb 2011) $')
 
   module Graphics
 
@@ -86,10 +86,10 @@ module CTioga2
 
             # We make figure coordinates frame coordinates
             t.set_bounds([0, 1, 1, 0])
-            # \todo customize this !
+            ## \todo customize this !
             x, y = initial_xy(t, container)
             for item in items
-              # \todo transform the 0.0 for x into a negative
+              ## \todo transform the 0.0 for x into a negative
               # user-specifiable stuff.
               item.draw(t, @legend_style, x , y)
               y -= @legend_style.dy.to_figure(t,:y)
@@ -145,9 +145,6 @@ module CTioga2
         #  
         # These arrays can be used as arguments for subframe_margins
         # or respectively the graph and the legends part of the plot.
-        #
-        # This function will *eventually* also work in the case of a
-        # #legend_type :inside?
         def partition_frame(t, container)
           w,h = size(t, container)
           case @legend_type
@@ -176,14 +173,14 @@ module CTioga2
         def initial_xy(t, container)
           case @legend_type
           when :right
-            l,r,t,b = container.actual_subframe(t).to_frame_margins(t)
+            l,r,top,b = container.actual_subframe(t).to_frame_margins(t)
             # Here, we take profit from the fact that frame
             # coordinates are also figure coordinates within the
             # legend.
 
-            # \todo that won't work in the case of labels on the
+            ## \todo that won't work in the case of labels on the
             # right-hand-side.
-            return [- l/2, 1.0 - t]
+            return [0, 1.0 - top]
           when :inside
             return [0.0, 1.0]
           else

data/lib/ctioga2/utils.rb

@@ -24,7 +24,7 @@ module CTioga2
     # The current version of the program.
     def self.version
       if CTIOGA_VERSION =~ /SVN/
-        return "SVN, revision #{SVN_INFO['revision']}, #{SVN_INFO['date']}"
+        return "SVN, revision #{SVN_INFO['revision']}#{SVN_INFO['suffix']}, #{SVN_INFO['date']}"
       else
         return CTIOGA_VERSION
       end
@@ -34,7 +34,7 @@ module CTioga2
     # arguments and have the Date and Revision svn:keyword:. Use this
     # way:
     #
-    #  Version::register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
+    #  Version::register_svn_info('$Revision: 286 $', '$Date: 2011-02-22 21:12:50 +0100 (Tue, 22 Feb 2011) $')
     #
     # To set the correct properties, the following command-line can be
     # used:
@@ -49,6 +49,10 @@ module CTioga2
           SVN_INFO['revision'] = rev.to_i
           SVN_INFO['date'] = date
         end
+        # Hmmm, we want to see how many revisions is git ahead of SVN
+        if rev_str =~ /(\+git\d+)/
+          SVN_INFO['suffix'] = $1
+        end
       end
     end
 
@@ -65,11 +69,12 @@ module CTioga2
     # Informations collected about subversion revisions
     SVN_INFO = { 
       'revision' => 0,
-      'date' => "old"
+      'date' => "old",
+      'suffix' => ''
     }
 
     # The position of the URL, used for getting the version
-    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.1/lib/ctioga2/utils.rb $'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.2/lib/ctioga2/utils.rb $'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -78,7 +83,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision: 194 $', '$Date: 2010-11-22 10:26:54 +0100 (Mon, 22 Nov 2010) $')
+    register_svn_info('$Revision: 286 $', '$Date: 2011-02-22 21:12:50 +0100 (Tue, 22 Feb 2011) $')
 
   end
 
@@ -137,3 +142,11 @@ module CTioga2
   end
 
 end
+
+begin
+  # This is a dirty hack in order to ensure that the SVN revision
+  # information is kept up-to-date even when using git-svn. This
+  # file is not present in standard installations.
+  require 'ctioga2/git-fools-svn'
+rescue LoadError => e
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ctioga2
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Vincent Fourmond <vincent.fourmond@9online.fr>
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-31 00:00:00 +01:00
+date: 2011-02-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,7 +32,13 @@ dependencies:
         version: "1.13"
   type: :runtime
   version_requirements: *id001
-description: 
+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.
+
 email: vincent.fourmond@9online.fr
 executables: 
 - ctioga2
@@ -102,6 +108,7 @@ files:
 - lib/ctioga2/graphics/types.rb
 - lib/ctioga2/graphics/elements/subplot.rb
 - lib/ctioga2/graphics/elements/parametric2d.rb
+- lib/ctioga2/graphics/elements/redirecting-container.rb
 - lib/ctioga2/graphics/elements/primitive.rb
 - lib/ctioga2/graphics/elements/region.rb
 - lib/ctioga2/graphics/elements/curve2d.rb