imgen 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c9a29ba2563b85a704df9fb89fe9879a5029fc6f8ce2dfef30cf9bd34623750
-  data.tar.gz: fddee88aac43c24a990589b609ae0eaea97c50eddc64639861997ee6dc336f47
+  metadata.gz: 1bcf3df17cdbde3491532b639b733de6d24f5b2f507105dab5e55d46d2e4a059
+  data.tar.gz: f0c1ae27eb1ce10b29ca6a747a4ea66b47414dc16b5c5638261562e84a3d15b6
 SHA512:
-  metadata.gz: 6e37f7bce4fc4005aec148bd0dfd4aad4ebceb8e05b75f5e4272ddafa32e6d1488100d38af02fd14ca1dafd46b36ad5c81c2edcce3648a397a6e046a71a61b08
-  data.tar.gz: 2f05eecf2af088f0e7be383a3f057314d9803654b457a1809ddad2b8c7213118521b82175980b0ea4bef917090e42ef3e831e542d33239a84116e4f246c65c7a
+  metadata.gz: 1de67ec86dabccbc45d653ca9340f8a9207b28a962839cf3a8077df7fd11d5a1e925c4a521e4215453157dde861ae1cd85bf4d5dbee9b3bc7f273ae271da3632
+  data.tar.gz: 882529c032b94478bcfcbc550dfb86ae7ecb5673a806a07880f81e513f37913a8d465b4b46a401ce85a196942ab4b4a4f7488b59d6d19974dc423ba6f21d273a

data/bin/imgen

@@ -15,8 +15,10 @@ def parse_options
     :format => 'png',
     :quantity => 1,
     :method => :noise,
+    :filename_path => '',
     :debug => false,
-    :display => false
+    :display_x11 => false,
+    :display_imgcat => false
   }
 
   optparse = OptionParser.new do |opts|
@@ -47,12 +49,16 @@ def parse_options
       options[:method] = m
     end
 
-    opts.on('--debug', 'Display pixel debug information') do |debug|
+    opts.on('--debug', 'Display pixel debug information') do
       options[:debug] = true
     end
 
-    opts.on('--display', 'Display image using X11 after creation') do |bg|
-      options[:display] = true
+    opts.on('--display-x11', 'Display image using X11 after creation') do
+      options[:display_x11] = true
+    end
+
+    opts.on('--display-imgcat', 'Display image using imgcat after creation') do
+      options[:display_imgcat] = true
     end
 
     opts.on('-v', '--version', 'Display version number and exit') do

data/lib/imgen.rb

@@ -3,14 +3,15 @@ require 'fileutils'
 
 module Imgen
   class Image
+    MAX = Magick::QuantumRange
 
     # main entry point
     def initialize(options)
       1.upto(options[:quantity]) do
         img = Magick::Image.new(options[:width], options[:height])
+        #img.colorspace = Magick::RGBColorspace
         colors = {r: 0, g: 0, b: 0}
-        color_dominant = colors.keys.to_a.sample
-        options[:color_dominant] = color_dominant
+        options[:color_dominant] = colors.keys.to_a.sample
 
         make_image(img, options)
       end
@@ -21,6 +22,7 @@ module Imgen
       last_pixel = {}
       new_pixel = {}
 
+      # iterate over each pixel
       (0..img.columns).each do |x|
         (0..img.rows).each do |y|
           case options[:method]
@@ -34,31 +36,61 @@ module Imgen
                 new_pixel[options[:color_dominant]] = rand(-10..10) + last_pixel[options[:color_dominant]]
               end
             else
-              new_pixel[:r] = (options[:color_dominant] == :r) ? rand(0..100) : 0
-              new_pixel[:g] = (options[:color_dominant] == :g) ? rand(0..100) : 0
-              new_pixel[:b] = (options[:color_dominant] == :b) ? rand(0..100) : 0
-              new_pixel[:a] = rand(0..100)
+              new_pixel = make_new_pixel(options[:color_dominant])
             end
           when :noise
-            new_pixel[:r] = (options[:color_dominant] == :r) ? rand(0..100) : 0
-            new_pixel[:g] = (options[:color_dominant] == :g) ? rand(0..100) : 0
-            new_pixel[:b] = (options[:color_dominant] == :b) ? rand(0..100) : 0
-            new_pixel[:a] = rand(0..100)
+            new_pixel = make_new_pixel(options[:color_dominant])
           end
 
-          img.pixel_color(x,y,"rgba(#{new_pixel[:r]}%, #{new_pixel[:g]}%, #{new_pixel[:b]}%, #{new_pixel[:a]}%)")
-          last_pixel = {r: new_pixel[:r], g: new_pixel[:g], b: new_pixel[:b], a: new_pixel[:a]}
+          pixel = Magick::Pixel.new(
+            new_pixel[:r],
+            new_pixel[:g],
+            new_pixel[:b],
+            new_pixel[:a]
+          )
+
+          # change pixel color
+          img.pixel_color(x, y, pixel)
+
+          # save values of last color change
+          last_pixel = new_pixel
 
           if options[:debug]
-            print "R#{new_pixel[:r].to_s.ljust(3)}"
-            print "G#{new_pixel[:g].to_s.ljust(3)}"
-            print "B#{new_pixel[:b].to_s.ljust(3)}"
-            print "A#{new_pixel[:a].to_s.ljust(3)}| "
+            print "R#{new_pixel[:r].to_s.ljust(3)} "
+            print "G#{new_pixel[:g].to_s.ljust(3)} "
+            print "B#{new_pixel[:b].to_s.ljust(3)} "
+            print "A#{new_pixel[:a].to_s.ljust(3)}|"
           end
         end
+
         print "\n" if options[:debug]
       end
 
+      write_image_to_file(img, options)
+
+      display_image(img, options)
+    end
+
+    # overwrite pixel with new color
+    def make_new_pixel(color_dominant)
+      clr_strong = rand(0..MAX)
+
+      case color_dominant
+      when :r
+        new_pixel = {:r => clr_strong, :g => clr_strong / 2, :b => clr_strong / 2}
+      when :g
+        new_pixel = {:r => clr_strong / 2, :g => clr_strong, :b => clr_strong / 2}
+      when :b
+        new_pixel = {:r => clr_strong / 2, :g => clr_strong / 2, :b => clr_strong}
+      end
+
+      new_pixel[:a] = rand(0..MAX)
+
+      return new_pixel
+    end
+
+    # write image to disk
+    def write_image_to_file(img, options)
       img_dir = options[:directory]
       img_ext = options[:format]
 
@@ -68,26 +100,38 @@ module Imgen
 
       counter = 0
       img_uniq = "_0"
-      filename_path = "#{img_dir}/#{options[:width]}x#{options[:height]}#{img_uniq}.#{img_ext}"
+      options[:filename_path] = "#{img_dir}/#{options[:width]}x#{options[:height]}#{img_uniq}.#{img_ext}"
 
-      until !File.exists?(filename_path)
+      until !File.exists?(options[:filename_path])
         counter += 1
         img_uniq = "_" + counter.to_s
-        filename_path = "#{img_dir}/#{options[:width]}x#{options[:height]}#{img_uniq}.#{img_ext}"
+        options[:filename_path] = "#{img_dir}/#{options[:width]}x#{options[:height]}#{img_uniq}.#{img_ext}"
       end
 
-      puts "writing #{filename_path} to disk"
-      img.write(filename_path)
+      puts "writing #{options[:filename_path]} to disk"
+
+      begin
+        img.write(options[:filename_path])
+      rescue
+        puts 'error writing image to disk'
+      end
+    end
 
-      if options[:display]
+    # optionally display image after creation
+    def display_image(img, options)
+      if options[:display_x11]
         begin
-          puts "displaying #{filename_path} in X11..."
           img.display
         rescue
-          puts "could not display #{filename_path}"
+          puts "could not display #{options[:filename_path]}"
+        end
+      elsif options[:display_imgcat]
+        begin
+          system("imgcat #{options[:filename_path]}")
+        rescue
+          puts "could not display #{options[:filename_path]}"
         end
       end
     end
-
   end
 end

data/lib/imgen/version.rb

@@ -1,3 +1,3 @@
 module Imgen
-  VERSION = '0.1.3'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgen
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Michael Chadwick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick