gtk2svg 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28a3f4511a21ce303b6e31768b3dc67885dcf014
-  data.tar.gz: a8d8a02c3e6b894e764a6d6b239b61e7e08bc2cb
+  metadata.gz: 7a28f74926618fa9722db12e05476fc6342d2158
+  data.tar.gz: a92730f4716da4152ce4a612a3baab5846efcbea
 SHA512:
-  metadata.gz: f6ca9424567119773389548e48f14a975742473260e2dcb62a97d9fba6f241edfcba57341008acfe29db46fecd1da0b2c689df8ea61714124211ee048bb49965
-  data.tar.gz: 42ac8dcda9c90462ff0048c377887eec0168d19d3b1f66cd366ff4741fd4ca28f9e3595dfcd065a8e5994345debc081f93e68688616e5bd6536bd65228be1b2b
+  metadata.gz: 0b87717bb3a542e397d90eda891d6b7e02b61d79badff3b2c5792b20855b6ec8ddfc705bca9e43608353e2d8b6f8a70eaf5e0b7482180af765e1b6f9e87f3d90
+  data.tar.gz: 954b8c6b99f1e36148d37edc39e75f496eacd42cfc6eb5dd01dae6df6f4154b2790b5f7024dfcd1822e28c2bcb1109ff1a297e80770d0d7c1eb4a3148407f1c2

data/lib/gtk2svg.rb

@@ -9,6 +9,28 @@ require 'dom_render'
 # Description: Experimental gem to render SVG within an GTK2 application. 
 #           Currently it can only render rectangles along with the fill colour.
 
+
+module SVG
+  class Element
+
+    attr_reader :style
+
+    def initialize(attributes, style)
+
+      @h = {x: '0', y: '0'}.merge attributes 
+
+      @style = {fill: 'black'}
+      @style.merge!(style) if attributes[:style]
+
+    end
+
+    def attributes()
+      @h
+    end
+
+  end
+end
+
 module Gtk2SVG
 
   class Render < DomRender
@@ -30,6 +52,18 @@ module Gtk2SVG
 
       [:draw_arc, [x, y, width, height], style, render_all(e)]
     end    
+    
+    def line(e, attributes, style)
+
+      e2 = SVG::Element.new attributes, style
+      h = e2.attributes
+      style = e2.style
+      style[:stroke_width] = style.delete(:'stroke-width') || '3'
+
+      x1, y1, x2, y2 = %i(x y x2 y2).map{|x| h[x].to_i }
+
+      [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
+    end    
 
     def rect(e, attributes, style)
 
@@ -78,6 +112,17 @@ module Gtk2SVG
       gc = gc_ini(fill: style[:fill] || :none)
       @area.window.draw_arc(gc, 1, x, y, width, height, 0, 64 * 360)
     end    
+    
+    def draw_line(args)
+
+      coords, style = args
+
+      x1, y1, x2, y2 = coords
+      gc = gc_ini(stroke: style[:stroke] || :none)
+      gc.set_line_attributes(style[:stroke_width].to_i, Gdk::GC::LINE_SOLID, \
+                                    Gdk::GC::CAP_NOT_LAST, Gdk::GC::JOIN_MITER)
+      @area.window.draw_line(gc, x1, y1, x2, y2)
+    end    
 
     def draw_rectangle(args)
 
@@ -120,11 +165,8 @@ module Gtk2SVG
         x, *remaining = rawx
 
         if x.is_a? Symbol then
-          puts 'sym'
-          puts 'remaining: ' + remaining.inspect
-          method(x).call(args=remaining[0..-2])
+          method(x).call(args=remaining)
         elsif x.is_a? String then
-          puts 'ff'
           draw remaining
         elsif x.is_a? Array
           draw remaining
@@ -155,9 +197,10 @@ module Gtk2SVG
       colour
     end
 
-    def gc_ini(fill: 'black')
+    def gc_ini(fill: nil, stroke: nil)
       gc = Gdk::GC.new(area.window)
-      gc.set_foreground(set_colour(fill)) unless fill == :none
+      colour = fill || stroke
+      gc.set_foreground(set_colour(colour)) unless colour == :none
       gc
     end
 

metadata

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