kaki-lifegame 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7107f04a0136d027aa9e3decf4645d8e901c8d4
-  data.tar.gz: 85357842f26ccc0e68305ce77367468c2a7378df
+  metadata.gz: 89a6f9f72edd2d93a8bedfdb4203426517422582
+  data.tar.gz: 99fcc35b4a6d739bc2ad394976c264588bd05b2b
 SHA512:
-  metadata.gz: '0792b68d8e37e7977d4b19fa68072b6ab3f6d0383903048093615eb48067a7b3bcf7c7c6d1eb90dee3ada2b4e4619ba0314ca236e2420a039745796014329cc0'
-  data.tar.gz: 14a770f488c6aebcaa3d51dce71380bd46d3a29265e7f58d4c3671bf536deb5113e524bdaa92e789ede7ae38a03b2886daa0fd1a98ec4cf8291413c2847fcaa4
+  metadata.gz: 187b2b4f5122d8abe47fb33956742f80e19719ed68f4b8558dc9735cca698225ed31cff6af052fa222db617859bca3c38a69ed5abea888852ee4c68c18a3c3a8
+  data.tar.gz: 4bb812802145dd5828377f6c304d39a9c4d59aa003a7e14f6ba6aff85e52955a99a0d64016af988b809894269bc6d6e245133a197b012211ae5538da9e26e576

data/example_data/kaki-lifegame_field_sample1.dat

@@ -1,3 +1,4 @@
+Size : (large)
 Step : 0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

data/lib/kaki-lifegame.rb

@@ -2,17 +2,19 @@ require 'gtk2'
 
 module LifeGame
   class Field
-    Width, Height = 85, 60
     MG = 4
     
     def initialize
+      @width, @height = 70, 50
+      @size = :small
       clear
       @step = @stored_step = 0
       @reserved = copy
       @store = []
     end
-    attr_reader :step
-    
+    attr_reader :step, :size
+    attr_accessor :width, :height
+
     def set_cell(x, y)
       @field[y + MG][x + MG] = 1
     end
@@ -48,13 +50,13 @@ module LifeGame
     end
     
     def each_cell
-      (Height + (MG - 1) * 2).times do |y|
-        (Width + (MG - 1) * 2).times {|x| yield(x - MG + 1, y - MG + 1)}
+      (@height + (MG - 1) * 2).times do |y|
+        (@width + (MG - 1) * 2).times {|x| yield(x - MG + 1, y - MG + 1)}
       end
     end
     
     def new_field
-      Array.new(Height + MG * 2) {Array.new(Width + MG * 2, 0)}
+      Array.new(@height + MG * 2) {Array.new(@width + MG * 2, 0)}
     end
     
     def copy
@@ -84,17 +86,27 @@ module LifeGame
     end
     
     def load(file_name)
-      @field = []
+      size = nil
       open(file_name, "r") do |io|
+        m = /^Size : \((.+)\)$/.match(io.gets.chomp)
+        unless m
+          puts "読み込みエラーです"
+          break
+        end
+        @field = []
+        size = m[1].to_sym
         @step = io.gets.chomp.scan(/\d+/)[0].to_i
         io.each_line do |line|
           @field << line.chomp.split(",").map(&:to_i)
         end
       end
+      return false unless size
+      change_window_size(size, false)
     end
     
     def save(file_name)
       open(file_name, "w") do |io|
+        io.puts "Size : (#{@size.to_s})"
         io.puts "Step : #{@step}"
         @field.each {|x| io.puts x.map(&:to_s).join(",")}
       end
@@ -113,6 +125,17 @@ module LifeGame
       @field = @store.pop
       @step -= 1
     end
+    
+    def change_window_size(size, f = true)
+      return false if @size == size
+      @size = size
+      @width, @height = (@size == :small) ? [70, 50] : [85, 60]
+      clear if f
+      @step = @stored_step = 0
+      @reserved = copy
+      @store = []
+      true
+    end
   end
   
   class FieldArea < Gtk::DrawingArea
@@ -120,13 +143,14 @@ module LifeGame
     Space = 1
     
     L = CellSize + Space * 2
-    AreaW, AreaH = Field::Width * L, Field::Height * L
     
     WaitChange = 50
     
     def initialize(field)
       super()
-      set_size_request(AreaW, AreaH)
+      
+      @areaw, @areah = field.width * L, field.height * L
+      set_size_request(@areaw, @areah)
       
       @f = field
       
@@ -169,6 +193,7 @@ module LifeGame
       set_wait_time
     end
     attr_writer :time_goes, :label1, :label2
+    attr_reader :areaw, :areah, :size
     
     def set_color(color_name)
       @gc.rgb_fg_color = @color[color_name]
@@ -220,8 +245,8 @@ module LifeGame
     end
     
     def each_cell
-      Field::Height.times do |y|
-        Field::Width.times {|x| yield(x, y)}
+      @f.height.times do |y|
+        @f.width.times {|x| yield(x, y)}
       end
     end
     
@@ -235,7 +260,7 @@ module LifeGame
     def scatter
       co1 = co2 = 0
       while co1 < 100 and co2 < 5000
-        x, y = rand(Field::Width), rand(Field::Height)
+        x, y = rand(@f.width), rand(@f.height)
         if @f.get_cell(x, y).zero?
           set_cell(x, y)
           co1 += 1
@@ -250,14 +275,16 @@ module LifeGame
     end
     
     def load_file(file_name)
-      @f.load(file_name)
+      is_change = @f.load(file_name)
+      area_size_change if is_change
       redraw
       show_step
+      return is_change
     end
     
     def background_renewal
       set_color(@grid ? :grid_color : :black)
-      window.draw_rectangle(@gc, true, 0, 0, AreaW, AreaH)
+      window.draw_rectangle(@gc, true, 0, 0, @areaw, @areah)
       redraw
     end
     
@@ -301,13 +328,31 @@ module LifeGame
       redraw
       show_step
     end
+    
+    def change_window_size(size)
+      if @f.change_window_size(size)
+        area_size_change
+        show_step
+        true
+      else
+        false
+      end
+    end
+    
+    def area_size_change
+      @areaw, @areah = @f.width * L, @f.height * L
+    end
   end
   
   class SideBar < Gtk::VBox
-    def initialize(field_area)
+    MGN = 3
+    SideBar_W = 130
+    
+    def initialize(field_area, main_window)
       super()
-      set_size_request(130, FieldArea::AreaH)
+      set_size_request(SideBar_W, field_area.areah)
       @farea = field_area
+      @mainw = main_window
       @edit_mode = true
       
       set_box1
@@ -347,12 +392,12 @@ module LifeGame
       
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(start_bt, false, false, 5)
-      box.pack_start(stop_bt , false, false, 5)
-      box.pack_start(step_bt , false, false, 5)
-      box.pack_start(back_bt , false, false, 5)
-      box.pack_start(l, false, false, 5)
-      box.pack_start(Gtk::HSeparator.new, false, false, 10)
+      box.pack_start(start_bt, false, false, MGN)
+      box.pack_start(stop_bt , false, false, MGN)
+      box.pack_start(step_bt , false, false, MGN)
+      box.pack_start(back_bt , false, false, MGN)
+      box.pack_start(l, false, false, MGN)
+      box.pack_start(Gtk::HSeparator.new, false, false, 5)
     end
     
     def set_box2
@@ -384,10 +429,10 @@ module LifeGame
       
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(l1       , false, false, 5)
-      box.pack_start(small_box, false, false, 5)
-      box.pack_start(l2       , false, false, 5)
-      box.pack_start(Gtk::HSeparator.new, false, false, 10)
+      box.pack_start(l1       , false, false, MGN)
+      box.pack_start(small_box, false, false, MGN)
+      box.pack_start(l2       , false, false, MGN)
+      box.pack_start(Gtk::HSeparator.new, false, false, 5)
     end
     
     def set_box3
@@ -423,11 +468,11 @@ module LifeGame
       
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(scatter_bt, false, false, 5)
-      box.pack_start(grid_bt   , false, false, 5)
-      box.pack_start(small_box , false, false, 5)
-      box.pack_start(clear_bt  , false, false, 5)
-      box.pack_start(Gtk::HSeparator.new, false, false, 10)
+      box.pack_start(scatter_bt, false, false, MGN)
+      box.pack_start(grid_bt   , false, false, MGN)
+      box.pack_start(small_box , false, false, MGN)
+      box.pack_start(clear_bt  , false, false, MGN)
+      box.pack_start(Gtk::HSeparator.new, false, false, 5)
     end
     
     def set_box4
@@ -444,9 +489,9 @@ module LifeGame
       
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(preserve_bt, false, false, 5)
-      box.pack_start(restore_bt , false, false, 5)
-      box.pack_start(Gtk::HSeparator.new, false, false, 10)
+      box.pack_start(preserve_bt, false, false, MGN)
+      box.pack_start(restore_bt , false, false, MGN)
+      box.pack_start(Gtk::HSeparator.new, false, false, 5)
     end
     
     def set_box5
@@ -463,27 +508,52 @@ module LifeGame
       load_bt.signal_connect("clicked") do
         if @edit_mode
           file_name = select_file("Load File", Gtk::FileChooser::ACTION_OPEN)
-          @farea.load_file(file_name) if file_name
+          if file_name
+            main_window_change(@farea.load_file(file_name))
+          end
         end
       end
       
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(save_bt, false, false, 5)
-      box.pack_start(load_bt, false, false, 5)
-      box.pack_start(Gtk::HSeparator.new, false, false, 10)
+      box.pack_start(save_bt, false, false, MGN)
+      box.pack_start(load_bt, false, false, MGN)
+      box.pack_start(Gtk::HSeparator.new, false, false, MGN)
     end
     
     def set_box6
       close_bt = Gtk::Button.new("終了")
+      large_bt = Gtk::Button.new("大")
+      small_bt = Gtk::Button.new("小")
       
       close_bt.signal_connect("clicked") do
         Gtk.main_quit if @edit_mode
       end
       
+      large_bt.signal_connect("clicked") do
+        change_window_size(:large) if @edit_mode
+      end
+      
+      small_bt.signal_connect("clicked") do
+        change_window_size(:small) if @edit_mode
+      end
+      
+      small_box = Gtk::HBox.new
+      small_box.pack_start(large_bt , true, true, 1)
+      small_box.pack_start(small_bt, true, true, 1)
+      
       box = Gtk::VBox.new
       pack_start(box, false, false, 0)
-      box.pack_start(close_bt, false, false, 5)
+      box.pack_start(small_box, false, false, MGN)
+      box.pack_start(close_bt , false, false, MGN)
+    end
+    
+    def change_window_size(size)
+      main_window_change(@farea.change_window_size(size))
+    end
+    
+    def main_window_change(is_change)
+      @mainw.set_size_request(@farea.areaw + SideBar_W, @farea.areah) if is_change
     end
     
     def select_file(title, mode)
@@ -507,12 +577,12 @@ module LifeGame
       
       field = Field.new
       field_area = FieldArea.new(field)
-      side_bar = SideBar.new(field_area)
+      side_bar = SideBar.new(field_area, self)
       
       box = Gtk::HBox.new
       add(box)
-      box.pack_start(field_area, true, true, 0)
-      box.pack_start(side_bar  , true, true, 0)
+      box.pack_start(field_area, true , true, 0)
+      box.pack_start(side_bar  , false, true, 0)
       
       signal_connect("destroy") {Gtk.main_quit}
       show_all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaki-lifegame
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - obelisk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2