gtk2svg 0.3.15 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aebb344b15aad397ada0ee76af5603b0f2123fcc
-  data.tar.gz: 4d32b93c7e71541ca69a461e2af590cce620c987
+SHA256:
+  metadata.gz: 8b5a118c0868c06925d3a913ddc70520252cf750417619386a0861c15a9b18dc
+  data.tar.gz: 767e84933875bebbeaa06ba7e4b46895d5cdcb174b2488d07b1f271feb46f54f
 SHA512:
-  metadata.gz: 8a96c8f6ebd2f0365db719ca704bd9668e696664e10f4d92693ddc1da5c457f59df433f69cc47835b6215de016b72e945128db7f52b2782bd023b5e06ec5f930
-  data.tar.gz: 404061b26b759dab2dc14b8ea692b12414cf5695adc457a470443b5b7f4692f6060e9e9bad0277f22b2c5f1c10e2f441ac87a129e61fc64afba187ce046e7b82
+  metadata.gz: 9aff8130ed2d5422e8f4119f2bc813631fe350a7d29daef0778283f23547e0205111f9a0b546ea55832442a96d5ea2bfa370d1896a31180308de620243b882d8
+  data.tar.gz: ad7e9921a4be4257cff93f79227cb000480a411759efdfce0495356d8562b8e5a020303f7ca0d176f8bcd3bc4da28095dbd288ac979780f6e1c52e7842c7f0c4

data/lib/gtk2svg.rb

@@ -9,130 +9,112 @@ require 'svgle'
 # Description: Experimental gem to render SVG within a GTK2 application. 
 
 
+
 module Gtk2SVG
 
   class Render < DomRender
 
 
-    def circle(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
+    def circle(e, attributes)
 
       h = attributes
 
       x, y= %i(cx cy).map{|x| h[x].to_i }
       radius = h[:r].to_i * 2
 
-      [:draw_arc, [x, y, radius, radius], style, render_all(e)]
+      [:draw_arc, [x, y, radius, radius], attributes, render_all(e)]
     end       
     
-    def ellipse(e, attributes, raw_style)
+    def ellipse(e, attributes)
 
-      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)]
+      [:draw_arc, [x, y, width, height], attributes, render_all(e)]
     end    
     
-    def line(e, attributes, raw_style)
+    def line(e, attributes)
 
-      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)]
+      [:draw_line, [x1, y1, x2, y2], attributes, render_all(e)]
     end   
     
-    def image(e, attributes, raw_style)
+    def image(e, attributes)
 
-      style = style_filter(attributes).merge(raw_style)
       h = attributes
 
       x, y, width, height = %i(x y width height).map{|x| h[x] ? h[x].to_i : nil }
       src = h[:'xlink:href']
 
-      [:draw_image, [x, y, width, height], src, style, render_all(e)]
+      [:draw_image, [x, y, width, height], src, attributes, render_all(e)]
     end    
 
-    def polygon(e, attributes, raw_style)
+    def polygon(e, attributes)
 
-      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)]
+      [:draw_polygon, points, attributes, render_all(e)]
     end
 
-    def polyline(e, attributes, raw_style)
+    def polyline(e, attributes)
 
-      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)]
+      [:draw_lines, points, attributes, render_all(e)]
     end           
 
-    def rect(e, attributes, raw_style)
+    def rect(e, attributes)
 
-      style = style_filter(attributes).merge(raw_style)
+      puts 'inside rect'
       h = attributes
 
       x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
       x2, y2, = x1 + width, y1 + height
 
-      [:draw_rectangle, [x1, y1, x2, y2], style, render_all(e)]
+      [:draw_rectangle, [x1, y1, x2, y2],  attributes, render_all(e)]
     end
     
-    def script(e, attributes, style)
+    def script(e, attributes)
       [:script]
     end        
     
-    def svg(e, attributes, raw_style)
+    def svg(e, attributes)
 
-      style = style_filter(attributes).merge(raw_style)
       
       # jr051216 style[:fill] = style.delete :'background-color'
       h = attributes
       width, height = %i(width height).map{|x| h[x].to_i }
       
-      [:draw_rectangle, [0, 0, width, height], style, render_all(e)]
+      [:draw_rectangle, [0, 0, width, height], attributes, render_all(e)]
     end    
     
-    def text(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      style.merge!({font_size: '20'})
+    def text(e, attributes)
 
       x, y = %i(x y).map{|x| attributes[x].to_i }
 
-      [:draw_layout, [x, y], e.text, style, render_all(e)]
+      [:draw_layout, [x, y], e.text, attributes, 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
 
   class DrawingInstructions
-
+    using ColouredText
+    
     attr_accessor :area
 
 
-    def initialize(area=nil, window=nil)
+    def initialize(area=nil, window=nil, debug: false)
 
-      @area = area
-      @window = window
+      @area, @window, @debug = area, window, debug     
 
     end
     
@@ -153,16 +135,18 @@ module Gtk2SVG
       x, y, width, height = dimensions
 
       gc = gc_ini(fill: style[:fill] || :none)
-      img = GdkPixbuf::Pixbuf.new(file: src)
       
-      x ||= 0
-      y ||= 0
-      width ||= img.width
-      height ||= img.height
+      if File.exists? src then
+        img = GdkPixbuf::Pixbuf.new(file: src)
       
-      @area.window.draw_pixbuf(gc, img, 0, 0, x, y, width, height, 
-                               Gdk::RGB::DITHER_NONE, 0, 0)
-
+        x ||= 0
+        y ||= 0
+        width ||= img.width
+        height ||= img.height
+        
+        @area.window.draw_pixbuf(gc, img, 0, 0, x, y, width, height, 
+                                Gdk::RGB::DITHER_NONE, 0, 0)
+      end
     end      
     
     def draw_line(args)
@@ -201,7 +185,9 @@ module Gtk2SVG
 
     def draw_rectangle(args)
 
-      coords, style = args
+      puts 'inside draw_rectangle' if @debug
+      
+      coords, style, e = args
 
       x1, y1, x2, y2 = coords
 
@@ -229,7 +215,16 @@ module Gtk2SVG
     end
 
     def render(a)
+      
+      if @debug then
+        puts 'inside gtk2svg render '.info 
+        puts 'a: ' + a.inspect
+      end
+      
       method(a[0]).call(args=a[1..2])
+      puts 'after method' if @debug
+      return unless a[3].any?
+      
       draw a[3]
     end
     
@@ -293,15 +288,15 @@ module Gtk2SVG
   end
   
   class Main
-    
+    using ColouredText
     
     attr_accessor :doc, :svg
     attr_reader :width, :height
     
-    def initialize(svg, irb: false)
+    def initialize(svg, irb: false, title: 'window', debug: @debug)
       
-      @svg = svg
-      @doc = Svgle.new(svg, callback: self)
+      @svg, @debug = svg, debug
+      @doc = Svgle.new(svg, callback: self, debug: debug)
 
       @area = area = Gtk::DrawingArea.new
       
@@ -316,7 +311,8 @@ module Gtk2SVG
 
       client_code = []
       
-      window = Gtk::Window.new
+      puts ('title: ' + title.inspect).debug if @debug
+      window = Gtk::Window.new title
       @width, @height = %i(width height).map{|x| @doc.root.attributes[x].to_i }
       
       if @width and @height then
@@ -326,20 +322,17 @@ module Gtk2SVG
       @dirty = true
       
       @doc.root.xpath('//script').each {|x| eval x.text.unescape }
-
-      x1 = 150      
       
       area.signal_connect("expose_event") do      
-        y1 = 30; x2 = 200; y2 = 70
-          area.window.draw_rectangle(area.style.fg_gc(area.state), 1, x1, y1, x2, y2)
+
         if @dirty then
           
           Thread.new { @doc.root.xpath('//script').each {|x| eval x.text.unescape } }
 
-          @instructions = Gtk2SVG::Render.new(@doc).to_a
+          @instructions = Gtk2SVG::Render.new(@doc, debug: debug).to_a
         end
         
-        drawing = DrawingInstructions.new area
+        drawing = DrawingInstructions.new area, debug: debug
         drawing.render @instructions
         @dirty = false
         
@@ -369,19 +362,17 @@ module Gtk2SVG
       
       window.add(area).show_all
 
-      Thread.new do
-        @doc.root.xpath('//*[@onload]').each do |x|
-                    
-          eval x.onload()
-          
-        end
+
+      @doc.root.xpath('//*[@onload]').each do |x|
+                  
+        eval x.onload()
+        
       end
       
       #Thread.new do
       #  3.times { x1 -= 1; @area.queue_draw; sleep 0.1}
       #end
-      sleep 0.01
-      #@area.queue_draw; sleep 0.01
+
       window.show_all.signal_connect("destroy"){Gtk.main_quit}
 
       irb ? Thread.new {Gtk.main  } : Gtk.main
@@ -389,7 +380,10 @@ module Gtk2SVG
     
     def onmousemove(x,y)
       
-    end    
+    end
+
+    def refresh()    
+    end
     
     def svg=(svg)
       @svg = svg
@@ -417,4 +411,4 @@ if __FILE__ == $0 then
 
   app = Gtk2SVG::Main.new svg
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.20
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE2MTIwNTA5NTAzN1oXDTE3MTIwNTA5NTAzN1owSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMt/Q8jwR4DPPfNHkKKuSIelyHmzHnD3uiYwXx4UJaAg02izoHoP3slhRY6s
-  KmiQik/EurFyE3zVz2nm5HcixAz+IoA27NeNxvd+hGNVAggkGDmhuNRxyIiKnQM1
-  vEDLK8NOHAzjOxgQcFEtCaUD+Byg0WHhVrT95LckFYm/0BwoTzo0DQvGQBuDkOvh
-  Om09wmXT4jMNEEYCcYwFEw8Hc5rcuw1br/bS8K/y5S1x3EHB3S6PGBq2BBtWALvW
-  kMgpg8mbvIsSb4l5nzJVH6yaeuYwFnn67zV7vV1f6ga0o7cZPf5rhiSbXmc4ALL0
-  vfhVlYt5fqZ/ZTffx/ptC+aG/ZkCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUt0RvHAKXIf/+47qAypdvsqAQg2kwJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAYdpKS+u6
-  Wc4H9u0bvQPquXmnDl30qVsP0YpsUGC2GaWv1Im+ADSUTM0vwWQxCX6YL7Ki3Rxv
-  Lu4PikgpluAg2JpZQc5Tw/Rnd4Ipv31zpSG5Xxj6aOoiWoomoLmYwLia3IK2rVKB
-  g5Kv217omp8F7FamkfsQORb9QvPOnhRwPu/FwuX+4YYUdlKICUvUEQOaH7Oj4pvG
-  7UT7ELitMqF7HWXByKPyl/2sDvzK22F/lcAk9ZQn36FAzsE2r6yLRBu0B3KSaXyL
-  S+VWAhfVm13yzrA556/5JtfZb/HMd97bm5U2ypMzi+hn2PRRxQ32RY58lYUVpxhE
-  QK5w9QJyQ1G9ag==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODI1MDkyMzE5WhcN
+  MjEwODI1MDkyMzE5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZipRF
+  PddOhSJWjA5AU0enpeQuWI33p2Vxr5nzmqFw1v8L9et4dEfwf8jrvGQCFKVrLkOF
+  V16DPS7aB4CRyqysrT3Wcx7PRcAcU8PM/60x5VjlHkOoIGyDBS19FeEXSxnCL37P
+  qpN3IR32F3MnhQgi/Q75MGeT7EdG1QF0hfnUSvdWcfhMu85RppIrfMx8KBXNoOya
+  9rmsFHLiGZMvkCVQ/slMRTPy2FdZi9+KbkvoEll4wZgw5CyYDTlW/eu43bg2+5uZ
+  hZYkPajmyP31OfXXoITEuZBuwShJBvXh3hr4pRJ/WZEwbCzQxV7GnW8nS0+cVv9i
+  HVsUrX/J47s1vZsCVBOaExiAfO2fJv67DR99PzK2fKcvPw5YmLWoBm6yaMNQ361p
+  usLtsag3TqrqIsG8rOY6QZactnoFGtW9bSFqXOqaO4FKbwgCcdTJELte9XX4mMvJ
+  Epal/e/KUDQFTKIB367qZ5lG7I8SvQrI87PkQ0LShHf80/QSpEqcgf2A4zUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5/XXpoSY
+  0jQsP2JR2vU5b7uMJhYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAj4Dp4hBFi30D7gviksCLr+eMB3XD+YiZ9kbMi3P3
+  WJXH9gkELeKX9kzMRJDgZ3fJNcpAt3dT7pMKNGLfMhzXr4S0K9oNIfmq+5y4eUQ3
+  /eZnDrhLdLN0CfLaT1taKTbnh98wroE44fvW34KOzHEhPx4IL3Bd5jxuztqJRaZW
+  NsUP3kOGU/DUK+0/r96bPELVaXYq8AFuQGK13Z/Cr2tM3uX6bLj+tmKx0zOHRBBf
+  8YSz4LRUsv2LMkhdxyQKXEmIgsu9EE1DPu0Jf6DNOsbm/pFQmJ04V5AIoEixNjeZ
+  /0gRFIHa6KaTLBTDlD56Vp/KxVAKa4lpIgJd8meNWibAl3URscgQTcKOUpKU0YSU
+  +tP3l68P25LjOVqb36q+te45SjB8ATohHZ2kCFc4e5jDB+HX1lwYKqDLTfSd/cuh
+  5C/ULWUz63TixmnPQiXfUV5DTAb+U7xkR+IoF9PZXNzriqakqL6/kvguqZSDiG5K
+  C+3upURGHZLC1bs5uIZirvk+
   -----END CERTIFICATE-----
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -39,20 +43,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.7
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: dom_render
   requirement: !ruby/object:Gem::Requirement
@@ -62,7 +66,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +76,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: svgle
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +86,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +96,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.4
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -119,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Renders SVG using GTK2