jruby_art 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac6a3c365c5e0b4fc36d08129d47204316f92a05890f1fe0a239ddee0fb67126
-  data.tar.gz: '0397d79178b171f627abf1f0d39a09430868b41475cfdac3de5e1711bcc6069d'
+  metadata.gz: cf74d273a9f46d9007556910d109da34b86d88625f8a3da28cc58acf7f16188f
+  data.tar.gz: b79eafecff71443d75d47be949dcd7ea09d4f4373fd98509da9e27ee4c2c4a02
 SHA512:
-  metadata.gz: 87635de1c259c5a1e4673f551db357e3824cb19b7c2260010646a3ba52a3178fdfd189e5e99aaa670b723f6ca300093cfdc2a5e774411a8b9f2db4e45a59a01b
-  data.tar.gz: cefd4c98c57a35a536fc1d3779f3374b654a20295328f6436122d085b16cd13fe478bd8a522f363a483799c5055956c38d28a3e0e65f633feb2a9387d4a559f7
+  metadata.gz: 3549c14d3454169d1e7d2519f63a2759632f23cb22c1ba9b3348ca15404905712ec0c910646e10f4590d7db5137796698ba7c41d3354747f66506252d6f15d3b
+  data.tar.gz: 0d1f03359ab4cf3a992deb0abca8193a0c23138bb6ec6267c637d77422656479f41758fe0de4caec428a1e673362714f30cc55ee39a12c6d63e8a5914698166d

data/lib/jruby_art/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # A wrapper for version
 module JRubyArt
-  VERSION = '1.4.7'.freeze
+  VERSION = '1.4.8'.freeze
 end

data/library/control_panel/control_panel.rb

@@ -1,17 +1,20 @@
-# frozen_string_literal: true
 # Here's a little library for quickly hooking up controls to sketches.
 # For messing with the parameters and such.
 # These controls will set instance variables on the sketches.
 # You can make sliders, checkboxes, buttons, and drop-down menus.
-# (optionally) pass the range and default value.
+# Optionally pass range and a default value to sliders.
 module ControlPanel
+  def self.app_value(name, val)
+    Processing.app.instance_variable_set("@#{name}", val)
+  end
+
   # class used to create slider elements for control_panel
   class Slider < javax.swing.JSlider
-    def initialize(control_panel, name, range, initial_value, proc = nil)
+    def initialize(control_panel, name, range, initial, proc = nil)
       min = range.begin * 100
-      max = (
-      (range.exclude_end? && range.begin.respond_to?(:succ)) ?
-      range.max : range.end) * 100
+      mx = range.end
+      mx = range.max if range.exclude_end? && range.begin.respond_to?(:succ)
+      max = mx * 100
       super(min, max)
       set_minor_tick_spacing((max - min).abs / 10)
       set_paint_ticks true
@@ -20,11 +23,12 @@ module ControlPanel
       label = control_panel.add_element(self, name)
       add_change_listener do
         update_label(label, name, value)
-        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
+        ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
-      set_value(initial_value ? initial_value * 100 : min)
-      fire_state_changed
+      val = initial.nil? ? (range.first + range.last) * 50 : initial * 100
+      set_value(val)
+      ControlPanel.app_value(name, val)
     end
 
     def value
@@ -45,7 +49,7 @@ module ControlPanel
       set_preferred_size(java.awt.Dimension.new(190, 30))
       control_panel.add_element(self, name)
       add_action_listener do
-        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
+        ControlPanel.app_value(name, value) unless value.nil?
         proc.call(value) if proc
       end
       set_selected_index(initial_value ? elements.index(initial_value) : 0)
@@ -65,11 +69,12 @@ module ControlPanel
       set_horizontal_alignment javax.swing.SwingConstants::CENTER
       control_panel.add_element(self, name, false)
       add_action_listener do
-        Processing.app.instance_variable_set("@#{name}", value) unless value.nil?
+        ControlPanel.app_value(name, value)
         proc.call(value) if proc
       end
     end
 
+    # define value as checkbox state
     def value
       is_selected
     end
@@ -82,7 +87,7 @@ module ControlPanel
       set_preferred_size(java.awt.Dimension.new(170, 64))
       control_panel.add_element(self, name, false, true)
       add_action_listener do
-        Processing.app.send(name.to_s)
+        Processing.app.send(name)
         proc.call(value) if proc
       end
     end
@@ -98,11 +103,7 @@ module ControlPanel
       super()
       @elements = []
       @panel = javax.swing.JPanel.new(java.awt.FlowLayout.new(1, 0, 0))
-      set_feel
-    end
-
-    def title(name)
-      set_title(name)
+      feel
     end
 
     def display
@@ -110,7 +111,8 @@ module ControlPanel
       set_size 200, 30 + (64 * elements.size)
       set_default_close_operation javax.swing.JFrame::HIDE_ON_CLOSE
       set_resizable false
-      set_location(Processing.app.width + 10, 0) unless Processing.app.width + 10 > Processing.app.displayWidth
+      xoffset = Processing.app.width + 10
+      set_location(xoffset, 0) unless xoffset > Processing.app.displayWidth
       panel.visible = true
     end
 
@@ -129,8 +131,12 @@ module ControlPanel
       dispose
     end
 
-    def slider(name, range = 0..100, initial_value = nil, &block)
-      Slider.new(self, name, range, initial_value, block || nil)
+    def title(name)
+      set_title(name)
+    end
+
+    def slider(name, range = 0..100, initial = nil, &block)
+      Slider.new(self, name, range, initial, block || nil)
     end
 
     def menu(name, elements, initial_value = nil, &block)
@@ -147,17 +153,17 @@ module ControlPanel
     end
 
     def look_feel(lf)
-      set_feel(lf)
+      feel(lf)
     end
 
     private
 
-    def set_feel(lf = 'metal')
+    def feel(lf = 'metal')
       lafinfo = javax.swing.UIManager.getInstalledLookAndFeels
-      laf = lafinfo.to_ary.select do |info|
+      laf = lafinfo.to_ary.find do |info|
         info.name =~ Regexp.new(Regexp.escape(lf), Regexp::IGNORECASE)
       end
-      javax.swing.UIManager.setLookAndFeel(laf[0].class_name)
+      javax.swing.UIManager.setLookAndFeel(laf.class_name)
     end
   end
 
@@ -168,6 +174,8 @@ module ControlPanel
       return @control_panel unless block_given?
       yield(@control_panel)
       @control_panel.display
+      @control_panel.set_visible true
+      @control_panel # for legacy compat
     end
   end
 end

data/vendors/Rakefile

@@ -11,7 +11,7 @@ EOS
 
 JRUBYC_VERSION     = '9.1.16.0'
 
-EXAMPLES           = '2.9'
+EXAMPLES           = '3.0'
 HOME_DIR = ENV['HOME']
 MAC_OR_LINUX = /linux|mac|darwin/ =~ RbConfig::CONFIG['host_os']
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jruby_art
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Jeremy Ashkenas
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -40,11 +40,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
-description: |2
-    JRubyArt is a ruby wrapper for the processing art framework, with enhanced
-    functionality. Use both processing libraries and ruby gems in your sketches.
-    Features create/run/watch/live modes. The current release features may be the
-     last before we start supporting ruby-2.4 in sketches.
+description: "  JRubyArt is a ruby wrapper for the processing art framework, with
+  enhanced\n  functionality. Use both processing libraries and ruby gems in your sketches.\n
+  \ Features create/run/watch/live modes. \n"
 email: mamba2928@yahoo.co.uk
 executables:
 - k9