glimmer-dsl-swt 4.18.5.4 → 4.18.6.3

data/lib/glimmer/swt/custom/shape/path_segment.rb

@@ -0,0 +1,135 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/custom/shape'
+
+module Glimmer
+  module SWT
+    module Custom
+      class Shape
+        # Represents path segments like point, line, quad, and cubic curves
+        # Shapes could mix in
+        module PathSegment
+          def root_path
+            current_parent = parent
+            until current_parent.class == Path && !current_parent.parent.is_a?(Path)
+              current_parent = current_parent.parent
+              return current_parent if current_parent.nil?
+            end
+            current_parent
+          end
+          def path
+            current_parent = parent
+            until current_parent.class == Path
+              current_parent = current_parent.parent
+              return current_parent if current_parent.nil?
+            end
+            current_parent
+          end
+          # this is needed to indicate if a shape is part of a path or not (e.g. line and point could be either)
+          def part_of_path?
+            !!root_path
+          end
+          # Subclasses must override and implement to indicate method name to invoke on SWT Path object to add segment
+          def path_segment_method_name
+            nil
+          end
+          # Subclasses must override and implement to indicate args to pass when invoking SWT Path object method
+          def path_segment_args
+            []
+          end
+          # Subclasses must override to indicate expected complete count of args when previous point is NOT connected (e.g. 4 for line, 6 for quad, 8 for cubic)
+          def default_path_segment_arg_count
+          end
+          # Subclasses must override to indicate expected count of args when previous point IS connected (e.g. 2 for line, 4 for quad, 6 for cubic)
+          def default_connected_path_segment_arg_count
+          end
+          # Subclasses may override to provide name of method to invoke for geometry object obtained from the Java AWT library java.awt.geom.Path2D.Double (e.g. curveTo vs cubicTo)
+          def path_segment_geometry_method_name
+            path_segment_method_name
+          end
+          # Subclasses must override and implement to indicate args to pass when invoking SWT Path object method
+          def path_segment_geometry_args
+            path_segment_args
+          end
+          # Subclasses must override to indicate otherwise
+          def previous_point_connected?
+            true
+          end
+          
+          def dispose(redraw: true)
+            Glimmer::SWT::DisplayProxy.instance.auto_exec do
+              # including classes could override to dispose of resources first
+              # afterwards, parent removes from its path segments with post_dispose_content
+              parent.post_dispose_content(self) if parent.is_a?(Path)
+              if part_of_path?
+                drawable.redraw if redraw && !drawable.is_a?(ImageProxy)
+              else
+                super(redraw: redraw)
+              end
+            end
+          end
+          
+          def first_path_segment?
+            parent.path_segments.first == self
+          end
+          
+          def previous_path_segment
+            parent.path_segments[parent.path_segments.index(self) - 1] || self
+          end
+          
+          def add_to_swt_path(swt_path)
+            the_path_segment_args = path_segment_args.dup
+            if !is_a?(Point) && self.class != Path
+              if !previous_point_connected?
+                if the_path_segment_args.count == default_path_segment_arg_count
+                  point = the_path_segment_args.shift, the_path_segment_args.shift
+                  swt_path.moveTo(*point)
+                elsif first_path_segment?
+                  point = the_path_segment_args[0..1]
+                  swt_path.moveTo(*point)
+                end
+              end
+            end
+            swt_path.send(path_segment_method_name, *the_path_segment_args)
+          end
+          
+          def add_to_geometry(geometry)
+            the_path_segment_geometry_args = path_segment_geometry_args.dup
+            if !is_a?(Point) && self.class != Path
+              if !previous_point_connected?
+                if the_path_segment_geometry_args.count == default_path_segment_arg_count
+                  point = the_path_segment_geometry_args.shift, the_path_segment_geometry_args.shift
+                  geometry.moveTo(point[0], point[1])
+                elsif first_path_segment?
+                  point = the_path_segment_geometry_args[0..1]
+                  geometry.moveTo(point[0], point[1])
+                end
+              end
+            end
+            geometry.send(path_segment_geometry_method_name, *the_path_segment_geometry_args)
+          end
+                  
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/custom/shape/point.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/custom/shape/path_segment'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/color_proxy'
@@ -33,6 +34,8 @@ module Glimmer
       # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
       class Shape
         class Point < Shape
+          include PathSegment
+          
           def parameter_names
             [:x, :y]
           end
@@ -50,6 +53,36 @@ module Glimmer
             x.to_i.between?(self.absolute_x.to_i - 2, self.absolute_x.to_i + 2) && y.to_i.between?(self.absolute_y.to_i - 2, self.absolute_y.to_i + 2)
           end
           alias contain? include?
+          
+          def path_segment_method_name
+            'addRectangle'
+          end
+                    
+          def path_segment_args
+            @args + [1, 1]
+          end
+          
+          def path_segment_geometry_method_name
+            'moveTo'
+          end
+                    
+          def path_segment_geometry_args
+            @args
+          end
+          
+          def previous_point_connected?
+            false
+          end
+          
+          def eql?(other)
+            other.is_a?(Point) && x == (other && other.respond_to?(:x) && other.x) && y == (other && other.respond_to?(:y) && other.y)
+          end
+          alias == eql?
+          
+          def hash
+            [x, y].hash
+          end
+          
         end
       end
     end

data/lib/glimmer/swt/custom/shape/polygon.rb

@@ -132,21 +132,30 @@ module Glimmer
           end
           
           def width
-            bounds.width
+            size.x
           end
           
           def height
-            bounds.height
+            size.y
           end
           
-          def include?(x, y)
+          def contain?(x, y)
             geometry.contains(x, y)
           end
-          alias contain? include? # TODO make include do an outer/inner check of edge detection only
-          
+
+          def include?(x, y)
+            comparison_lines = absolute_point_xy_array.zip(absolute_point_xy_array.rotate(1))
+            comparison_lines.any? {|line| Line.include?(line.first.first, line.first.last, line.last.first, line.last.last, x, y)}
+          end
+                    
           def move_by(x_delta, y_delta)
             self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
           end
+          
+          def irregular?
+            true
+          end
+          
         end
       end
     end

data/lib/glimmer/swt/custom/shape/polyline.rb

@@ -134,6 +134,11 @@ module Glimmer
           def move_by(x_delta, y_delta)
             self.point_array = point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
           end
+          
+          def irregular?
+            true
+          end
+          
         end
       end
     end

data/lib/glimmer/swt/custom/shape/quad.rb

@@ -0,0 +1,114 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/custom/shape'
+require 'glimmer/swt/custom/shape/path'
+require 'glimmer/swt/custom/shape/path_segment'
+require 'glimmer/swt/swt_proxy'
+require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/color_proxy'
+require 'glimmer/swt/font_proxy'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module SWT
+    module Custom
+      # Represents a shape (graphics) to be drawn on a control/widget/canvas/display
+      # That is because Shape is drawn on a parent as graphics and doesn't have an SWT widget for itself
+      class Shape
+        class Quad < Path
+          def parameter_names
+            [:point_array]
+          end
+          
+          def geometry
+            the_point_array = point_array
+            if the_point_array != @geometry_point_array
+              @geometry_point_array = the_point_array
+              @geometry = Java::JavaAwtGeom::Path2D::Double.new
+              add_to_geometry(@geometry)
+            end
+            @geometry
+          end
+        
+          def contain?(x, y)
+            include?(x, y, filled: true)
+          end
+        
+          # checks if drawn or filled rectangle includes the point denoted by x and y (if drawn, it only returns true if point lies on the edge)
+          def include?(x, y, filled: nil)
+            filled = filled? if filled.nil?
+            makeshift_gc = org.eclipse.swt.graphics.GC.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
+            swt_path = org.eclipse.swt.graphics.Path.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
+            the_path_segment_args = path_segment_args.dup
+            if previous_point_connected?
+              the_previous_path_segment = previous_path_segment
+              swt_path.moveTo(the_previous_path_segment.x, the_previous_path_segment.y)
+            else
+              swt_path.moveTo(the_path_segment_args.shift, the_path_segment_args.shift)
+            end
+            swt_path.quadTo(*the_path_segment_args)
+            swt_path.contains(x.to_f, y.to_f, makeshift_gc, !filled)
+          ensure
+            swt_path.dispose
+          end
+            
+          def move_by(x_delta, y_delta)
+            the_point_array = @args.compact
+            the_point_array = the_point_array.first if the_point_array.first.is_a?(Array)
+            self.point_array = the_point_array.each_with_index.map {|coordinate, i| i.even? ? coordinate + x_delta : coordinate + y_delta}
+          end
+                              
+          def path_segment_method_name
+            'quadTo'
+          end
+          
+          def path_segment_args
+            # TODO make args auto-infer control points if previous_point_connected is true or if there is only a point_array with 1 point
+            @args
+          end
+          
+          def default_path_segment_arg_count
+            6
+          end
+          
+          def default_connected_path_segment_arg_count
+            4
+          end
+          
+          def previous_point_connected?
+            @args.compact.count == 4 && !first_path_segment?
+          end
+          
+          def eql?(other)
+            other.is_a?(Quad) && point_array == (other && other.respond_to?(:point_array) && other.point_array)
+          end
+          alias == eql?
+          
+          def hash
+            point_array.hash
+          end
+                    
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/dialog_proxy.rb

@@ -52,6 +52,10 @@ module Glimmer
         def dialog_class(keyword)
           the_class = eval(keyword.camelcase(:upper))
           the_class if the_class.ancestors.include?(org.eclipse.swt.widgets.Dialog)
+        rescue => e
+          Glimmer::Config.logger.debug {"Dialog for keyword #{keyword} not found!"}
+          Glimmer::Config.logger.debug { e.full_message }
+          nil
         end
       end
 

data/lib/glimmer/swt/proxy_properties.rb

@@ -73,7 +73,7 @@ module Glimmer
         Glimmer::SWT::DisplayProxy.instance.auto_exec do
           result = if proxy_source_object&.respond_to?(attribute_setter(attribute_name))
             swt_widget_operation = true
-            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless proxy_source_object&.send(attribute_getter(attribute_name)) == args.first
+            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless (proxy_source_object&.respond_to?(attribute_getter(attribute_name)) && proxy_source_object&.send(attribute_getter(attribute_name))) == args.first
           elsif proxy_source_object&.respond_to?(ruby_attribute_setter(attribute_name))
             swt_widget_operation = true
             proxy_source_object&.send(ruby_attribute_setter(attribute_name), args)

data/lib/glimmer/swt/tab_folder_proxy.rb

@@ -0,0 +1,52 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.TabProxy
+    #
+    # Follows the Proxy Design Pattern
+    class TabFolderProxy < WidgetProxy
+      def initialize(underscored_widget_name, parent, args, swt_widget: nil)
+        @initialize_tabs_on_select = args.delete(:initialize_tabs_on_select)
+        super
+      end
+      
+      def post_add_content
+        shown = false
+        unless @initialize_tabs_on_select
+          @show_listener = parent_proxy.on_swt_show do
+            unless shown
+              shown = true
+              self.items.to_a.each do |item|
+                self.selection = item
+              end
+              self.selection = self.items.first unless self.items.first.nil?
+              @show_listener.deregister
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/mandelbrot_fractal.rb

@@ -379,7 +379,7 @@ class MandelbrotFractal
       image @mandelbrot_image
     }
     @canvas.set_size @mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height
-    @scrolled_composite.swt_widget.set_min_size(Point.new(@mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height))
+    @scrolled_composite.set_min_size(Point.new(@mandelbrot_image.bounds.width, @mandelbrot_image.bounds.height))
     if @location_x && @location_y
       # center on mouse click location
       factor = (zoom / last_zoom)

data/samples/elaborate/stock_ticker.rb

@@ -0,0 +1,214 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'glimmer-dsl-swt'
+
+# This Sample is an Early Alpha (New Canvas Path DSL Feature)
+
+class StockTicker
+  class Stock
+    class << self
+      attr_writer :price_min, :price_max
+      
+      def price_min
+        @price_min ||= 1
+      end
+      
+      def price_max
+        @price_max ||= 600
+      end
+    end
+    
+    attr_reader :name, :prices
+    attr_accessor :price
+    
+    def initialize(name, price)
+      @name = name
+      @price = price
+      @prices = [@price]
+      @delta_sign = 1
+      start_new_trend!
+    end
+    
+    def tick!
+      @tick_count = @tick_count.to_i + 1
+      delta = @tick_count%@trend_length
+      if delta == 0
+        @delta_sign *= -1
+        start_new_trend!
+      end
+      prices << self.price = [[@price + @delta_sign*delta, Stock.price_min].max, Stock.price_max].min
+    end
+    
+    def start_new_trend!
+      @trend_length = (rand*12).to_i + 1
+    end
+  end
+  
+  include Glimmer::UI::CustomShell
+  
+  before_body {
+    @stocks = [
+      Stock.new('DELL', 81),
+      Stock.new('AAPL', 121),
+      Stock.new('MSFT', 232),
+      Stock.new('ADBE', 459),
+    ]
+    @stock_colors = [:red, :dark_green, :blue, :dark_magenta]
+    margin = 5
+    @tabs = ['Lines', 'Quadratic Bezier Curves', 'Cubic Bezier Curves', 'Points'].map {|title| {title: title, stock_paths: []}}
+    @stocks.each_with_index do |stock, stock_index|
+      observe(stock, :price) do |new_price|
+        begin
+          @tabs.each do |tab|
+            new_x = stock.prices.count - 1
+            new_y = @tabs.first[:canvas].bounds.height - new_price - 1
+            if new_x > 0
+              case tab[:title]
+              when 'Cubic Bezier Curves'
+                if new_x%3 == 0 && stock.prices[new_x] && stock.prices[new_x - 1] && stock.prices[new_x - 2]
+                  tab[:stock_paths][stock_index].content {
+                    cubic(new_x - 2 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 2] - 1, new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
+                  }
+                end
+              when 'Quadratic Bezier Curves'
+                if new_x%2 == 0 && stock.prices[new_x] && stock.prices[new_x - 1]
+                  tab[:stock_paths][stock_index].content {
+                    quad(new_x - 1 + margin, @tabs.first[:canvas].bounds.height - stock.prices[new_x - 1] - 1, new_x + margin, new_y)
+                  }
+                end
+              when 'Lines'
+                tab[:stock_paths][stock_index].content {
+                  line(new_x + margin, new_y)
+                }
+              when 'Points'
+                tab[:stock_paths][stock_index].content {
+                  point(new_x + margin, new_y)
+                }
+              end
+              new_x_location = new_x + 2*margin
+              canvas_width = tab[:canvas].bounds.width
+              if new_x_location > canvas_width
+                tab[:canvas].set_size(new_x_location, @tabs.first[:canvas].bounds.height)
+                tab[:canvas].cursor = :hand
+                tab[:scrolled_composite].set_min_size(new_x_location, @tabs.first[:canvas].bounds.height)
+                tab[:scrolled_composite].set_origin(tab[:scrolled_composite].origin.x + 1, tab[:scrolled_composite].origin.y) if (tab[:scrolled_composite].origin.x + tab[:scrolled_composite].client_area.width) == canvas_width
+              end
+            else
+              tab[:canvas_header].content {
+                text(stock.name, 15, new_y - 10) {
+                  foreground @stock_colors[stock_index]
+                  font height: 14
+                }
+              }
+            end
+          end
+        rescue => e
+          Glimmer::Config.logger.error {e.full_message}
+        end
+      end
+    end
+  }
+  
+  after_body {
+    @thread = Thread.new {
+      loop {
+        @stocks.each(&:tick!)
+        sleep(0.01)
+      }
+    }
+  }
+  
+  body {
+    shell {
+      fill_layout {
+        margin_width 15
+        margin_height 15
+      }
+      text 'Stock Ticker'
+      minimum_size 650, 650
+      background :white
+      @tab_folder = tab_folder {
+        @tabs.each do |tab|
+          tab_item {
+            grid_layout(2, false) {
+              margin_width 0
+              margin_height 0
+            }
+            text tab[:title]
+            
+            tab[:canvas_header] = canvas {
+              layout_data(:center, :fill, false, true)
+            }
+            tab[:scrolled_composite] = scrolled_composite {
+              layout_data :fill, :fill, true, true
+              tab[:canvas] = canvas {
+                background :white
+                
+                @stocks.count.times do |stock_index|
+                  tab[:stock_paths][stock_index] = path {
+                    antialias :on
+                    foreground @stock_colors[stock_index]
+                  }
+                end
+                
+                on_mouse_down {
+                  @drag_detected = false
+                }
+                
+                on_drag_detected { |drag_detect_event|
+                  @drag_detected = true
+                  @drag_start_x = drag_detect_event.x
+                  @drag_start_y = drag_detect_event.y
+                }
+                
+                on_mouse_move { |mouse_event|
+                  if @drag_detected
+                    origin = tab[:scrolled_composite].origin
+                    new_x = origin.x - (mouse_event.x - @drag_start_x)
+                    new_y = origin.y - (mouse_event.y - @drag_start_y)
+                    tab[:scrolled_composite].set_origin(new_x, new_y)
+                  end
+                }
+                
+                on_mouse_up { |mouse_event|
+                  @drag_detected = false
+                }
+              }
+            }
+          }
+        end
+      }
+    
+      on_swt_show {
+        Stock.price_min = 25
+        Stock.price_max = @tabs.first[:canvas].bounds.height - 6
+      }
+      
+      on_widget_disposed {
+        @thread.kill # safe to kill as data is in memory only
+      }
+    }
+  }
+end
+
+StockTicker.launch
+