glimmer-dsl-swt 4.18.6.0 → 4.18.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3fe4c65726425f091b0660bbf4dd4c55543c5c515bed56487aacb7e1458b7e
-  data.tar.gz: 71580957a753685f1eac22fb60ea13c2e2f289bb47017293980d4d06d78d5eec
+  metadata.gz: 6951b42a995fd393c82fcb406f5bb308aacf9330d75b85e0050104451044870c
+  data.tar.gz: 1de171314b2b6da4c80e295152a91697085e8bc7b00502fb0af88aef2890defc
 SHA512:
-  metadata.gz: 974be0abde39dbacdabe5d560c319a049907791e280f03aa6192e945b64057f814cbc57346f51cead9627ee98db52276367f4ca1f8f497b2882846d280a7f103
-  data.tar.gz: 7b9c169a4705c8bfa390ef440e31100e40560eabca4f204d18d8e5197174d9834827fd9f76907384c2d8e3873f968c11b94f6a985c3a43eda0bbf9b8fc7b8bc9
+  metadata.gz: d996c3707e136ec0e059396a3a06d301953236acbde4012f428fdc85dab3e13843296ace25426d41fa6fe7d87031ab5990a40e62a2b572bfbd47b97759575892
+  data.tar.gz: 5c317cdc5e75597d03bf241436cad374cd05e64d4a91739d08945ed2b4a5464807128eb25f23b271a057fdb4dd7b79372eee3c68f6f336a4fd27af8448ce31a9

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+### 4.18.6.1
+
+- Fixed issues with Canvas Path DSL handling of connected vs non-connected path segments (including in geometry calculations)
+- Optimized Canvas Path DSL redraw performance by removing extra redraws
+- Fixed issues in the Hello, Canvas Path! sample and renamed to Stock Ticker
+- Added a new simpler Hello, Canvas Path! sample
+
 ### 4.18.6.0
 
 - Canvas Path DSL support (Alpha) for `path` as drawn or filled (`fill: true`) to the Canvas Shape DSL, supporting `point`, `line` (first point is auto-derived from previous point if not specified)

data/VERSION

@@ -1 +1 @@
-4.18.6.0
+4.18.6.1

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -1956,9 +1956,9 @@ As they say, there are many ways to skin a cat! This is in line with the Ruby wa
 
 ### Canvas Path DSL
 
-**(EARLY ALPHA FEATURE)**
+**(ALPHA FEATURE)**
 
-Unlike common imperative GUI charting toolkits, Glimmer enables declarative rendering of paths with the new Canvas Path DSL (Early Alpha) via the new `path` keyword and by nesting one of the following keywords underneath:
+Unlike common imperative GUI graphing toolkits, Glimmer enables declarative rendering of paths with the new Canvas Path DSL (Early Alpha) via the new `path { }` keyword and by nesting one of the following path segment keywords underneath:
 - `point(x1, y1)`: renders a Point (Dot) as part of a path.
 - `line(x1, y1, x2=nil, y2=nil)`: renders a Line as part of a path. If you drop x2, y2, it joins to the previous point automatically. You may repeat for a series of lines forming a curve.
 - `quad(x1, y1, x2, y2, x3=nil, y3=nil)`: renders a Quadratic Bezier Curve. If you drop x3 and y3, it joins to the previous point automatically.
@@ -1967,8 +1967,10 @@ Unlike common imperative GUI charting toolkits, Glimmer enables declarative rend
 Example:
 
 ```ruby
+include Glimmer
+
 shell {
-  text 'Canvas Path DSL Example'
+  text 'Canvas Path Example'
   minimum_size 300, 300
   
   canvas {
@@ -1984,9 +1986,11 @@ shell {
 }.open
 ```
 
-Learn more at the [Hello, Canvas Path! Sample](/samples/hello/hello_canvas_path.rb).
+![Canvas Path Example](/images/glimmer-example-canvas-path.png)
+
+Learn more at the [Hello, Canvas Path!](GLIMMER_SAMPLES.md#hello-canvas-path) and [Stock Ticker](GLIMMER_SAMPLES.md#stock-ticker) samples.
 
-![Hello Canvas Path Sample](/images/glimmer-hello-canvas-path.gif)
+![Stock Ticker](/images/glimmer-stock-ticker.gif)
 
 ### Canvas Transform DSL
 

data/docs/reference/GLIMMER_SAMPLES.md

@@ -33,6 +33,7 @@
     - [Hello, Canvas!](#hello-canvas)
     - [Hello, Canvas Animation!](#hello-canvas-animation)
     - [Hello, Canvas Transform!](#hello-canvas-transform)
+    - [Hello, Canvas Path!](#hello-canvas-path)
     - [Hello, Cursor!](#hello-cursor)
     - [Hello, Progress Bar!](#hello-progress-bar)
     - [Hello, Tree!](#hello-tree)
@@ -45,6 +46,7 @@
     - [Contact Manager](#contact-manager)
     - [Glimmer Tetris](#glimmer-tetris)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
+    - [Stock Ticker](#stock-ticker)
   - [External Samples](#external-samples)
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
@@ -616,6 +618,18 @@ Hello, Canvas Transform!
 
 ![Hello Canvas Transform](/images/glimmer-hello-canvas-transform.png)
 
+#### Hello, Canvas Path!
+
+This sample demonstrates the use of the `path`, `quad`, `cubic`, `line`, and `point` keywords as part of the [Canvas Path DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-path-dsl) within the [Canvas Shape DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl).
+
+Code:
+
+[samples/hello/hello_canvas_path.rb](/samples/hello/hello_canvas_path.rb)
+
+Hello, Canvas Path!
+
+![Hello Canvas Path](/images/glimmer-hello-canvas-path.png)
+
 #### Hello, Cursor!
 
 This sample demonstrates the use of the `cursor` property keyword to change the mouse cursor.
@@ -812,6 +826,16 @@ Code:
 
 ![Mandelbrot Fractal Help Menu](/images/glimmer-mandelbrot-menu-help.png)
 
+#### Stock Ticker
+
+This sample demonstrates a Stock Ticker that generates random stock price data for 4 different stocks and provides 4 different tab views of the graphed data using the [Canvas Path DSL](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-path-dsl). It leverages a thread that runs in the background and ticks the stocks to generate random new stock prices before amending the graphed paths with them.
+
+Code:
+
+[samples/elaborate/stock_ticker.rb](/samples/elaborate/stock_ticker.rb)
+
+![Stock Ticker](/images/glimmer-stock-ticker.gif)
+
 ### External Samples
 
 #### Glimmer Calculator

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.18.6.0 ruby lib
+# stub: glimmer-dsl-swt 4.18.6.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.18.6.0"
+  s.version = "4.18.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2021-02-28"
+  s.date = "2021-03-01"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Framework) is a native-GUI cross-platform desktop development library written in JRuby, an OS-threaded faster JVM version of Ruby. Glimmer's main innovation is a declarative Ruby DSL that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust Eclipse SWT library. Glimmer additionally innovates by having built-in data-binding support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models (test-first) afterwards. Not only does Glimmer provide a large set of GUI widgets, but it also supports drawing Canvas Graphics like Shapes and Animations. To get started quickly, Glimmer offers scaffolding options for Apps, Gems, and Custom Widgets. Glimmer also includes native-executable packaging support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in Ruby as truly native DMG/PKG/APP files on the Mac + App Store, MSI/EXE files on Windows, and Gem Packaged Shell Scripts on Linux.".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -166,6 +166,7 @@ Gem::Specification.new do |s|
     "samples/elaborate/login.rb",
     "samples/elaborate/mandelbrot_fractal.rb",
     "samples/elaborate/meta_sample.rb",
+    "samples/elaborate/stock_ticker.rb",
     "samples/elaborate/tetris.rb",
     "samples/elaborate/tetris/model/block.rb",
     "samples/elaborate/tetris/model/game.rb",

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

@@ -230,7 +230,6 @@ module Glimmer
           Glimmer::SWT::DisplayProxy.instance.auto_exec do
             Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::ShapeExpression.new, &block)
             calculated_args_changed!(children: false)
-            drawable.redraw unless drawable.is_a?(ImageProxy)
           end
         end
         
@@ -243,11 +242,11 @@ module Glimmer
         end
         
         def post_add_content
-#           unless @content_added # TODO delete if no longer needed
-            amend_method_name_options_based_on_properties!
+          amend_method_name_options_based_on_properties!
+          if !@content_added || @method_name != @original_method_name
             @drawable.setup_shape_painting unless @drawable.is_a?(ImageProxy)
             @content_added = true
-#           end
+          end
         end
         
         def apply_property_arg_conversions(method_name, property, args)
@@ -367,6 +366,7 @@ module Glimmer
         end
         
         def amend_method_name_options_based_on_properties!
+          @original_method_name = @method_name
           return if @name == 'point'
           if @name != 'text' && @name != 'string' && has_some_background? && !has_some_foreground?
             @options[:fill] = true

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

@@ -39,14 +39,15 @@ module Glimmer
           end
           
           def geometry
-            if @point_array != @geometry_point_array
-              @geometry_point_array = @point_array
+            the_point_array = point_array
+            if the_point_array != @geometry_point_array
+              @geometry_point_array = the_point_array
               @geometry = Java::JavaAwtGeom::Path2D::Double.new
-              @geometry.send(path_segment_geometry_method_name, *path_segment_geometry_args)
+              add_to_geometry(@geometry)
             end
             @geometry
           end
-        
+          
           def contain?(x, y)
             include?(x, y, filled: true)
           end
@@ -74,7 +75,7 @@ module Glimmer
             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
             'cubicTo'
           end
@@ -84,12 +85,20 @@ module Glimmer
             @args.to_a
           end
           
+          def default_path_segment_arg_count
+            8
+          end
+          
+          def default_connected_path_segment_arg_count
+            6
+          end
+          
           def path_segment_geometry_method_name
             'curveTo'
           end
           
           def previous_point_connected?
-            @args.compact.count <= 6 && !first_path_segment?
+            @args.compact.count == 6 && !first_path_segment?
           end
           
           def eql?(other)

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

@@ -147,6 +147,14 @@ module Glimmer
             @args
           end
           
+          def default_path_segment_arg_count
+            4
+          end
+          
+          def default_connected_path_segment_arg_count
+            2
+          end
+          
           def path_segment_geometry_args
             # TODO make args auto-infer first point if previous_point_connected is true or if there is only x1,y1 or x2,y2 (but not both), or if there is an x, y, or if there is a point_array with 1 point
             @args[0..1]

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

@@ -97,16 +97,22 @@ module Glimmer
           end
           
           def calculated_args
+            new_swt_path = @swt_path.nil?
             @swt_path ||= org.eclipse.swt.graphics.Path.new(Glimmer::SWT::DisplayProxy.instance.swt_display)
             # TODO recreate @swt_path only if one of the children get disposed (must notify parent on dispose)
             @args = [@swt_path]
-            @uncalculated_path_segments.dup.each do |path_segment|
+            @uncalculated_path_segments.each do |path_segment|
               path_segment.add_to_swt_path(@swt_path)
               @uncalculated_path_segments.delete(path_segment)
             end
-            super
+            if new_swt_path
+              @path_calculated_args = super
+            else
+              @path_calculated_args
+            end
           rescue => e
             Glimmer::Config.logger.error {e.full_message}
+            @args
           end
           
           def move_by(x_delta, y_delta)
@@ -158,7 +164,7 @@ module Glimmer
               @geometry_path_segments = @path_segments
               @geometry = Java::JavaAwtGeom::Path2D::Double.new
               @path_segments.each do |path_segment|
-                @geometry.send(path_segment.path_segment_geometry_method_name, *path_segment.path_segment_geometry_args)
+                path_segment.add_to_geometry(@geometry)
               end
             end
             @geometry
@@ -173,12 +179,20 @@ module Glimmer
           end
                             
           def path_segment_geometry_method_name
-            'append'
+            if self.class == Path
+              'append'
+            else
+              super
+            end
           end
                     
           def path_segment_geometry_args
-            # TODO consider supporting connected true instead of false (2nd arg)
-            [geometry, false]
+            if self.class == Path
+              # TODO consider supporting connected true instead of false (2nd arg)
+              [geometry, false]
+            else
+              super
+            end
           end
           
           def eql?(other)

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

@@ -38,6 +38,12 @@ module Glimmer
           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
@@ -67,18 +73,37 @@ module Glimmer
             if @swt_path != swt_path
               @swt_path = swt_path
               the_path_segment_args = path_segment_args.dup
-              if !previous_point_connected? && !is_a?(Point)
-                if the_path_segment_args.count > 2
-                  point = the_path_segment_args.shift, the_path_segment_args.shift
+              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
+          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
                   @swt_path.moveTo(*point)
-                elsif first_path_segment? && self.class != Path
-                  point = the_path_segment_args[0..1]
+                elsif first_path_segment?
+                  point = the_path_segment_geometry_args[0..1]
                   @swt_path.moveTo(*point)
                 end
               end
-              @swt_path.send(path_segment_method_name, *the_path_segment_args)
             end
+            geometry.send(path_segment_geometry_method_name, *the_path_segment_geometry_args)
           end
+                  
         end
       end
     end

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

@@ -39,10 +39,11 @@ module Glimmer
           end
           
           def geometry
-            if @point_array != @geometry_point_array
-              @geometry_point_array = @point_array
+            the_point_array = point_array
+            if the_point_array != @geometry_point_array
+              @geometry_point_array = the_point_array
               @geometry = Java::JavaAwtGeom::Path2D::Double.new
-              @geometry.send(path_segment_geometry_method_name, *path_segment_geometry_args)
+              add_to_geometry(@geometry)
             end
             @geometry
           end
@@ -84,8 +85,16 @@ module Glimmer
             @args.to_a
           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?
+            @args.compact.count == 4 && !first_path_segment?
           end
           
           def eql?(other)

data/samples/elaborate/stock_ticker.rb

@@ -0,0 +1,229 @@
+# 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 :stock_price_min, :stock_price_max
+      
+      def stock_price_min
+        @stock_price_min ||= 1
+      end
+      
+      def stock_price_max
+        @stock_price_max ||= 600
+      end
+    end
+    
+    attr_reader :name, :stock_prices
+    attr_accessor :stock_price
+    
+    def initialize(name, stock_price)
+      @name = name
+      @stock_price = stock_price
+      @stock_prices = [@stock_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
+      stock_prices << self.stock_price = [[@stock_price + @delta_sign*delta, Stock.stock_price_min].max, Stock.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]
+    max_stock_name_width = 0
+    left_margin = 5
+    @tabs = ['Lines', 'Quadratic Bezier Curves', 'Cubic Bezier Curves', 'Points'].map {|title| {title: title, stock_paths: [], stock_transforms: []}}
+    @stocks.each_with_index do |stock, stock_index|
+      observe(stock, :stock_price) do |new_price|
+        begin
+          @tabs.each do |tab|
+            new_x = stock.stock_prices.count - 1
+            new_y = @tabs.first[:canvas].bounds.height - new_price - 1
+            max_stock_name_width = tab[:text]&.bounds&.width if tab[:text]&.bounds&.width.to_f > max_stock_name_width
+            if new_x > 0
+              case tab[:title]
+              when 'Cubic Bezier Curves'
+                if new_x%3 == 0 && stock.stock_prices[new_x] && stock.stock_prices[new_x - 1] && stock.stock_prices[new_x - 2]
+                  tab[:stock_paths][stock_index].content {
+                    cubic(new_x - 2, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 2] - 1, new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 1] - 1, new_x, new_y)
+                    tab[:stock_transforms][stock_index] ||= transform {
+                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                    }
+                  }
+                end
+              when 'Quadratic Bezier Curves'
+                if new_x%2 == 0 && stock.stock_prices[new_x] && stock.stock_prices[new_x - 1]
+                  tab[:stock_paths][stock_index].content {
+                    quad(new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[new_x - 1] - 1, new_x, new_y)
+                    tab[:stock_transforms][stock_index] ||= transform {
+                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                    }
+                  }
+                end
+              when 'Lines'
+                tab[:stock_paths][stock_index].content {
+                  line(new_x, new_y)
+                  tab[:stock_transforms][stock_index] ||= transform {
+                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                  }
+                }
+              when 'Points'
+                tab[:stock_paths][stock_index].content {
+                  point(new_x, new_y)
+                  tab[:stock_transforms][stock_index] ||= transform {
+                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
+                  }
+                }
+              end
+              new_x_location = new_x + max_stock_name_width + 5 + left_margin + 5
+              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].content {
+                tab[:text] = text(stock.name, new_x + left_margin, new_y) {
+                  foreground @stock_colors[stock_index]
+                }
+              }
+            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 {
+            fill_layout {
+              margin_width 0
+              margin_height 0
+            }
+            text tab[:title]
+            
+            tab[:scrolled_composite] = scrolled_composite {
+              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.stock_price_min = 25
+        Stock.stock_price_max = @tabs.first[:canvas].bounds.height - 6
+        # pre-initialize all tabs by selecting them so that they render content when they are later in the background
+        @tab_folder.items.each do |item|
+          @tab_folder.selection = item
+        end
+        @tab_folder.selection = @tab_folder.items.first
+      }
+      
+      on_widget_disposed {
+        @thread.kill # safe to kill as data is in memory only
+      }
+    }
+  }
+end
+
+StockTicker.launch
+        

data/samples/hello/hello_canvas_path.rb

@@ -1,223 +1,66 @@
-# 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 HelloCanvasPath
-  class Stock
-    class << self
-      attr_writer :stock_price_min, :stock_price_max
-      
-      def stock_price_min
-        @stock_price_min ||= 1
-      end
-      
-      def stock_price_max
-        @stock_price_max ||= 600
-      end
-    end
-    
-    attr_reader :name, :stock_prices
-    attr_accessor :stock_price
-    
-    def initialize(name, stock_price)
-      @name = name
-      @stock_price = stock_price
-      @stock_prices = [@stock_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
-      stock_prices << self.stock_price = [[@stock_price + @delta_sign*delta, Stock.stock_price_min].max, Stock.stock_price_max].min
-    end
-    
-    def start_new_trend!
-      @trend_length = (rand*25).to_i + 1
-    end
-  end
+        
+include Glimmer
   
-  include Glimmer::UI::CustomShell
+shell {
+  text 'Hello, Canvas Path!'
+  minimum_size 800, 700
+  background :white
   
-  before_body {
-    @stocks = [
-      Stock.new('AAPL', 121),
-      Stock.new('MSFT', 232),
-    ]
-    @stock_colors = [:red, :dark_green, :blue, :magenta]
-    max_stock_name_width = 0
-    left_margin = 5
-    @tabs = ['Cubic Bezier Curves', 'Quadratic Bezier Curves', 'Lines', 'Points'].map {|title| {title: title, paths: [], transforms: []}}
-    @stocks.each_with_index do |stock, i|
-      x = 0
-      observe(stock, :stock_price) do |new_price|
-        begin
-          @tabs.each do |tab|
-            new_x = x
-            new_y = @tabs.first[:canvas].bounds.height - new_price - 1
-            max_stock_name_width = tab[:text]&.bounds&.width if tab[:text]&.bounds&.width.to_f > max_stock_name_width
-            if new_x > 0
-              case tab[:title]
-              when 'Cubic Bezier Curves'
-                if stock.stock_prices[i] && stock.stock_prices[i - 1] && stock.stock_prices[i - 2]
-                  tab[:paths][i].content {
-                    cubic(new_x - 2, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 2] - 1, new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 1] - 1, new_x, new_y)
-                    tab[:transforms][i] ||= transform {
-                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                    }
-                  }
-                end
-              when 'Quadratic Bezier Curves'
-                if stock.stock_prices[i] && stock.stock_prices[i - 1]
-                  tab[:paths][i].content {
-                    quad(new_x - 1, @tabs.first[:canvas].bounds.height - stock.stock_prices[i - 1] - 1, new_x, new_y)
-                    tab[:transforms][i] ||= transform {
-                      translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                    }
-                  }
-                end
-              when 'Lines'
-                tab[:paths][i].content {
-                  line(new_x, new_y)
-                  tab[:transforms][i] ||= transform {
-                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                  }
-                }
-              when 'Points'
-                tab[:paths][i].content {
-                  point(new_x, new_y)
-                  tab[:transforms][i] ||= transform {
-                    translate max_stock_name_width + 5 + left_margin, tab[:text].bounds.height / 2.0
-                  }
-                }
-              end
-              new_x_location = new_x + max_stock_name_width + 5 + left_margin + 5
-              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].content {
-                tab[:text] = text(stock.name, new_x + left_margin, new_y) {
-                  foreground @stock_colors[i]
-                }
-              }
-            end
-          end
-          x += 1
-        rescue => e
-          Glimmer::Config.logger.error {e.full_message}
-        end
-      end
-    end
-  }
-  
-  after_body {
-    @thread = Thread.new {
-      loop {
-        @stocks.each(&:tick!)
-        sleep(0.01)
+    canvas {
+      background :white
+      
+      text('line', 15, 200) {
+        foreground :red
       }
-    }
-  }
-  
-  body {
-    shell {
-      fill_layout {
-        margin_width 15
-        margin_height 15
+      @path1 = path {
+        antialias :on
+        foreground :red
       }
-      text 'Hello, Canvas Path!'
-      minimum_size 650, 650
-      background :white
       
-      tab_folder {
-        @tabs.each do |tab|
-          tab_item {
-            fill_layout {
-              margin_width 0
-              margin_height 0
-            }
-            text tab[:title]
-            
-            tab[:scrolled_composite] = scrolled_composite {
-              tab[:canvas] = canvas {
-                background :white
-                
-                @stocks.count.times do |n|
-                  tab[:paths][n] = path {
-                    foreground @stock_colors[n]
-                  }
-                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
+      text('quad', 15, 300) {
+        foreground :dark_green
       }
-    
-      on_swt_show {
-        Stock.stock_price_min = 25
-        Stock.stock_price_max = @tabs.first[:canvas].bounds.height - 6
+      @path2 = path {
+        antialias :on
+        foreground :dark_green
       }
       
-      on_widget_disposed {
-        @thread.kill # safe to kill as memory is in data only
+      text('cubic', 15, 400) {
+        foreground :blue
       }
+      @path3 = path {
+        antialias :on
+        foreground :blue
+      }
+    }
+  
+  on_swt_show {
+    Thread.new {
+      y1 = y2 = y3 = 300
+      800.times.each do |x|
+        x += 55
+        x1 = x - 2
+        x2 = x - 1
+        x3 = x
+        y1 = y3
+        y2 = y1
+        y3 = [[y3 + (rand*24 - 12), 0].max, 700].min
+        @path1.content {
+          line(x1, y1 - 100)
+        }
+        if x % 2 == 0
+          @path2.content {
+            quad(x1, y1, x2, y2)
+          }
+        end
+        if x % 3 == 0
+          @path3.content {
+            cubic(x1, y1 + 100, x2, y2 + 100, x3, y3 + 100)
+          }
+        end
+        sleep(0.01)
+      end
     }
   }
-end
-
-HelloCanvasPath.launch
-        
+}.open

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.18.6.0
+  version: 4.18.6.1
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -485,6 +485,7 @@ files:
 - samples/elaborate/login.rb
 - samples/elaborate/mandelbrot_fractal.rb
 - samples/elaborate/meta_sample.rb
+- samples/elaborate/stock_ticker.rb
 - samples/elaborate/tetris.rb
 - samples/elaborate/tetris/model/block.rb
 - samples/elaborate/tetris/model/game.rb