gtk2svg 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5abbaefcd35af7fee0cbae1165a33c33d196aa5
-  data.tar.gz: b816bb276df43b7d5534efe3c221171f5771c708
+  metadata.gz: f0fe558967f563d8d4f111a47f1c6437c13d369a
+  data.tar.gz: f0004931e1cac3e8fa85098dcfcaa4c05fbd0f40
 SHA512:
-  metadata.gz: 4f446664fdbd10a7aa62e55b82bfba59ee1f69153410838af99afcf6036f8d9f1d1c67ea053720e3b3eefd0996dcd6300240185b695f2f59710abc3491eca4f6
-  data.tar.gz: 5b8787216f1152cd675d8dd4422291a9a719abc4e1b95d09bc31d43162cc2758165ceb1d41375af7034f089e9792e89bb5350fe96427cc4c6ce679467e3d2353
+  metadata.gz: 285349e48fb22a23d68cd8f7d2e56a072778d9d6ce6dceddfbd81ee67cc20e19e4b9bb81f3b7810438c53e33d4fdbcafb0c88e644e65edf9e5192ffd8273d909
+  data.tar.gz: bec7350106552e774b66486d708c744fa136167862c50371fad7adf68925e763e38c9f9940b0853579017ad047f84059a57aa120b13641bb41c4c83ab194c6cf

data/lib/gtk2svg.rb

@@ -9,12 +9,15 @@ require 'svgle'
 # Description: Experimental gem to render SVG within an GTK2 application. 
 
 
+
 module Gtk2SVG
 
   class Render < DomRender
 
 
-    def circle(e, attributes, style)
+    def circle(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
 
       h = attributes
 
@@ -24,8 +27,9 @@ module Gtk2SVG
       [:draw_arc, [x, y, radius, radius], style, render_all(e)]
     end       
     
-    def ellipse(e, attributes, style)
+    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 }
@@ -35,33 +39,36 @@ module Gtk2SVG
       [:draw_arc, [x, y, width, height], style, render_all(e)]
     end    
     
-    def line(e, attributes, style)
+    def line(e, attributes, raw_style)
 
-      style[:stroke_width] = style.delete(:'stroke-width') || '3'
+      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 polygon(e, attributes, style)
+    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, render_all(e)]
     end
 
-    def polyline(e, attributes, style)
+    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_polyline, points, style, render_all(e)]
+      [:draw_lines, points, style, render_all(e)]
     end           
 
-    def rect(e, attributes, style)
+    def rect(e, attributes, raw_style)
 
+      style = style_filter(attributes).merge(raw_style)
       h = attributes
 
       x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
@@ -78,15 +85,25 @@ module Gtk2SVG
       [:window, render_all(x)]
     end    
     
-    def text(e, attributes, style)
+    def text(e, attributes, raw_style)
 
+      style = style_filter(attributes).merge(raw_style)
       style.merge!({font_size: '20'})
 
-      x, y, fill = %i(x y fill).map{|x| attributes[x] }
-      style.merge!({fill: fill})
+      x, y = %i(x y).map{|x| attributes[x].to_i }
 
-      [:draw_layout, [x.to_i, y.to_i], e.text, style, render_all(e)]
+      [:draw_layout, [x, y], e.text, style, render_all(e)]
     end    
+    
+    private
+    
+    def style_filter(attributes)
+      
+      %i(stroke stroke-width fill).inject({}) do |r,x|
+        attributes.has_key?(x) ? r.merge(x => attributes[x]) : r          
+      end
+      
+    end
 
   end
 
@@ -132,11 +149,9 @@ module Gtk2SVG
       @area.window.draw_polygon(gc, 1, points)
     end       
     
-    def draw_polyline(args)
-      puts 'inside sraw_polying;'
-      points, style = args
-      puts 'style: '  + style.inspect
+    def draw_lines(args)
 
+      points, style = args
 
       gc = gc_ini(fill: style[:fill] || :none, stroke: style[:stroke] || :none)
       gc.set_line_attributes(style[:'stroke-width'].to_i, Gdk::GC::LINE_SOLID, \
@@ -224,7 +239,6 @@ module Gtk2SVG
     def gc_ini(fill: nil, stroke: nil)
       gc = Gdk::GC.new(@area.window)
       colour = fill || stroke
-      puts 'colur : ' + colour.inspect
 
       unless colour == :none or colour == 'none'
         gc.set_foreground(set_colour(colour)) 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - James Robertson