r2dsvg 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f8dbde8ddcf67adf851218c7d44183f77d16acaffbc6b2f49a5835f564def3
-  data.tar.gz: fdcc4c8e58499e1b8c4682fd1b63ae2e0a7fb4d17917e2a4b84bf171bc5fa24b
+  metadata.gz: f84eb0cfa6361d540477455e70c6450d08822825ca2607c4256c95033f7c55ad
+  data.tar.gz: 64e440caeef0fee2217859010a47658e3aeaead60371f750bcc43533f2a4193e
 SHA512:
-  metadata.gz: 31ea267757c8e9863a2453258e38812c5d2883e0491ddc418749cc7624e58b29b37ca0fae26ae6a41c093b0189918a19b98d2495d9c2ac4a01b68edc52bbdcc2
-  data.tar.gz: 7581ec536727d065b320210ce2fbd9017cf4d959d96ba1a0f64e5b15c7c46ff6b217da15273663498b301e8d937d90dfabab5dbf1738b13ada2dc3104a2820fd
+  metadata.gz: 6ace20dd2b7df657494234fa3802738646a2c228ddd759e5d2aec69e00d6ae87f392ff3c82873fe379426698ef1499939f1b7e7d4a531bd4e576101c0c09a92a
+  data.tar.gz: 30cb870d1f80515cc8c645f3c7b7745d2ad2fdcd858b808aaa5fecd0866caeba49dd6e65bd63708fa78363344f86840e5ea7b9ee476b70bb0aa5c124ad06eb8c

data/lib/r2dsvg.rb

@@ -57,6 +57,43 @@ class R2dSvg
       [:embed_audio, sources, e]
     end    
     
+    def circle(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+
+      h = attributes
+
+      x, y, radius= %i(cx cy r).map{|x| h[x].to_i }
+      fill = h[:fill]
+      
+
+      [:draw_circle, [x, y], radius, fill, style, render_all(e)]
+    end       
+    
+    # not yet implemented
+    #
+    def ellipse(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      h = attributes
+
+      x, y= %i(cx cy).map{|x| h[x].to_i }
+      width = h[:rx].to_i * 2
+      height = h[:ry].to_i * 2
+
+      [:draw_arc, [x, y, width, height], style, render_all(e)]
+    end    
+    
+    def line(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+
+      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| attributes[x].to_i }
+
+      [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
+    end   
+        
+    
     def image(e, attributes, raw_style)
 
       style = style_filter(attributes).merge(raw_style)
@@ -67,6 +104,24 @@ class R2dSvg
 
       [:draw_image, [x, y, width, height], src, style, e, render_all(e)]
     end       
+    
+    def polygon(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      points = attributes[:points].split(/\s+/). \
+                                       map {|x| x.split(/\s*,\s*/).map(&:to_i)}
+
+      [:draw_polygon, points, style, e, render_all(e)]
+    end
+
+    def polyline(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      points = attributes[:points].split(/\s+/). \
+                                       map {|x| x.split(/\s*,\s*/).map(&:to_i)}
+
+      [:draw_lines, points, style, render_all(e)]
+    end      
 
     def rect(e, attributes, raw_style)
 
@@ -128,6 +183,39 @@ class R2dSvg
 
     end
     
+    def draw_arc(args)
+
+      dimensions, style = args
+
+      x, y, width, height = dimensions
+
+      #gc = gc_ini(fill: style[:fill] || :none)
+      #@area.window.draw_arc(gc, 1, x, y, width, height, 0, 64 * 360)
+    end      
+    
+    def draw_circle(args)
+
+      coords, radius, fill, style, e = args
+
+      x1, y1 = coords
+
+      if @debug then
+        puts 'inside draw_circle'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+
+      obj = Circle.new(
+        x: x1, y: y1,
+        radius: radius,
+        sectors: 32,
+        color: style[:fill],
+        z: style[:"z-index"].to_i
+      )
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+
+    end    
+    
     def draw_image(args)
 
       dimensions, src, style, e = args
@@ -154,6 +242,69 @@ class R2dSvg
       end
     end     
     
+    def draw_line(args)
+
+      coords, style, e = args
+
+      x1, y1, x2, y2 = coords
+
+      if @debug then
+        puts 'inside draw_rectangle'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+
+      obj = Line.new(
+        x1: x1, y1: y1,
+        x2: x2, y2: y2,
+        width: style[:"stroke-width"].to_f,
+        color: style[:"stroke"],
+        z: style[:"z-index"].to_i
+      ) 
+      
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+      
+    end    
+    
+    def draw_polygon(args)
+
+      points, style, e = args
+
+      puts ('points: ' + points.inspect).debug if @debug      
+      coords = points
+
+      if @debug then
+        puts 'inside draw_polygon'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+      
+      puts ('coords: ' + coords.inspect).debug if @debug      
+      
+      h = coords.map.with_index do |c2,i|
+
+        %w(x y).zip(c2).map {|key, c| [(key + (i+1).to_s).to_sym, c] }
+        
+      end.flatten(1).to_h
+      puts ('triangle h: ' + h.inspect).debug if @debug      
+
+      puts ('triangle h merged: ' + h.inspect).debug if @debug
+      obj = Triangle.new(h.merge({color: style[:fill], z: style[:"z-index"].to_i}))
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+    end       
+
+
+    # not yet implemented
+    #
+    def draw_lines(args)
+
+      coords, width, style, e = args
+
+      x1, y1, x2, y2 = coords
+
+     
+    end       
+    
     def draw_rectangle(args)
 
       coords, style, e = args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   7avBPtmJXpQsK1kfdmXP/+tfAIa7KGseabm2+ntraqYNgx3DqyZur8IRdJFi/DPc
   113q/9KjkLj6C+dR0HuLRW1c
   -----END CERTIFICATE-----
-date: 2019-02-24 00:00:00.000000000 Z
+date: 2019-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: svgle