xrvg 0.0.3 → 0.0.4

data/lib/parametriclength.rb

@@ -0,0 +1,87 @@
+# File for ParametricLength module
+
+require 'geometry2D'
+
+module XRVG
+# Utilitary module to provide length sampling frrom parameter one
+# 
+# Use pointfromparam method to compute points
+module ParametricLength
+
+  # abstract method to provide range to be sampled to compute samples for length interpolation
+  def parameter_range
+    raise NotImplementedError.new("#{self.class.name}#parameter_range is an abstract method.")
+  end
+
+  def pointfromparameter( parameter, container )
+    raise NotImplementedError.new("#{self.class.name}#pointfromparameter is an abstract method.")
+  end
+
+  ParametricLength::NSAMPLES = 129
+
+  # compute the length of the bezier curve defined by the points
+  #
+  # Algo : 
+  # 
+  # for the moment, just take a fix number of samples, and some it
+  def compute_length_interpolator() #:nodoc:
+    sum = 0.0
+    previous = nil
+    samplelist = [0.0, 0.0]
+    new      = V2D[0.0,0.0]
+    previous = nil
+    self.parameter_range.samples( ParametricLength::NSAMPLES ) do |abs|
+      self.pointfromparameter( abs, new )
+      if previous
+	sum+= (new - previous).r
+	samplelist += [sum, abs]
+      else
+	previous = V2D[0.0,0.0]
+      end
+      previous.x = new.x
+      previous.y = new.y
+    end
+    @length = samplelist[-2]
+
+    length_interpolator = nil
+    if @length == 0.0
+      newsamplelist = [0.0,0.0,0.0,1.0]
+      invsamplelist = [0.0,0.0,1.0,0.0]
+    else
+      newsamplelist = []
+      invsamplelist = []
+      samplelist.foreach do |sum, abs|
+	newsamplelist += [sum / @length, abs ]
+	invsamplelist += [abs, sum / @length ]
+      end
+      samplelist = newsamplelist
+    end
+    @abs_interpolator = InterpolatorQuad.new( :samplelist, invsamplelist )
+    return InterpolatorQuad.new( :samplelist, samplelist )
+  end
+
+  def length_interpolator() #:nodoc:
+    if @length_interpolator == nil
+      @length_interpolator = self.compute_length_interpolator()
+    end
+    return @length_interpolator
+  end
+
+  def length
+    if @length == nil
+      self.compute_length()
+    end
+    return @length
+  end
+
+  def compute_length() #:nodoc:
+    self.length_interpolator()
+    return @length
+  end
+
+  def parameterfromlength( lvalue ) #:nodoc:
+    result = self.length_interpolator.interpolate( lvalue )
+    return result
+  end
+end
+end

data/lib/render.rb

@@ -7,6 +7,7 @@ require 'color'
 require 'attributable'
 require 'style'
 
+module XRVG
 # Render abstract class
 #
 # Is pretty useless for the moment
@@ -79,10 +80,8 @@ class SVGRender < Render
 
   def svg_template #:nodoc:
     return '<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
-  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="%SIZE%" height="%SIZE%" %VIEWBOX% version="1.1"
-     xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg width="%SIZE%" height="%SIZE%" %VIEWBOX% version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     %DEFS%
     %BACKGROUND%
     %CONTENT%
@@ -110,10 +109,6 @@ class SVGRender < Render
     refresh_viewbox( object )
   end
   
-  def adds (objects) #:nodoc:
-    objects.each { |object| add( object )}
-  end
-
   def render (object, style=nil) #:nodoc:
     owidth, oheight = object.size
 
@@ -268,5 +263,5 @@ class SVGRender < Render
     # Kernel.system( "ruby", "svg2png.rb", filename(), "2.0" )
     # Kernel.system( "i_view32", filename().subreplace( ".svg" => ".png" ), "/fs" )
   end
-   
+end
 end

data/lib/samplation.rb

@@ -3,6 +3,7 @@
 # The base module is FloatFunctor, used by Samplable and Splittable
 #
 
+module XRVG
 #
 # Base module to define float lists processing and computation.
 # = Design principle
@@ -26,11 +27,9 @@ module FloatFunctor
   #
   # is private ?
   def addfilter( newfilter )
-    # Trace("Sampler addfilter method self #{self.inspect}")
     if not @subfilter
       @subfilter = newfilter
     else
-      # Trace("Sampler addfilter recurse on subfilter #{@subfilter.inspect}")
       @subfilter.addfilter( newfilter )
     end
     return self
@@ -52,15 +51,13 @@ module FloatFunctor
 
   # hook for Array
   def compute( indata, type, &block )
-    return self.apply( self.modify( indata ), type, &block )
+    return self.apply( self.modify( indata, type ), type, &block )
   end
 
   # hook for rand()
   def process( indata, type, &block )
     if not block
-      outdata    = self.compute( indata, type )
-      # Trace("Samplable#trigger object #{self.inspect} indata #{indata.inspect} outdata #{outdata.inspect}")
-      return outdata
+      return self.compute( indata, type )
     else
       self.compute( indata, type, &block )
     end
@@ -69,18 +66,16 @@ module FloatFunctor
   # recursive method to compose modifications.
   #
   # must not be overloaded
-  def modify( inputs )
-    # Trace("Samplable#modify object #{self.inspect} inputs #{inputs.inspect}")
+  def modify( inputs, type )
     if @subfilter
-      inputs = @subfilter.modify( inputs )
+      inputs = @subfilter.modify( inputs, type )
     end
-    result = self.transforms( inputs )
-    # Trace("Samplable#filter object #{self.inspect} inputs #{inputs.inspect}  result #{result.inspect}")
+    result = self.transforms( inputs, type )
     return result    
   end
   
   # to be overloaded if needed
-  def transforms( inputs )
+  def transforms( inputs, type )
     return inputs.map {|abs| self.transform( abs )}
   end
 
@@ -91,7 +86,6 @@ module FloatFunctor
 
   # default generator method
   def generate( nsamples )
-    # Trace("Samplable#generate object #{self.inspect} nsamples #{nsamples}")
     return (0.0..1.0).generate( nsamples )
   end
 
@@ -114,7 +108,7 @@ module FloatFunctor
   def apply( data, type, &block )
     @applyhash = self.applyhash
     if not @applyhash.key? type
-      Kernel::Raise("FloatFunctor::apply no regsitration for type #{type} and  object #{object.inspect}")
+      Kernel::raise("FloatFunctor::apply no regsitration for type #{type} and  object #{self.inspect}")
     else
       return self.send(@applyhash[type], data, &block )
     end
@@ -139,60 +133,15 @@ module FloatFunctor
     return self.addfilter( SortFilter.new )
   end
 
+  # alternate filter
+  def alternate()
+    return self.addfilter( AlternateFilter.new )
+  end
+  
   # shortcut method to build a sampler from self and a block
   def filter(samplemethod=:sample,&block)
     return Filter.new( self, samplemethod, &block )
   end
-
-
-# -------------------------------------------------------------
-#   old methods to be refactored
-# -------------------------------------------------------------
-
-  # deprecated
-  #
-  # ratios sum must be equal to 1.0
-  def multisamples( nsamples, ratios )
-    ratiosum  = ratios.sum
-    samplesum = nsamples.sum
-    ratios = ratios.map {|ratio| ratio / ratiosum}
-    
-    rratios = ratios
-    index = 0
-    ratios.each do |ratio|
-      rratios[index] = ratio / nsamples[index]
-      index += 1
-    end
-    
-    sum = 0.0
-    samples = [0.0]
-    periodindex = 0
-    while sum <= 1.0
-      sum += rratios[ periodindex ]
-      if sum > 1.0
-	break
-      end
-      samples += [sum]
-      periodindex += 1
-      if periodindex >= rratios.length
-	periodindex = 0.0
-      end 
-    end
-    return self.samples( samples )
-  end
-
-  # deprecated
-  #
-  # TODO : must add gauss parameters
-  def randgauss()
-    begin 
-      x1 = 2.0 * Kernel::rand - 1.0
-      x2 = 2.0 * Kernel::rand - 1.0
-      w  = x1 * x1 + x2 * x2
-    end while w >= 1.0
-    w = Math.sqrt( ( -2.0 * Math.log( w ) ) / w )
-    return 1.0/2.0 * ( 1.0 + x1 * w )
-  end
     
 end
 
@@ -229,7 +178,8 @@ module Samplable
   #
   # is basically .samples([abs]).pop
   def sample( abs )
-    return self.apply( self.modify( [abs] ), :sample ).pop
+    type = :sample
+    return self.apply( self.modify( [abs], type ), type ).pop
   end
 
   # alias for sample( 0.5 )
@@ -255,8 +205,10 @@ module Samplable
     if not block
       return inputs.map {|abs| self.apply_sample( abs ) }
     else
-      container = self.apply_sample( inputs[0] ); yield container;
-      inputs[1..-1].each {|abs| yield self.apply_sample( abs, container ) }
+      if inputs.length > 0
+	container = self.apply_sample( inputs[0] ); yield container;
+	inputs[1..-1].each {|abs| yield self.apply_sample( abs, container ) }
+      end
     end
   end
 
@@ -265,6 +217,19 @@ module Samplable
     return abs
   end
 
+  # method to transform any object into samplable object
+  #
+  # used to add Attribute type :samplable
+  def Samplable.build( value )
+    if value.is_a? Array
+      return Roller[*value]
+    elsif value.is_a? Samplable
+      return value
+    else
+      return Roller[value]
+    end
+  end
+
   # apply_register( :sample, :apply_samples )
 
 end
@@ -290,11 +255,11 @@ module Splittable
     if nsamples.is_a? Integer
       nsamples += 1
       if nsamples < 2
-	Kernel::Raise("Samplable#split method needs at least two data, instead of #{nsamples}")
+	Kernel::raise("Samplable#split method needs at least two data, instead of #{nsamples}")
       end
     else
       if nsamples.size < 2
-	Kernel::Raise("Samplable#split method needs at least two data, instead of #{nsamples.inspect}")
+	Kernel::raise("Samplable#split method needs at least two data, instead of #{nsamples.inspect}")
       end
     end
     return self.trigger( nsamples, :split, &block )
@@ -302,12 +267,18 @@ module Splittable
 
   # must not be overriden
   def split( abs1, abs2 )
-    return self.apply( self.modify( [abs1,abs2] ), :split ).pop
+    type = :split
+    return self.apply( self.modify( [abs1,abs2], type ), type ).pop
   end
 
   # to be overloaded if needed
-  def apply_splits( inputs )
-    return inputs.pairs.map {|t1,t2| self.apply_split( t1, t2 )}
+  def apply_splits( inputs, &block )
+    result = inputs.pairs.map {|t1,t2| self.apply_split( t1, t2 )}
+    if not block
+      return result
+    else
+      result.each {|v| yield v}
+    end
   end
 
   # to be overloaded if needed
@@ -328,11 +299,6 @@ end
 class Filter
 
   include Samplable
-
-  # identity functor
-  def Filter.identity
-    return Filter.new(nil,nil) {|x| x}
-  end
   
   # to define a filter on "object" with method "samplemethod", or with a block (exclusive)
   #
@@ -362,6 +328,7 @@ class Filter
 
 end
 
+
 # RandomFilter class, to resample randomly
 class RandomFilter < Filter
   def initialize(*args)  #:nodoc:
@@ -370,11 +337,13 @@ class RandomFilter < Filter
   def transform(abs)  #:nodoc:
     return (0.0..1.0).rand
   end
-  
-  def transforms( inputs )  #:nodoc:
+
+  def transforms( inputs, type )  #:nodoc:
     result = inputs.map { |v| self.transform( v ) }
-    result[0]  = 0.0
-    result[-1] = 1.0
+    if type == :split
+      result[0]  = 0.0
+      result[-1] = 1.0
+    end
     return result
   end
 end
@@ -384,12 +353,29 @@ class SortFilter < Filter
   def initialize(*args)  #:nodoc:
   end
 
-  def transforms( inputs )  #:nodoc:
+  def transforms( inputs, type )  #:nodoc:
     return inputs.sort
   end
 
 end
 
+# AlternateFilter, to inverse one value per two
+class AlternateFilter < Filter
+  def initialize(range=nil)  #:nodoc:
+    if range 
+      self.addfilter( range )
+    end
+  end
+
+  def transforms( inputs, type )  #:nodoc:
+    result = []
+    inputs.foreach do |v1, v2|
+      result += [v1, -v2]
+    end
+    return result
+  end
+end
+
 # Experimental class to add discrete processing in float processing chains
 #  Roller["white","black"].samples(3) => ["white","black","white"]
 class Roller
@@ -418,5 +404,8 @@ class Roller
     index = (0.0..@items.size).rand.to_i
     return @items[index]
   end
+end
 
+require 'attributable'
+Attribute.addtype( :samplable, Samplable.method("build") )
 end

data/lib/shape.rb

@@ -9,6 +9,7 @@ require 'geometry2D'
 require 'utils'
 require 'attributable'
 
+module XRVG
 # Shape abstract interface
 # = Intro
 # To provide a set of services a shape class must provide
@@ -21,7 +22,7 @@ class Shape
   #
   # not yet used
   def contour( *args )
-    Kernel::raise("Shape::contour must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#contour is an abstract method.")
   end
 
   # must return the svg description of the shape
@@ -30,7 +31,7 @@ class Shape
   #
   # must be defined
   def svg()
-    Kernel::raise("Shape::svg must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#svg is an abstract method.")
   end
   
   # must return the enclosing box of the shape, that is [xmin, ymin, xmax, ymax]
@@ -39,7 +40,7 @@ class Shape
   #
   # must be defined
   def viewbox()
-    Kernel::raise("Shape::viewbox must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#viewbox is an abstract method.")
   end
   
   # compute size of the shape, from viewbox
@@ -48,9 +49,9 @@ class Shape
     return [xmax-xmin, ymax-ymin]
   end
 
-  # must return the enclosing box of the shape, that is [xmin, ymin, xmax, ymax]
+  # return the default style for a Shape instance
   #
-  # abstract
+  # is done on instance, because for Curve for example, strokewidth is proportional to length
   def default_style()
     return Style[:fill, Color.black ]
   end
@@ -67,7 +68,7 @@ end
 
 # Curve abstract interface
 # = Intro
-# To provide a set of services a curve class must provide
+# To define a set of services a curve class must provide
 class Curve < Shape
   # must compute the point at curve abscissa
   #
@@ -75,7 +76,7 @@ class Curve < Shape
   #
   # must be defined
   def point( abscissa, container=nil )
-    Kernel::raise("Curve::point must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#curve is an abstract method.")
   end
 
   # must compute the tangent at curve abscissa
@@ -84,7 +85,7 @@ class Curve < Shape
   #
   # must be defined
   def tangent( abscissa, container=nil )
-    Kernel::raise("Curve::tangent must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#tangent is an abstract method.")
   end
 
   # must compute the acceleration at curve abscissa
@@ -93,7 +94,7 @@ class Curve < Shape
   #
   # must be defined
   def acc( abscissa, container=nil )
-    Kernel::raise("Curve::acc must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#acc is an abstract method.")
   end
 
   # must return the length at abscissa, or total length if abscissa nil
@@ -102,7 +103,7 @@ class Curve < Shape
   #
   # must be defined
   def length(abscissa=nil)
-    Kernel::raise("Curve::length must be redefined in subclasses")
+    raise NotImplementedError.new("#{self.class.name}#length is an abstract method.")
   end
 
   # default style of a curve, as stroked with stroke width 1% of length
@@ -127,7 +128,7 @@ class Curve < Shape
     end
     result = 0.0
     if not self.tangent0_length == 0.0
-      result = (tangent.r - self.tangent0_length)
+      result = (tangent.r / self.tangent0_length)
     end
     return result
   end
@@ -157,7 +158,7 @@ class Curve < Shape
   
   # compute frame vector at abscissa t, that is [curve.point( t ), curve.tangent( t ) ]
   def framev( t )
-    return [curve.point( t ), curve.tangent( t ) ]
+    return [self.point( t ), self.tangent( t ) ]
   end
 
   # compute frame at abscissa t
@@ -212,6 +213,7 @@ class Curve < Shape
 
 end
 
+
 # Line class
 # = Intro
 # Used to draw polylines and polygons
@@ -264,11 +266,13 @@ class Line < Curve
     return container
   end
 
-  # compute line frame at abscissa
-  #  
-  # for the moment, frame rotation is always 0.0, and scale always 1.0
-  def frame (abscissa)
-    return Frame[ :center, self.point( abscissa ), :vector, V2D[ 0.0, 0.0 ], :rotation, 0.0, :scale, 1.0 ]
+  # redefining to discriminate between @points and map.point
+  def points(arg=nil)
+    if not arg
+      return @points
+    else
+      super(arg)
+    end
   end
 
   # compute line tangent at abscissa
@@ -278,6 +282,13 @@ class Line < Curve
     return container
   end
 
+  # acc V2D.O
+  def acc( abscissa, container=nil )
+    container ||= V2D[]
+    container.xy = [0.0,0.0]
+    return container
+  end
+
   # compute viewbox of the line
   #
   # simply call V2D.viewbox on :points
@@ -289,7 +300,7 @@ class Line < Curve
   #
   # return a new line with every point of :points translated
   def translate( v )
-    return Line[ :points, @points.map {|ext| ext.translate( v )} ]
+    return Line[ :points, @points.map {|ext| ext + v } ]
   end
 
   # reverse a line
@@ -365,7 +376,7 @@ class Circle < Curve
   end
 
   def rotate( angle )
-    @initangle += angle
+    return Circle[:center, self.center, :radius, self.radius, :initangle, self.initangle + angle]
   end
   
   # svg description of the circle
@@ -386,14 +397,25 @@ class Circle < Curve
   end
 
   # compute tangent at abscissa
-  #
-  # TODO
-  def tangent( abscissa )
-    TODO
+  def tangent( abscissa, container=nil )
+    angle = Range::Angle.sample( abscissa ) + @initangle
+    container ||=V2D[]
+    container.x = -self.radius * Math.sin( angle )
+    container.y = self.radius * Math.cos( angle )
+    return container
+  end
+
+  # compute acc at abscissa
+  def acc( abscissa, container=nil )
+    angle = Range::Angle.sample( abscissa ) + @initangle
+    container ||=V2D[]
+    container.x = -self.radius * Math.cos( angle )
+    container.y = -self.radius * Math.sin( angle )
+    return container
   end
 
+
   include Samplable
   alias apply_sample point
-
 end
-
+end