wicket 0.0.2 → 0.1.0

data/lib/wicket/commands/c.rb

@@ -0,0 +1,24 @@
+module Wicket
+  module Commands
+    class C < Command
+      ARGS = 6
+      ARG_LIST = [:c1x,:c1y,:c2x,:c2y,:x,:y]
+      include CubicBezier
+
+      def initialize(absolute,cursor_start,subpath,opts,c1x,c1y,c2x,c2y,x,y)
+        @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
+        @c1x = c1x
+        @c1y = c1y
+        @c2x = c2x
+        @c2y = c2y
+        @x = x
+        @y = y
+      end
+
+
+    end
+  end
+end

data/lib/wicket/commands/cubic_bezier.rb

@@ -0,0 +1,20 @@
+module Wicket
+  module Commands
+    module CubicBezier
+      include BezierCurve
+
+      def control_points
+        [cursor_start,c1,c2,cursor_end]
+      end
+
+      def c1
+        @absolute ? Coordinate.new(@c1x,@c1y) : @cursor_start.absolutize(@c1x,@c1y)
+      end
+
+      def c2
+        @absolute ? Coordinate.new(@c2x,@c2y) : @cursor_start.absolutize(@c2x,@c2y)
+      end
+
+    end
+  end
+end

data/lib/wicket/commands/h.rb

@@ -1,29 +1,25 @@
 module Wicket
   module Commands
     class H < Command
+      ARGS = 1
+      ARG_LIST = [:x]
 
-      def self.arg_count
-        1
-      end
-
-      def initialize(absolute,cursor_start,x)
+      def initialize(absolute,cursor_start,subpath,opts,x)
         @absolute = absolute
         @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
         @x = x
       end
 
-      def coordinates
-        {:x => @x, :y => cursor_start[:y]}
+      def absolute_y
+        @cursor_start.y
       end
 
-      def cursor_end
-        if @absolute
-          coordinates
-        else
-          {:x => (@cursor_start[:x] + @x), :y => @cursor_start[:y]}
-        end
+      def to_svg(opts={})
+        o = @opts.merge(opts)
+        "H #{Utilities.format(absolute_x,o)}"
       end
-
     end
   end
 end

data/lib/wicket/commands/l.rb

@@ -1,28 +1,16 @@
 module Wicket
   module Commands
     class L < Command
+      ARGS = 2
+      ARG_LIST = [:x,:y]
 
-      def self.arg_count
-        2
-      end
-
-      def initialize(absolute,cursor_start,x,y)
+      def initialize(absolute,cursor_start,subpath,opts,x,y)
         @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
         @x = x
         @y = y
-        @cursor_start = cursor_start
-      end
-
-      def coordinates
-        {:x => @x, :y => @y}
-      end
-
-      def cursor_end
-        if @absolute
-          coordinates
-        else
-          {:x => (@cursor_start[:x] + @x), :y => (@cursor_start[:y] + @y)}
-        end
       end
 
     end

data/lib/wicket/commands/m.rb

@@ -1,28 +1,16 @@
 module Wicket
   module Commands
     class M < Command
+      ARGS = 2
+      ARG_LIST = [:x,:y]
 
-      def self.arg_count
-        2
-      end
-
-      def initialize(absolute,cursor_start,x,y)
+      def initialize(absolute,cursor_start,subpath,opts,x,y)
         @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
         @x = x
         @y = y
-        @cursor_start = cursor_start
-      end
-
-      def coordinates
-        {:x => @x, :y => @y}
-      end
-
-      def cursor_end
-        if @absolute
-          coordinates
-        else
-          {:x => (@cursor_start[:x] + @x), :y => (@cursor_start[:y] + @y)}
-        end
       end
 
     end

data/lib/wicket/commands/q.rb

@@ -0,0 +1,21 @@
+module Wicket
+  module Commands
+    class Q < Command
+      ARGS = 4
+      ARG_LIST = [:c1x,:c1y,:x,:y]
+      include QuadraticBezier
+      
+      def initialize(absolute,cursor_start,subpath,opts,c1x,c1y,x,y)
+        @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
+        @c1x = c1x
+        @c1y = c1y
+        @x = x
+        @y = y
+      end
+
+    end
+  end
+end

data/lib/wicket/commands/quadratic_bezier.rb

@@ -0,0 +1,15 @@
+module Wicket
+  module Commands
+    module QuadraticBezier
+      include BezierCurve
+
+      def control_points
+        [cursor_start,c1,cursor_end]
+      end
+
+      def c1
+        @absolute ? Coordinate.new(@c1x,@c1y) : @cursor_start.absolutize(@c1x,@c1y)
+      end
+    end
+  end
+end

data/lib/wicket/commands/s.rb

@@ -0,0 +1,37 @@
+module Wicket
+  module Commands
+    class S < Command
+      ARGS = 4
+      include CubicBezier
+      ARG_LIST = [:c2x,:c2y,:x,:y]
+
+      def initialize(absolute,cursor_start,subpath,opts,c2x,c2y,x,y)
+        @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
+        set_implicit_control_point!
+        @c2x = c2x
+        @c2y = c2y
+        @x = x
+        @y = y
+      end
+
+      private
+
+        # > The first control point is assumed to be the reflection of the second
+        # > control point on the previous command relative to the current point.
+        # > (If there is no previous command or if the previous command was not an
+        # > C, c, S or s, assume the first control point is coincident with the 
+        # > current point.)
+        # > http://www.w3.org/TR/SVG11/paths.html#PathDataCubicBezierCommands
+        def implied_c1
+          last = @subpath.last_command
+          case last 
+          when C,S then @cursor_start.reflect(last.c2)
+          else @cursor_start
+          end 
+        end
+    end
+  end
+end

data/lib/wicket/commands/t.rb

@@ -0,0 +1,34 @@
+module Wicket
+  module Commands
+    class T < Command
+      ARGS = 2
+      include QuadraticBezier
+      ARG_LIST = [:x,:y]
+
+      def initialize(absolute,cursor_start,subpath,opts,x,y)        
+        @absolute = absolute
+        @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
+        set_implicit_control_point!
+        @x = x
+        @y = y
+      end
+
+      private
+
+        # > The control point is assumed to be the reflection of the control point on
+        # > the previous command relative to the current point. (If there is no previous
+        # > command or if the previous command was not a Q, q, T or t, assume the control
+        # > point is coincident with the current point.)
+        # > http://www.w3.org/TR/SVG11/paths.html#PathDataQuadraticBezierCommands
+        def implied_c1
+          last = @subpath.last_command
+          case last
+          when Q,T then @cursor_start.reflect(last.c1)
+          else @cursor_start
+          end
+        end
+    end
+  end
+end

data/lib/wicket/commands/v.rb

@@ -1,27 +1,24 @@
 module Wicket
   module Commands
     class V < Command
+      ARGS = 1
+      ARG_LIST = [:y]
 
-      def self.arg_count
-        1
-      end
-
-      def initialize(absolute,cursor_start,y)
+      def initialize(absolute,cursor_start,subpath,opts,y)
         @absolute = absolute
         @cursor_start = cursor_start
+        @subpath = subpath
+        @opts = opts
         @y = y
       end
 
-      def coordinates
-        {:x => cursor_start[:x], :y => @y}
+      def absolute_x
+        cursor_start.x
       end
 
-      def cursor_end
-        if @absolute
-          coordinates
-        else
-          {:x => @cursor_start[:x], :y => (@cursor_start[:y] + @y)}
-        end
+      def to_svg(opts={})
+        o = @opts.merge(opts)
+        "V #{Utilities.format(absolute_y,o)}"
       end
 
     end

data/lib/wicket/commands/z.rb

@@ -1,22 +1,22 @@
 module Wicket
   module Commands
     class Z < Command
+      ARGS = 1
+      ARG_LIST = []
 
-      def self.arg_count
-        1
-      end
-
-      def initialize(absolute,cursor_start)
+      def initialize(absolute,cursor_start,subpath,opts)
         @cursor_start = cursor_start
-      end
-
-      def coordinates
-        {}
+        @subpath = subpath
+        @opts = opts
       end
 
       def cursor_end
         @subpath.first_command.cursor_end
       end
+
+      def to_svg(opts={})
+        "Z"
+      end
     end
   end
 end 

data/lib/wicket/configuration.rb

@@ -0,0 +1,26 @@
+module Wicket
+  class Configuration
+    SETTINGS = [
+      :min_angle,
+      :min_angle_unit
+    ]
+    attr_accessor *SETTINGS
+
+    def initialize
+      @min_angle = 165
+    end
+
+    def merge(*opts)
+      opts.each_with_object(to_h) do |opts,aggregate|
+        aggregate.merge!(opts)
+      end
+    end
+
+    private
+
+      def to_h
+        SETTINGS.each_with_object({}){|s,h| h.merge!(s => send(s)) }
+      end
+
+  end
+end

data/lib/wicket/coordinate.rb

@@ -0,0 +1,21 @@
+module Wicket
+  class Coordinate < Struct.new(:x,:y)
+    include Cartesian
+
+    # method for a reference point to create absolute coords from
+    # relative measures.
+    def absolutize(delta_x,delta_y)
+      self.class.new(x + delta_x , y + delta_y)
+    end
+
+    def relativize(remote)
+      [remote.x - x, remote.y - y]
+    end
+
+    def reflect(remote)
+      x,y = relativize(remote)
+      absolutize(-x,-y)
+    end
+
+  end
+end

data/lib/wicket/subpath.rb

@@ -7,9 +7,9 @@ module Wicket
 
     def add_command(*new_commands)
       new_commands.each do |c|
-        c.subpath = self
         @commands << c
       end
+      self
     end
 
     def cursor_end
@@ -22,8 +22,8 @@ module Wicket
       @commands.last.class == Commands::Z
     end
 
-    def to_polygon
-      vertices = commands.map(&:to_wkt).join(",")
+    def to_polygon(opts)
+      vertices = commands.map{|c| c.to_wkt(opts) }.join(",")
       "((#{vertices}))"
     end
 
@@ -34,5 +34,9 @@ module Wicket
     def first_command
       @commands.first
     end
+
+    def to_svg(opts={})
+      @commands.map{|c| c.to_svg(opts) }.join(" ")
+    end
   end
 end

data/lib/wicket/subpoint.rb

@@ -0,0 +1,39 @@
+module Wicket
+  class Subpoint < Struct.new(:x,:y,:t,:siblings)
+    include Cartesian
+
+    def self.from_coordinate(coordinate,t,siblings)
+      new(coordinate.x,coordinate.y,t,siblings)
+    end
+
+    def initialize(x,y,t,siblings)
+      super(x,y,t,siblings)
+      siblings << self
+    end
+
+    def previous_neighbor
+      siblings.select{|s| s.t < t }.max_by(&:t)
+    end
+
+    def next_neighbor
+      siblings.select{|s| s.t > t }.min_by(&:t)
+    end
+
+    def angle
+      evaluate_angle(previous_neighbor,self,next_neighbor) unless endpoint?
+    end
+
+    def endpoint?
+      t == 0 || t == 1
+    end
+
+    # This method evaluates the angle at p2 in radians (180 deg = pi)
+    def evaluate_angle(p1,p2,p3)
+      a = p2.distance_to(p1)
+      b = p2.distance_to(p3)
+      c = p1.distance_to(p3)
+      Math.acos((a**2 + b**2 - c**2)/(2 * a * b))
+    end
+
+  end
+end