ctioga2 0.4 → 0.5

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: 354 $', '$Date: 2012-12-25 23:39:59 +0100 (Tue, 25 Dec 2012) $')
+    #  Version::register_svn_info('$Revision: 424 $', '$Date: 2013-08-23 10:16:34 +0200 (Fri, 23 Aug 2013) $')
     #
     # 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.4/lib/ctioga2/utils.rb $'
+    SVN_URL = '$HeadURL: svn+ssh://rubyforge.org/var/svn/ctioga2/releases/ctioga2-0.5/lib/ctioga2/utils.rb $'
     
     # The version of ctioga2
     CTIOGA_VERSION = if SVN_URL =~ /releases\/ctioga2-([^\/]+)/
@@ -83,7 +83,7 @@ module CTioga2
                        "SVN version"
                      end
 
-    register_svn_info('$Revision: 354 $', '$Date: 2012-12-25 23:39:59 +0100 (Tue, 25 Dec 2012) $')
+    register_svn_info('$Revision: 424 $', '$Date: 2013-08-23 10:16:34 +0200 (Fri, 23 Aug 2013) $')
 
   end
 
@@ -161,6 +161,30 @@ module CTioga2
       end
       return formula
     end
+
+    NaturalSubdivisions = [1.0, 2.0, 5.0, 10.0]
+
+    # Returns the closest element of the correct power of ten of
+    # NaturalSubdivisions above or below the given number
+    def self.closest_subdivision(x, below = true)
+      fact = 10**(Math.log10(x).floor)
+
+      normed_x = x/fact
+      (NaturalSubdivisions.size()-1).times do |i|
+        if normed_x == NaturalSubdivisions[i]
+          return x
+        end
+        if (normed_x > NaturalSubdivisions[i]) && 
+            (normed_x < NaturalSubdivisions[i+1])
+          if below
+            return NaturalSubdivisions[i]*fact
+          else
+            return NaturalSubdivisions[i+1]*fact
+          end
+        end
+      end
+      raise "Should not reach this !"
+    end
     
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ctioga2
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-29 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tioga
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.16'
 description: ! 'ctioga2 is a command-driven plotting program that produces
 
   high quality PDF files. It can be used both from the command-line
@@ -75,6 +75,7 @@ files:
 - lib/ctioga2/commands/variables.rb
 - lib/ctioga2/commands/parsers/file.rb
 - lib/ctioga2/commands/parsers/command-line.rb
+- lib/ctioga2/commands/parsers/old-file.rb
 - lib/ctioga2/commands/context.rb
 - lib/ctioga2/commands/groups.rb
 - lib/ctioga2/commands/interpreter.rb
@@ -96,6 +97,7 @@ files:
 - lib/ctioga2/graphics/styles/base.rb
 - lib/ctioga2/graphics/styles/sets.rb
 - lib/ctioga2/graphics/styles/plot.rb
+- lib/ctioga2/graphics/styles/contour.rb
 - lib/ctioga2/graphics/styles/colormap.rb
 - lib/ctioga2/graphics/styles/texts.rb
 - lib/ctioga2/graphics/styles/legend.rb
@@ -105,6 +107,7 @@ files:
 - lib/ctioga2/graphics/legends/area.rb
 - lib/ctioga2/graphics/legends/items.rb
 - lib/ctioga2/graphics/legends/storage.rb
+- lib/ctioga2/graphics/legends/multicols.rb
 - lib/ctioga2/graphics/legends/provider.rb
 - lib/ctioga2/graphics/types.rb
 - lib/ctioga2/graphics/elements/subplot.rb
@@ -115,6 +118,7 @@ files:
 - lib/ctioga2/graphics/elements/curve2d.rb
 - lib/ctioga2/graphics/elements/containers.rb
 - lib/ctioga2/graphics/elements/tangent.rb
+- lib/ctioga2/graphics/elements/xyz-contour.rb
 - lib/ctioga2/graphics/elements/xyz-map.rb
 - lib/ctioga2/graphics/elements/contour.rb
 - lib/ctioga2/graphics/elements/gradient-region.rb