glimmer-dsl-swt 4.18.4.9 → 4.18.5.2

data/lib/glimmer/ui.rb

@@ -0,0 +1,5 @@
+module Glimmer
+  module UI
+  end
+  GUI = UI # alias
+end

data/lib/glimmer/ui/custom_shell.rb

@@ -19,6 +19,7 @@
 # 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/ui'
 require 'glimmer/error'
 
 module Glimmer
@@ -28,19 +29,22 @@ module Glimmer
       include Glimmer::UI::CustomWidget
       
       class << self
-        attr_reader :launched_custom_shell
-        
         def launch(*args, &content)
-          @launched_custom_shell = send(keyword, *args, &content) if @launched_custom_shell.nil? || @launched_custom_shell.disposed?
-          @launched_custom_shell.swt_widget.set_data('launched', true)
-          @launched_custom_shell.open
+          auto_exec do
+            @launched_custom_shell = send(keyword, *args, &content)
+            @launched_custom_shell.swt_widget.set_data('launched', true)
+            @launched_custom_shell.open
+          end
         end
       end
       
       def initialize(parent, *swt_constants, options, &content)
         super
-        @swt_widget.set_data('custom_shell', self)
-        raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
+        auto_exec do
+          @swt_widget.set_data('custom_shell', self)
+          @swt_widget.set_data('custom_window', self)
+        end
+        raise Error, 'Invalid custom shell (window) body root! Must be a shell (window) or another custom shell (window).' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
       
       # Classes may override
@@ -78,5 +82,7 @@ module Glimmer
         body_root.start_event_loop
       end
     end
+    CustomWindow = CustomShell
+    Application = CustomShell
   end
 end

data/lib/glimmer/ui/custom_widget.rb

@@ -20,6 +20,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'glimmer'
+require 'glimmer/ui'
 require 'glimmer/error'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
@@ -181,7 +182,9 @@ module Glimmer
         @body_root = instance_exec(&body_block)
         raise Glimmer::Error, 'Invalid custom widget for having an empty body! Please fill body block!' if @body_root.nil?
         @swt_widget = @body_root.swt_widget
-        @swt_widget.set_data('custom_widget', self)
+        auto_exec do
+          @swt_widget.set_data('custom_widget', self)
+        end
         execute_hook('after_body')
         @dispose_listener_registration = @body_root.on_widget_disposed do
           observer_registrations.each(&:deregister)
@@ -271,10 +274,6 @@ module Glimmer
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
       
-      def pack(*args)
-        body_root.pack(*args)
-      end
-
       # TODO see if it is worth it to eliminate duplication of async_exec/sync_exec
       # delegation to DisplayProxy, via a module
 

data/samples/elaborate/contact_manager.rb

@@ -22,14 +22,14 @@
 require_relative "contact_manager/contact_manager_presenter"
 
 class ContactManager
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def initialize
+  before_body {
     @contact_manager_presenter = ContactManagerPresenter.new
     @contact_manager_presenter.list
-  end
+  }
 
-  def launch
+  body {
     shell {
       text "Contact Manager"
       composite {
@@ -135,8 +135,8 @@ class ContactManager
           }
         }
       }
-    }.open
-  end
+    }
+  }
 end
 
-ContactManager.new.launch
+ContactManager.launch

data/samples/elaborate/login.rb

@@ -45,17 +45,19 @@ class LoginPresenter
   def logged_in
     self.status == "Logged In"
   end
+  alias logged_in? logged_in
 
   def logged_out
     !self.logged_in
   end
+  alias logged_out? logged_out
 
-  def login
+  def login!
     return unless valid?
     self.status = "Logged In"
   end
 
-  def logout
+  def logout!
     self.user_name = ""
     self.password = ""
     self.status = "Logged Out"
@@ -64,19 +66,22 @@ class LoginPresenter
 end
 
 class Login
-  include Glimmer
+  include Glimmer::UI::CustomShell
 
-  def launch
-    presenter = LoginPresenter.new
-    @shell = shell {
+  before_body {
+    @presenter = LoginPresenter.new
+  }
+
+  body {
+    shell {
       text "Login"
       composite {
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
         @user_name_text = text {   # goes in column 2
-          text bind(presenter, :user_name)
-          enabled bind(presenter, :logged_out)
+          text bind(@presenter, :user_name)
+          enabled bind(@presenter, :logged_out)
           on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
@@ -84,40 +89,39 @@ class Login
 
         label { text "Password:" }
         @password_text = text(:password, :border) {
-          text bind(presenter, :password)
-          enabled bind(presenter, :logged_out)
+          text bind(@presenter, :password)
+          enabled bind(@presenter, :logged_out)
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         label { text "Status:" }
-        label { text bind(presenter, :status) }
+        label { text bind(@presenter, :status) }
 
         button {
           text "Login"
-          enabled bind(presenter, :logged_out)
-          on_widget_selected { presenter.login }
+          enabled bind(@presenter, :logged_out)
+          on_widget_selected { @presenter.login! }
           on_key_pressed { |event|
-            presenter.login if event.keyCode == swt(:cr)
+            @presenter.login! if event.keyCode == swt(:cr)
           }
         }
 
         button {
           text "Logout"
-          enabled bind(presenter, :logged_in)
-          on_widget_selected { presenter.logout }
+          enabled bind(@presenter, :logged_in)
+          on_widget_selected { @presenter.logout! }
           on_key_pressed { |event|
             if event.keyCode == swt(:cr)
-              presenter.logout
+              @presenter.logout!
               @user_name_text.set_focus
             end
           }
         }
       }
     }
-    @shell.open
-  end
+  }
 end
 
-Login.new.launch
+Login.launch

data/samples/elaborate/mandelbrot_fractal.rb

@@ -20,7 +20,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'complex'
-require 'bigdecimal'
 require 'concurrent-ruby'
 
 # Mandelbrot multi-threaded implementation leveraging all processor cores.
@@ -30,8 +29,12 @@ class Mandelbrot
   Y_END = 1.0
   X_START = -2.0
   X_END = 0.5
+  PROGRESS_MAX = 40
   
   class << self
+    attr_accessor :progress, :work_in_progress
+    attr_writer :processor_count
+  
     def for(max_iterations:, zoom:, background: false)
       key = [max_iterations, zoom]
       creation_mutex.synchronize do
@@ -50,6 +53,10 @@ class Mandelbrot
     def creation_mutex
       @creation_mutex ||= Mutex.new
     end
+    
+    def processor_count
+      @processor_count ||= Concurrent.physical_processor_count
+    end
   end
   
   attr_accessor :max_iterations, :background
@@ -63,7 +70,6 @@ class Mandelbrot
   def initialize(max_iterations:, zoom: 1.0, background: false)
     @max_iterations = max_iterations
     @zoom = zoom
-    @background = background
   end
   
   def step
@@ -90,28 +96,31 @@ class Mandelbrot
     @points ||= calculate_points
   end
   
-  def thread_count
-    @background ? [Concurrent.processor_count - 1, 1].max : Concurrent.processor_count
-  end
-  
   def calculate_points
     puts "Background calculation activated at zoom #{zoom}" if @background
     if @points_calculated
       puts "Points calculated already. Returning previously calculated points..."
       return @points
     end
-    thread_pool = Concurrent::FixedThreadPool.new(thread_count, fallback_policy: :discard)
+    thread_pool = Concurrent::FixedThreadPool.new(Mandelbrot.processor_count, fallback_policy: :discard)
     @points = Concurrent::Array.new(height)
+    Mandelbrot.work_in_progress = "Calculating Mandelbrot Points for Zoom #{zoom}x"
+    Mandelbrot.progress = 0
+    point_index = 0
+    point_count = width*height
     height.times do |y|
       @points[y] ||= Concurrent::Array.new(width)
       width.times do |x|
         thread_pool.post do
           @points[y][x] = calculate(x_array[x], y_array[y]).last
+          point_index += 1
+          Mandelbrot.progress += 1 if (point_index.to_f / point_count.to_f)*PROGRESS_MAX >= Mandelbrot.progress
         end
       end
     end
     thread_pool.shutdown
     thread_pool.wait_for_termination
+    Mandelbrot.progress = PROGRESS_MAX
     @points_calculated = true
     @points
   end
@@ -132,9 +141,11 @@ end
 
 class MandelbrotFractal
   include Glimmer::UI::CustomShell
-  
-  COMMAND = OS.mac? ? :command : :ctrl
     
+  COMMAND = OS.mac? ? :command : :ctrl
+  
+  attr_accessor :mandelbrot_shell_title
+      
   option :zoom, default: 1.0
   
   before_body {
@@ -144,6 +155,12 @@ class MandelbrotFractal
   }
   
   after_body {
+    observe(Mandelbrot, :work_in_progress) {
+      update_mandelbrot_shell_title!
+    }
+    observe(Mandelbrot, :zoom) {
+      update_mandelbrot_shell_title!
+    }
     # pre-calculate zoomed mandelbrot images even before the user zooms in
     puts 'Starting background calculation thread...'
     Thread.new {
@@ -153,10 +170,7 @@ class MandelbrotFractal
         the_mandelbrot = Mandelbrot.for(max_iterations: color_palette.size - 1, zoom: future_zoom, background: true)
         pixels = the_mandelbrot.calculate_points
         build_mandelbrot_image(mandelbrot_zoom: future_zoom)
-        sync_exec {
-          swt_widget.text = mandelbrot_shell_title
-          @canvas.cursor = :cross
-        }
+        @canvas.cursor = :cross unless @canvas.disposed?
         future_zoom += 0.5
       }
     }
@@ -164,11 +178,21 @@ class MandelbrotFractal
   
   body {
     shell(:no_resize) {
-      text mandelbrot_shell_title
-      minimum_size mandelbrot.width, mandelbrot.height + 30
+      grid_layout
+      text bind(self, :mandelbrot_shell_title)
+      minimum_size mandelbrot.width + 29, mandelbrot.height + 77
       image @mandelbrot_image
       
+      progress_bar {
+        layout_data :fill, :center, true, false
+
+        minimum 0
+        maximum Mandelbrot::PROGRESS_MAX
+        selection bind(Mandelbrot, :progress)
+      }
+          
       @scrolled_composite = scrolled_composite {
+        layout_data :fill, :fill, true, true
         @canvas = canvas {
           image @mandelbrot_image
           cursor :no
@@ -196,8 +220,8 @@ class MandelbrotFractal
           on_mouse_up { |mouse_event|
             if !@drag_detected
               origin = @scrolled_composite.origin
-              @location_x = [[origin.x + mouse_event.x - @scrolled_composite.bounds.width / 2.0, 0].max, @scrolled_composite.bounds.width].min
-              @location_y = [[origin.y + mouse_event.y - @scrolled_composite.bounds.height / 2.0, 0].max, @scrolled_composite.bounds.height].min
+              @location_x = mouse_event.x
+              @location_y = mouse_event.y
               if mouse_event.button == 1
                 zoom_in
               elsif mouse_event.button > 2
@@ -236,6 +260,31 @@ class MandelbrotFractal
             on_widget_selected { perform_zoom(mandelbrot_zoom: 1.0) }
           }
         }
+        menu {
+          text '&Cores'
+          
+          Concurrent.physical_processor_count.times {|n|
+            processor_number = n + 1
+            menu_item(:radio) {
+              text "&#{processor_number}"
+                
+              case processor_number
+              when 0..9
+                accelerator COMMAND, processor_number.to_s
+              when 10..19
+                accelerator COMMAND, :shift, (processor_number - 10).to_s
+              when 20..29
+                accelerator COMMAND, :alt, (processor_number - 20).to_s
+              end
+              
+              selection true if processor_number == Concurrent.physical_processor_count
+              
+              on_widget_selected {
+                Mandelbrot.processor_count = processor_number
+              }
+            }
+          }
+        }
         menu {
           text '&Help'
           
@@ -251,9 +300,11 @@ class MandelbrotFractal
       }
     }
   }
-  
-  def mandelbrot_shell_title
-    "Mandelbrot Fractal - Zoom #{zoom}x (Calculated Max: #{flyweight_mandelbrot_images.keys.max}x)"
+      
+  def update_mandelbrot_shell_title!
+    new_title = "Mandelbrot Fractal - Zoom #{zoom}x (Calculated Max: #{flyweight_mandelbrot_images.keys.max}x)"
+    new_title += " - #{Mandelbrot.work_in_progress}" if Mandelbrot.work_in_progress
+    self.mandelbrot_shell_title = new_title
   end
   
   def build_mandelbrot_image(mandelbrot_zoom: nil)
@@ -263,17 +314,20 @@ class MandelbrotFractal
       width = the_mandelbrot.width
       height = the_mandelbrot.height
       pixels = the_mandelbrot.points
-      new_mandelbrot_image = image(width, height, top_level: true) # invoke as a top-level parentless keyword to avoid nesting under any widget
-      new_mandelbrot_image_gc = new_mandelbrot_image.gc
-      current_foreground = nil
-      height.times { |y|
-        width.times { |x|
-          new_foreground = color_palette[pixels[y][x]]
-          new_mandelbrot_image_gc.foreground = current_foreground = new_foreground unless new_foreground == current_foreground
-          new_mandelbrot_image_gc.draw_point x, y
-        }
+      Mandelbrot.work_in_progress = "Consuming Points To Build Image for Zoom #{mandelbrot_zoom}x"
+      Mandelbrot.progress = Mandelbrot::PROGRESS_MAX + 1
+      point_index = 0
+      point_count = width*height
+      # invoke as a top-level parentless keyword to avoid nesting under any widget
+      new_mandelbrot_image = image(width, height, top_level: true) { |x, y|
+        point_index += 1
+        Mandelbrot.progress -= 1 if (Mandelbrot::PROGRESS_MAX - (point_index.to_f / point_count.to_f)*Mandelbrot::PROGRESS_MAX) < Mandelbrot.progress
+        pixel_color_index = pixels[y][x]
+        color_palette[pixel_color_index]
       }
+      Mandelbrot.progress = 0
       flyweight_mandelbrot_images[mandelbrot_zoom] = new_mandelbrot_image
+      update_mandelbrot_shell_title!
     end
     flyweight_mandelbrot_images[mandelbrot_zoom]
   end
@@ -326,12 +380,13 @@ class MandelbrotFractal
     @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))
     if @location_x && @location_y
+      # center on mouse click location
       factor = (zoom / last_zoom)
-      @scrolled_composite.set_origin(factor*@location_x, factor*@location_y)
+      @scrolled_composite.set_origin(factor*@location_x - @scrolled_composite.client_area.width/2.0, factor*@location_y - @scrolled_composite.client_area.height/2.0)
       @location_x = @location_y = nil
     end
+    update_mandelbrot_shell_title!
     @canvas.cursor = :cross
-    swt_widget.text = mandelbrot_shell_title
   end
   
   def display_help_instructions
@@ -343,6 +398,7 @@ class MandelbrotFractal
         Left-click to zoom in.
         Right-click to zoom out.
         Scroll or drag to pan.
+        Adjust cores to get a more responsive interaction.
         
         Enjoy!
       MULTI_LINE_STRING