gray_scott_gtk3 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b96eb9bc094186629bcb54a07917c051b926c48c73670b40d030e7ee8d6fa6
-  data.tar.gz: 61e4be42ce0493aa08a78563bd7e6a3135699d29d5ceead8ef33914288717501
+  metadata.gz: dc4073fb80e208c5af63ea40b5c05d9b4078a2e8a05f5c9e9c8a13b73d20b5a6
+  data.tar.gz: f97b366371ea21e8316a70b72a3330694eca1a056b97ea794bca9286bfac3709
 SHA512:
-  metadata.gz: 600a72aebd92e2ebb81ad8927168b763c15d9a11b15294c3a4922af7dc8d80a5cd954ebde5ce33bc741d0383cb2c4e2690f2a264635813cadfd295b72284d52d
-  data.tar.gz: fec514e7e4914670d06e9ed5df3d76283a2f0eef8c513b73c498a1489b8605f1e4fdbba3732b6bdcd01f61039ad5e5b57b468345140e20192d6633fb0980548b
+  metadata.gz: 98317af10dfa5bcf97960e01d0a4f6216c42f9c7378b082203819685e2710a581da72fcb39c9d8561a5c731996fe7fd9d857bd23cb1407213acdcbf55f6e19d9
+  data.tar.gz: 12344e46949d46085c9c9710811848320106228bf5a630ac6a819516430f9f747b3020911b9918e86b830bcae816e9809c07707bec3bf005a346085d1ba9df8a

data/.gitignore

@@ -43,9 +43,13 @@ build-iPhoneSimulator/
 
 # for a library or gem, you might want to ignore these files since the code is
 # intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
+Gemfile.lock
 # .ruby-version
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+# rspec
+/spec/reports/
+.rspec_status

data/.rspec

@@ -0,0 +1,3 @@
+--format documentation
+--color
+--require spec_helper

data/Gemfile

@@ -1,6 +1,6 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in gray_scott_gtk3.gemspec
 gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Gray-Scott
 
-![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/master/screenshot/screenshot.png)
+![screenshot](https://raw.githubusercontent.com/kojix2/Gray-Scott/develop2/screenshot/screenshot.gif)
 
 ## Requirements
 

data/Rakefile

@@ -1,2 +1,6 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "gray_scott_gtk3"
+require 'bundler/setup'
+require 'gray_scott_gtk3'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "gray_scott_gtk3"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start(__FILE__)

data/exe/grayscott

@@ -1,6 +1,16 @@
 #!/usr/bin/env ruby
 
-require "gray_scott_gtk3"
+require 'gray_scott_gtk3'
+require 'optparse'
+
+opt = {}
+OptionParser.new do |op|
+  op.banner += ' msec'
+  op.on('-h val', '--height', 'height of the model') { |v| opt[:height] = v.to_i }
+  op.on('-w val', '--width', 'width of the model') { |v| opt[:width] = v.to_i }
+  op.version = GrayScottGtk3::VERSION
+  op.parse!(ARGV)
+end
 
 if ARGV[0]
   module GrayScottGtk3
@@ -11,13 +21,13 @@ else
   exit
 end
 
-module GrayScottGtk3 
+module GrayScottGtk3
   class << self
-    def run
+    def run(opt)
       xml_path = File.expand_path('../resources/', __dir__)
-      Controller.new xml_path
+      Controller.new(xml_path, opt)
     end
   end
 end
 
-GrayScottGtk3.run
+GrayScottGtk3.run(opt)

data/gray_scott_gtk3.gemspec

@@ -1,31 +1,30 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "gray_scott_gtk3/version"
+require 'gray_scott_gtk3/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "gray_scott_gtk3"
+  spec.name          = 'gray_scott_gtk3'
   spec.version       = GrayScottGtk3::VERSION
-  spec.authors       = ["kojix2"]
-  spec.email         = ["2xijok@gmail.com"]
+  spec.authors       = ['kojix2']
+  spec.email         = ['2xijok@gmail.com']
 
-  spec.summary       = %q{Gray-Scott model.}
-  spec.description   = %q{Gray-Scott model.}
-  spec.homepage      = "https://github.com/kojix2/Gray-Scott"
+  spec.summary       = 'Gray-Scott model.'
+  spec.description   = 'Reaction diffusion system (Gray-Scott model).'
+  spec.homepage      = 'https://github.com/kojix2/Gray-Scott'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "numo-narray"
-  spec.add_dependency "rsvg2"
-  spec.add_dependency "gtk3"
+  spec.add_dependency 'numo-narray'
+  spec.add_dependency 'gtk3'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec'
 end

data/lib/gray_scott_gtk3.rb

@@ -2,12 +2,12 @@ require 'numo/narray'
 require 'gtk3'
 
 module ShortNumo
-    N = Numo
-    class Numo::SFloat
-      alias _ inplace
-    end
-    SFloat = Numo::SFloat
-    UInt8  = Numo::UInt8
+  N = Numo
+  class Numo::SFloat
+    alias _ inplace
+  end
+  SFloat = Numo::SFloat
+  UInt8  = Numo::UInt8
 end
 
 require 'gray_scott_gtk3/model'

data/lib/gray_scott_gtk3/controller.rb

@@ -1,14 +1,16 @@
+require_relative 'controller/aboutdialog'
+
 module GrayScottGtk3
   class Controller
     include ShortNumo
     attr_accessor :resource_dir, :height, :width, :model
 
-    def initialize(dir)
+    def initialize(dir, height: 256, width: 256)
       @resource_dir = dir
-      @height = 256
-      @width = 256
+      @height = height
+      @width = width
       @model = Model.new(height: height, width: width)
-      @show_u = true
+      @show_u = false
       @color = 'colorful'
 
       builder = Gtk::Builder.new
@@ -21,17 +23,12 @@ module GrayScottGtk3
       builder.connect_signals { |handler| method(handler) }
 
       @win.show_all # window
+      on_new_clicked
       Gtk.main
     end
 
     def show_about
-      a = Gtk::AboutDialog.new
-      a.program_name = 'Gray-Scott'
-      a.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
-      a.authors = ['kojix2']
-      a.version = GrayScottGtk3::VERSION
-      a.run
-      a.destroy
+      AboutDialog.new resource_dir
     end
 
     def on_f_changed(f)
@@ -91,14 +88,6 @@ module GrayScottGtk3
 
     def on_new_clicked
       model.clear
-      if @show_u && !@doing_now
-        dialog = Gtk::MessageDialog.new(message: 'display V density',
-                                        type: :info,
-                                        tutton_type: :close)
-        dialog.run
-        @uv_combobox.active = 1 # v
-        dialog.destroy
-      end
       display_legend
       display
     end
@@ -118,7 +107,7 @@ module GrayScottGtk3
       x = e.x * width / 512
       y = e.y * height / 512
       r = @pen_radius.value
-      if x > r && y > r && x < (height - 1 - r) && y < (width - 1 - r)
+      if x > r && y > r && x < (width - 1 - r) && y < (height - 1 - r)
         model.v[(y - r)..(y + r), (x - r)..(x + r)] = @pen_density.value
       end
       display unless doing_now?

data/lib/gray_scott_gtk3/controller/aboutdialog.rb

@@ -0,0 +1,15 @@
+module GrayScottGtk3
+  class Controller
+    class AboutDialog
+      def initialize(resource_dir)
+        @a = Gtk::AboutDialog.new
+        @a.program_name = 'Gray-Scott'
+        @a.logo = GdkPixbuf::Pixbuf.new(file: File.join(resource_dir, 'about_icon.png'))
+        @a.authors = ['kojix2']
+        @a.version = GrayScottGtk3::VERSION
+        @a.run
+        @a.destroy
+      end
+    end
+  end
+end

data/lib/gray_scott_gtk3/model.rb

@@ -30,8 +30,8 @@ module GrayScottGtk3
       l_v = SFloat._laplacian2d v, Dx
 
       uvv = u * v * v
-      dudt = Du * l_u - uvv + @f * (1.0 - u)
-      dvdt = Dv * l_v + uvv - (@f + @k) * v
+      dudt = Du * l_u - uvv + f * (1.0 - u)
+      dvdt = Dv * l_v + uvv - (f + k) * v
       u._ + (Dt * dudt)
       v._ + (Dt * dvdt)
     end

data/lib/gray_scott_gtk3/version.rb

@@ -1,3 +1,3 @@
 module GrayScottGtk3
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

data/resources/gray_scott.glade

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.22.1 -->
 <interface>
-  <requires lib="gtk+" version="3.20"/>
+  <requires lib="gtk+" version="3.16"/>
   <object class="GtkAdjustment" id="f">
     <property name="upper">0.10000000000000001</property>
     <property name="value">0.040000000000000001</property>
@@ -142,7 +142,7 @@
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
                 <property name="use_stock">True</property>
-                <property name="image_position">bottom</property>
+                <property name="image_position">top</property>
                 <property name="always_show_image">True</property>
                 <signal name="clicked" handler="on_new_clicked" swapped="no"/>
               </object>
@@ -293,7 +293,7 @@
                   <object class="GtkComboBoxText" id="uv_combobox">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="active">0</property>
+                    <property name="active">1</property>
                     <items>
                       <item translatable="yes">U</item>
                       <item translatable="yes">V</item>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gray_scott_gtk3
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - kojix2
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-05 00:00:00.000000000 Z
+date: 2018-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rsvg2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +66,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Gray-Scott model.
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Reaction diffusion system (Gray-Scott model).
 email:
 - 2xijok@gmail.com
 executables:
@@ -89,8 +89,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - bin/console
@@ -99,11 +99,13 @@ files:
 - gray_scott_gtk3.gemspec
 - lib/gray_scott_gtk3.rb
 - lib/gray_scott_gtk3/controller.rb
+- lib/gray_scott_gtk3/controller/aboutdialog.rb
 - lib/gray_scott_gtk3/laplacian.rb
 - lib/gray_scott_gtk3/model.rb
 - lib/gray_scott_gtk3/version.rb
 - resources/about_icon.png
 - resources/gray_scott.glade
+- screenshot/screenshot.gif
 - screenshot/screenshot.png
 homepage: https://github.com/kojix2/Gray-Scott
 licenses: []

data/Gemfile.lock

@@ -1,56 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gray_scott_gtk3 (0.3.0)
-      gtk3
-      numo-narray
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    atk (3.3.0)
-      glib2 (= 3.3.0)
-    cairo (1.16.2)
-      native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    cairo-gobject (3.3.0)
-      cairo (>= 1.16.1)
-      glib2 (= 3.3.0)
-    gdk3 (3.3.0)
-      cairo-gobject (= 3.3.0)
-      gdk_pixbuf2 (= 3.3.0)
-      pango (= 3.3.0)
-    gdk_pixbuf2 (3.3.0)
-      gio2 (= 3.3.0)
-    gio2 (3.3.0)
-      glib2 (= 3.3.0)
-      gobject-introspection (= 3.3.0)
-    glib2 (3.3.0)
-      native-package-installer (>= 1.0.3)
-      pkg-config (>= 1.2.2)
-    gobject-introspection (3.3.0)
-      glib2 (= 3.3.0)
-    gtk3 (3.3.0)
-      atk (= 3.3.0)
-      gdk3 (= 3.3.0)
-      gdk_pixbuf2 (= 3.3.0)
-      gio2 (= 3.3.0)
-      pango (= 3.3.0)
-    native-package-installer (1.0.6)
-    numo-narray (0.9.1.3)
-    pango (3.3.0)
-      cairo-gobject (= 3.3.0)
-      gobject-introspection (= 3.3.0)
-    pkg-config (1.3.2)
-    rake (10.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.17)
-  gray_scott_gtk3!
-  rake (~> 10.0)
-
-BUNDLED WITH
-   1.17.1