gray_scott_gtk3 0.3.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d93fc72f36cfab2aabfff3052cca7a883c0468a0e3c0bad1eae5388b631226
-  data.tar.gz: d4db2736b6d9df5a90d0c8bdba039d1963119b4c19a9185f4b50de0fb9672b8e
+  metadata.gz: f1d2097bd2f581e81bd6b0dd71f30b84b27e95d7fc97fa3dfbb88b08e182681a
+  data.tar.gz: 5d97e06aec54b53863c1b64c9435fde1a087166c5d13d93778f6931f85106f98
 SHA512:
-  metadata.gz: 946f28c50936f2760d78d434ca12a04a3caa43eac48337bb4dcc9c111bddea702fc917f9890cdee36082c8737b93fc497b655949cfefd6e6f0f4dba8abffb64b
-  data.tar.gz: 56f9f746991c82f9d6d91b80da81db1b44b2376670a00be39dec7b720ec6ad81b2504eb5c8d3677c12a86bd04b467e90036e6f2df6cb35e15a73624424c3f4e1
+  metadata.gz: 3d95033c5ea8482b263e145e22dae974483846f186f9cba771a3a3aa4a6513bd2a222bb7dc207a53dc5b4596f30a2059fc9e10f13eeef5749c1c6b79a81fee87
+  data.tar.gz: 8f272262554650f1dbbfbe71067bd34cac48badbac81b6d0d9dffb2c89a88fbf9c514a1fd3423e4b71c89e4309d4907e16a74ef5116200682fccd50901a046e6

data/README.md

@@ -10,11 +10,35 @@
 
 ## Installation
 
-    $ gem install gray_scott_gtk3
+$ gem install gray_scott_gtk3
 
 ## Usage
 
-    $ grayscott 40 # msec
+$ grayscott 40 # msec
+
+$ grayscott 40 -w 256 -h 256 # size of model. display is fixed to 512 x 512 pixels.
+
+## Usage with terminal(example)
+
+$ bundle install
+$ bundle exec bin/console
+
+```ruby
+GrayScottGtk3::Controller::MSEC = 50
+c = GrayScottGtk3::Controller.new 'resources/', width:1024, height:1024
+
+# custom feed / kill ratio
+na = Numo::SFloat.new(1024,1).seq + 10 # avoid zero
+na = na * Numo::SFloat.ones(1, 1024)
+na = na / na.max
+f = na * 0.05
+k = na.transpose * 0.06 + 0.01
+c.model.f = f
+c.model.k = k
+c.model.v.rand(0.0, 0.15)
+c.color = 'green' # colorful is slow. 
+Gtk.main
+```
 
 ## Known issue
 

data/exe/grayscott

@@ -26,6 +26,7 @@ module GrayScottGtk3
     def run(opt)
       xml_path = File.expand_path('../resources/', __dir__)
       Controller.new(xml_path, opt)
+      Gtk.main
     end
   end
 end

data/gray_scott_gtk3.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['2xijok@gmail.com']
 
   spec.summary       = 'Gray-Scott model.'
-  spec.description   = 'Reaction diffusion system (Gray-Scott model).'
+  spec.description   = 'Reaction diffusion system (Gray-Scott model). screenshot: https://bit.ly/2rvKErd'
   spec.homepage      = 'https://github.com/kojix2/Gray-Scott'
 
   # Specify which files should be added to the gem when it is released.

data/lib/gray_scott_gtk3/controller.rb

@@ -3,7 +3,7 @@ require_relative 'controller/aboutdialog'
 module GrayScottGtk3
   class Controller
     include ShortNumo
-    attr_accessor :resource_dir, :height, :width, :model
+    attr_accessor :resource_dir, :height, :width, :model, :color
 
     def initialize(dir, height: 256, width: 256)
       @resource_dir = dir
@@ -16,7 +16,7 @@ module GrayScottGtk3
       builder = Gtk::Builder.new
       builder.add_from_file File.join(resource_dir, 'gray_scott.glade')
 
-      %w[win gimage legend_image uv_combobox pen_density pen_radius].each do |s|
+      %w[win execute_button gimage legend_image uv_combobox pen_density pen_radius].each do |s|
         instance_variable_set('@' + s, builder.get_object(s))
       end
 
@@ -24,7 +24,6 @@ module GrayScottGtk3
 
       @win.show_all # window
       on_new_clicked
-      Gtk.main
     end
 
     def show_about
@@ -68,9 +67,13 @@ module GrayScottGtk3
       end
     end
 
-    def on_save_clicked
+    def stop
       @doing_now = false
+      @execute_button.active = false
+    end
 
+    def on_save_clicked
+      stop if doing_now?
       dialog = Gtk::FileChooserDialog.new(title: 'PNG画像を保存',
                                           action: :save,
                                           buttons: [%i[save accept], %i[cancel cancel]])
@@ -170,5 +173,23 @@ module GrayScottGtk3
     def doing_now?
       @doing_now
     end
+
+    private
+    def debug_p_u
+      p model.u
+    end
+
+    def debug_p_v
+      p model.v
+    end
+
+    def debug_p_f
+      p model.f
+    end
+
+    def debug_p_k
+      p model.k
+    end
+
   end
 end

data/lib/gray_scott_gtk3/model.rb

@@ -34,6 +34,12 @@ module GrayScottGtk3
       dvdt = Dv * l_v + uvv - (f + k) * v
       u._ + (Dt * dudt)
       v._ + (Dt * dvdt)
+      immune_surveillance
+    end
+
+    def immune_surveillance
+      @u._.clip(0.00001, 1)
+      @v._.clip(0.00001, 1)
     end
   end
 end

data/lib/gray_scott_gtk3/version.rb

@@ -1,3 +1,3 @@
 module GrayScottGtk3
-  VERSION = '0.3.3'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/resources/gray_scott.glade

@@ -121,6 +121,56 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">Debug</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">p @u</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="debug_p_u" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">p @v</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="debug_p_v" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">p @f</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="debug_p_f" swapped="no"/>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkMenuItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">p @k</property>
+                        <property name="use_underline">True</property>
+                        <signal name="activate" handler="debug_p_k" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -256,7 +306,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkToggleButton" id="execute">
+              <object class="GtkToggleButton" id="execute_button">
                 <property name="label">gtk-execute</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gray_scott_gtk3
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Reaction diffusion system (Gray-Scott model).
+description: 'Reaction diffusion system (Gray-Scott model). screenshot: https://bit.ly/2rvKErd'
 email:
 - 2xijok@gmail.com
 executables: