xrvg 0.0.6 → 0.0.7

data/CHANGES

@@ -1,5 +1,17 @@
 = CHANGES
 
+== 0.0.8 (2008.08.26) (Future)
+- INCOMPATIBLE modifs: 
+   - Array is no longer SAMPLABLE => you must remplace "[].geo(5.0).samples" by "SyncS[].geo( 5.0 )"
+     this has been done to avoid conflicts between Array and Samplation interface, namely .rand method, 
+                           but also to clean semantic of the operation
+                           and to be able to upgrade SyncS operations (with .split operator,...)
+== 0.0.7 (2008.08.24) (New)
+=== Content
+- Add color services (hsv, hsl, ...)
+- Add intersection services (Beta for the moment, must be consolidated)
+- .random has again its "notsorted" behavior: if you want random to sort its results, you can use .random(:sort, true)
+
 == 0.0.6 (2008.03.24)
 === Content
 - Add Spiral classes
@@ -7,7 +19,6 @@
 - refactor Ondulation bezier builder
 - WARNING: random() filter now always sort its result => Shuffle filter is created. Moreover, .rand method is now only on Random, and not in Samplable interface (due to overloading Array method when using sort_by {rand, which is no good)
 
-
 == 0.0.5 (2008.03.22)
 === Content
 - Add GeoVariety classes

data/Rakefile

@@ -1,3 +1,8 @@
+# To publish project:
+# - without doc: prepare-release
+# - with doc   : publish
+# It is better to do first operation alone, to check if everything is OK, then to do publish
+
 # Rakefile
 require "rake/testtask"
 require "rake/clean"
@@ -63,7 +68,7 @@ RDOC_FILES = FileList["README", "CHANGES"]
 
 # Ruby library code.
 LIB_DIR = "lib"
-PRE_LIB_FILES = FileList["trace.rb", "samplation.rb", "interpolation.rb", "parametriclength.rb", "utils.rb", "geometry2D.rb",  "color.rb", "frame.rb", "shape.rb", "render.rb", "shape.rb", "style.rb", "bezier.rb", "bezierspline.rb", "fitting.rb", "bezierbuilders.rb", "beziermotifs.rb", "beziertools.rb", "interbezier.rb", "geovariety.rb", "spiral.rb", "xrvg.rb"]
+PRE_LIB_FILES = FileList["trace.rb", "samplation.rb", "interpolation.rb", "parametriclength.rb", "utils.rb", "geometry2D.rb", "intersection.rb",  "color.rb", "frame.rb", "shape.rb", "render.rb", "shape.rb", "style.rb", "bezier.rb", "bezierspline.rb", "fitting.rb", "bezierbuilders.rb", "beziermotifs.rb", "beziertools.rb", "interbezier.rb", "geovariety.rb", "spiral.rb", "xrvg.rb"]
 LIB_FILES = FileList["#{LIB_DIR}/*.rb"]
 
 # Example code.
@@ -204,8 +209,8 @@ end
 desc "Regenerate website"
 task "gen-website" do
   Rake::Task["clobber"].invoke
-  # Rake::Task["muse"].invoke
-  # Rake::Task["examples"].invoke
+  Rake::Task["muse"].invoke
+  Rake::Task["examples"].invoke
   Rake::Task["rdoc"].invoke
   Rake::Task["finish"].invoke
 end
@@ -217,7 +222,7 @@ task "publish-website" do
   # sh "scp -r #{WEBSITE_DIR}/* " +
   #  "#{RUBYFORGE_USER}@rubyforge.org:#{rubyforge_path}",
   #  :verbose => true
-  # Commented because must be triggered explictely as very long: Rake::Task["gen-website"].invoke
+  Rake::Task["gen-website"].invoke
   Rake::Task["upload-website"].invoke
 end
 
@@ -306,6 +311,9 @@ desc "Copy example source files to create ./examples directory"
 task "examples" => ["muse"] do
   remove_dir EXAMPLE_DIR
   mkdir EXAMPLE_DIR
+  if File.exist?("#{WEBSITE_DIR}/images")
+     remove_dir "#{WEBSITE_DIR}/images"
+  end
   mkdir "#{WEBSITE_DIR}/images"
   require 'www/example_list'
   example_list.each do |fn|
@@ -316,10 +324,24 @@ task "examples" => ["muse"] do
     png = String.new(fn)
     png["\.rb"] = ".png"
     cp( fn, EXAMPLE_DIR )
-    sh "ruby #{fn}"
-    if File.exist?(svg)
-      sh "ruby svg2png.rb #{svg} 2.0"
-      cp( png, WEBSITE_DIR_IMAGES )
+
+    togenerate = true
+    if File.exist?(png)
+      if File.mtime(png) > File.mtime(source)
+        puts "no need to generate #{fn} ..."
+	togenerate = false
+      end
+    end
+
+    if togenerate
+      sh "ruby #{fn}"
+      if File.exist?(svg)
+         sh "ruby svg2png.rb #{svg} 2.0"
+      end
+    end
+
+    if File.exist?(png)
+       cp( png, WEBSITE_DIR_IMAGES )
     end
   end
 end

data/lib/samplation.rb

@@ -348,6 +348,7 @@ class RandomFilter < Filter
   include Attributable
   attribute :mindiff, 0.0
   attribute :sort, false
+  attribute :withboundaries, false
 
   # make sampling by trying to check :mindiff constraint
   # 
@@ -413,6 +414,10 @@ class RandomFilter < Filter
 	result = result.shuffle
       end
     end
+    if self.withboundaries
+      result[0] = inputs[0]
+      result[-1] = inputs[-1]
+    end
     return result
   end
 end
@@ -503,8 +508,11 @@ class Roller
 
   # TODO : must be generalized
   def rand()  #:nodoc:
-    index = (0.0..@items.size).rand.to_i
-    return @items[index]
+    return @items.choice
+  end
+
+  def next()
+    return transform( 0.0 )
   end
 end
 

data/lib/trace.rb

@@ -25,6 +25,7 @@ end
 def Trace(string)
   if Trace.active?
     puts string
+    STDOUT.flush
   end
 end
 end

data/lib/utils.rb

@@ -59,7 +59,8 @@ class Range
   #  (1.0..2.0).complement( 1.3 ) => 1.7
   def complement( value )
     diff = value - self.begin
-    return (self.end - diff)
+    result = (self.end - diff)
+    return result
   end
 
   # utilitary method to force value to be in range
@@ -320,6 +321,28 @@ class Array
     return self[Kernel::rand(self.size)]
   end
 
+  # return an array with same elements as self, but rotated
+  def rotate(sens=:right)
+    result = []
+    if sens == :right
+      result = [self[-1]] + self[0..-2]
+    else
+      result = self[1..-1] + [self[0]]
+    end
+    return result
+  end
+
+  # generate every rotation for the array, with as first element self
+  def rotations(sens=:right)
+    result = [self]
+    current = self
+    (self.size-1).times do 
+      result << current.rotate(sens)
+      current = result[-1]
+    end
+    return result
+  end
+
   # compute range of an array by returning (min..max)
   #   [1.0, 3.0, 2.0].range => (1.0..3.0) 
   # if proc supplied, use it to return range of subvalues

data/test/test_color.rb

@@ -43,25 +43,27 @@ class ColorTest < Test::Unit::TestCase
     black = Color[0.0, 0.0, 0.0, 1.0]
     white = Color[1.0, 1.0, 1.0, 1.0]
     red   = Color[1.0, 0.0, 0.0, 1.0]
-    assert_equal( black, Color.hsv( 0.0, 0.0, 0.0, 1.0 ) )
-    assert_equal( white, Color.hsv( 0.0, 0.0, 1.0, 1.0 ) )
-    assert_equal( red,   Color.hsv( 0.0, 1.0, 1.0, 1.0 ) )
-    assert_equal( black, Color.hsv( 0.2, 1.0, 0.0, 1.0 ) )
-    assert_equal( black, Color.hsv( 0.4, 1.0, 0.0, 1.0 ) )
-    assert_equal( black, Color.hsv( 0.6, 1.0, 0.0, 1.0 ) )
-    assert_equal( black, Color.hsv( 0.8, 1.0, 0.0, 1.0 ) )
-    assert_equal( black, Color.hsv( 1.0, 1.0, 0.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 0.0, 0.0, 0.0, 1.0 ) )
+    assert_equal( white, Color.hsva( 0.0, 0.0, 1.0, 1.0 ) )
+    assert_equal( red,   Color.hsva( 0.0, 1.0, 1.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 0.2, 1.0, 0.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 0.4, 1.0, 0.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 0.6, 1.0, 0.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 0.8, 1.0, 0.0, 1.0 ) )
+    assert_equal( black, Color.hsva( 1.0, 1.0, 0.0, 1.0 ) )
+    assert_equal( [0.0, 0.0, 0.0, 1.0], black.hsva )
   end
 
   def test_hsl
     black = Color[0.0, 0.0, 0.0, 1.0]
     white = Color[1.0, 1.0, 1.0, 1.0]
     red   = Color[1.0, 0.0, 0.0, 1.0]
-    assert_equal( black, Color.hsl( 0.0, 0.0, 0.0, 1.0 ) )
-    assert_equal( white, Color.hsl( 0.0, 0.0, 1.0, 1.0 ) )
-    assert_equal( white, Color.hsl( 0.0, 1.0, 1.0, 1.0 ) )
-    assert_equal( white, Color.hsl( 2.0, 1.0, 1.0, 1.0 ) )
-    assert_equal( white, Color.hsl( 0.6, 1.0, 1.0, 1.0 ) )
+    assert_equal( black, Color.hsla( 0.0, 0.0, 0.0, 1.0 ) )
+    assert_equal( white, Color.hsla( 0.0, 0.0, 1.0, 1.0 ) )
+    assert_equal( white, Color.hsla( 0.0, 1.0, 1.0, 1.0 ) )
+    assert_equal( white, Color.hsla( 2.0, 1.0, 1.0, 1.0 ) )
+    assert_equal( white, Color.hsla( 0.6, 1.0, 1.0, 1.0 ) )
+    assert_equal( [0.0, 0.0, 0.0, 1.0], black.hsla )
   end
 
 
@@ -86,6 +88,10 @@ class ColorTest < Test::Unit::TestCase
     assert_equal( [25,25,25,25], Color[0.1,0.1,0.1,0.1].format255 )
   end
 
+  def test_complement
+    assert_equal( Color[ 0.0, 1.0, 1.0, 0.5], Color.red(0.5).complement )
+  end
+
   def test_operators
     assert_equal( Color[0.2, 0.4, 0.6, 1.0], Color[0.1, 0.2, 0.3, 0.5 ] + Color[0.1, 0.2, 0.3, 0.5 ] )
     assert_equal( Color[0.2, 0.4, 0.6, 1.0], Color[0.1, 0.2, 0.3, 0.5 ] * 2.0 )

data/test/test_utils.rb

@@ -130,6 +130,16 @@ class ArrayTest < Test::Unit::TestCase
     assert_equal( 0.0, [0.0,0.0,0.0].choice )
   end
 
+  def test_rotate
+    assert_equal( [3,1,2], [1,2,3].rotate(:right) )
+    assert_equal( [2,3,1], [1,2,3].rotate(:left) )
+  end
+  
+  def test_rotations
+    assert_equal( [[1,2,3],[2,3,1],[3,1,2]], [1,2,3].rotations(:left) )
+    assert_equal( [[1,2,3],[3,1,2],[2,3,1]], [1,2,3].rotations(:right) )
+  end
+
   def test_shuffle
     assert_not_equal( [0.0, 0.1, 0.2, 0.5, 1.0], [0.0,0.1, 0.2, 0.5,1.0].shuffle )
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: xrvg
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
-date: 2008-08-06 00:00:00 +02:00
+  version: 0.0.7
+date: 2008-08-24 00:00:00 +02:00
 summary: Ruby vector graphics library
 require_paths: 
 - lib
@@ -31,27 +31,12 @@ authors:
 files: 
 - Rakefile
 - LICENCE
-- lib/bezier.rb
-- lib/bezierbuilders.rb
-- lib/beziermotifs.rb
-- lib/bezierspline.rb
-- lib/beziertools.rb
-- lib/color.rb
-- lib/fitting.rb
-- lib/frame.rb
 - lib/geometry2D.rb
-- lib/geovariety.rb
-- lib/interbezier.rb
 - lib/interpolation.rb
 - lib/parametriclength.rb
-- lib/render.rb
 - lib/samplation.rb
-- lib/shape.rb
-- lib/spiral.rb
-- lib/style.rb
 - lib/trace.rb
 - lib/utils.rb
-- lib/xrvg.rb
 - examples/arciterate1.rb
 - examples/arcrecurse1.rb
 - examples/arcrecurse2.rb