pxlsrt 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5307d37f9c289e44ebcef491140425fb87cc323
-  data.tar.gz: 81efa6032e867501ed264d23c9c2d4947c9ea5d6
+  metadata.gz: fa77df27b6a2bcd94f0b1e23855baa5219e25f16
+  data.tar.gz: a3b71ee3d6f67fb348628bd917491db1193474bf
 SHA512:
-  metadata.gz: 50ac440bddb401a3c52d563f2d99c8ad46dcbec066b09047faa4cbe0cafc8997521a42a6cb920c6191543773311795d62d4a8609db1cc746c34048f33f9a28ea
-  data.tar.gz: 7f12f4968efc0759d276536eeea135efb4e02ef334fb2067d717c29ad641d44c13c300f80e4cc920538301f4d652ee06e3bac33b211375a8f53359f0d6706409
+  metadata.gz: 6dd4f1a8187e9ccf3bab9e7735a190f53491404caa40bc3ae776b53077b4193cb820a62ce6973151aa613bf0beed0b3d76193c69bdd53b66644445155197a72f
+  data.tar.gz: 43d0246a46cebfce1a22e4e817a65c8ead7fb5efd40f8daa4a0a5850ba054030b3f485701cc1191ec42bb846baf8a849e85eb8af99ef190534383eb98fdfa0ac

data/bin/pxlsrt

@@ -59,7 +59,7 @@ class CLI < Thor
 
 	option :method, :type => :string, :default => "brightness", :aliases => "-m", :enum => ["brightness", "white", "black"]
 	option :value, :type => :numeric, :aliases => "-v"
-	desc "kim INPUT OUTPUT [outputs]", "Uses Kim Asendorf's algorithm"
+	desc "kim INPUT OUTPUT [options]", "Uses Kim Asendorf's algorithm"
 	def kim(input, output)
 		k= {:trusted => true}
 		for o in options.keys
@@ -67,6 +67,32 @@ class CLI < Thor
 		end
 		Pxlsrt::Kim.suite(input, output, k)
 	end
+
+	option :reverse, :default => false, :aliases => "-r"
+	option :smooth, :type => :boolean, :default => false, :aliases => "-s"
+	option :method, :type => :string, :default => "sum-rgb", :banner => "[#{Pxlsrt::Colors::METHODS.join(" | ")}]", :aliases => "-m", :enum => Pxlsrt::Colors::METHODS
+	option :middle, :default => false, :aliases => "-M"
+	option :random, :default => false, :aliases => "-R"
+	option :distance, :default => 100, :aliases => "-d"
+	option :threshold, :default => 0.1, :aliases => "-t", :type => :numeric
+	desc "seed INPUT OUTPUT [options]", "Seed pixel sorting"
+	def seed(input, output)
+		k={:trusted=>true}
+		for o in options.keys
+			k[o.to_sym]=options[o]
+		end
+		if Pxlsrt::Helpers.isNumeric?(k[:random])
+			k[:random] = k[:random].to_i
+		else
+			k[:random] = false
+		end
+		if Pxlsrt::Helpers.isNumeric?(k[:distance])
+			k[:distance] = k[:distance].to_i
+		else
+			k[:distance] = false
+		end
+		Pxlsrt::Seed.suite(input, output, k)
+	end
 end
 
 CLI.start(ARGV)

data/lib/pxlsrt/seed.rb

@@ -0,0 +1,209 @@
+require 'oily_png'
+
+module Pxlsrt
+	##
+	# Plant seeds, have them spiral out and sort.
+	class Seed
+		##
+		# Uses Pxlsrt::Seed.seed to input and output from one method.
+		def self.suite(inputFileName, outputFileName, o={})
+			kml = Pxlsrt::Seed.seed(inputFileName, o)
+			if Pxlsrt::Helpers.contented(kml)
+				kml.save(outputFileName)
+			end
+		end
+		##
+		# The main attraction of the Seed class. Returns a ChunkyPNG::Image that is sorted according to the options provided. Will raise any error that occurs.
+		def self.seed(input, o = {})
+			startTime = Time.now
+			defOptions = {
+				:reverse => false,
+				:smooth => false,
+				:method => "sum-rgb",
+				:verbose => false,
+				:trusted => false,
+				:middle => false,
+				:random => false,
+				:distance => 100,
+				:threshold => 0.1
+			}
+			defRules = {
+				:reverse => :anything,
+				:smooth => [false, true],
+				:method => Pxlsrt::Colors::METHODS,
+				:verbose => [false, true],
+				:trusted => [false, true],
+				:middle => :anything,
+				:random => [false, {:class => [Fixnum]}],
+				:distance => [false, {:class => [Fixnum]}],
+				:threshold => [{:class => [Float, Fixnum]}]
+			}
+			options = defOptions.merge(o)
+			if o.length == 0 or options[:trusted] == true or (options[:trusted] == false and o.length != 0 and Pxlsrt::Helpers.checkOptions(options, defRules) != false)
+				if input.class == String
+					Pxlsrt::Helpers.verbose("Getting image from file...") if options[:verbose]
+					if File.file?(input)
+						if Pxlsrt::Colors.isPNG?(input)
+							input = ChunkyPNG::Image.from_file(input)
+						else
+							Pxlsrt::Helpers.error("File #{input} is not a valid PNG.") if options[:verbose]
+							raise "Invalid PNG"
+						end
+					else
+						Pxlsrt::Helpers.error("File #{input} doesn't exist!") if options[:verbose]
+						raise "File doesn't exit"
+					end
+				elsif input.class != String and input.class != ChunkyPNG::Image
+					Pxlsrt::Helpers.error("Input is not a filename or ChunkyPNG::Image") if options[:verbose]
+					raise "Invalid input (must be filename or ChunkyPNG::Image)"
+				end
+				Pxlsrt::Helpers.verbose("Seed mode.") if options[:verbose]
+				Pxlsrt::Helpers.verbose("Creating Pxlsrt::Image object") if options[:verbose]
+				png = Pxlsrt::Image.new(input)
+				traversed = [false] * (png.getWidth * png.getHeight)
+				count = 0
+				seeds = []
+				if options[:random] != false
+					Pxlsrt::Helpers.progress("Planting seeds", 0, options[:random]) if options[:verbose]
+					for s in (0...options[:random])
+						x = (0...png.getWidth).to_a.sample
+						y = (0...png.getHeight).to_a.sample
+						seeds.push({
+							:spiral => Pxlsrt::Spiral.new(x, y),
+							:pixels => [png[x, y]],
+							:xy => [{:x => x, :y=>y}],
+							:placed => true,
+							:retired => false,
+							:anchor => {
+								:x => x,
+								:y => y
+							}
+						})
+						Pxlsrt::Helpers.progress("Planting seeds", s + 1, options[:random]) if options[:verbose]
+					end
+				else
+					Pxlsrt::Helpers.progress("Planting seeds", 0, png.getWidth * png.getHeight) if options[:verbose]
+					kernel = [[-1, -1, -1], [-1, 9, -1], [-1, -1, -1]]
+					i = (png.getWidth + png.getHeight - 2) * 2
+					for y in (1...(png.getHeight - 1))
+						for x in (1...(png.getWidth - 1))
+							sum = 0
+							for ky in ((-1)..1)
+								for kx in ((-1)..1)
+									sum += kernel[ky + 1][kx + 1] * (ChunkyPNG::Color.r(png[x + kx, y + ky]))
+								end
+							end
+							if sum < options[:threshold]
+								seeds.push({
+									:spiral => Pxlsrt::Spiral.new(x, y),
+									:pixels => [png[x, y]],
+									:xy => [{:x => x, :y=>y}],
+									:placed => true,
+									:retired => false,
+									:anchor => {
+										:x => x,
+										:y => y
+									}
+								})
+							end
+							i += 1
+							Pxlsrt::Helpers.progress("Planting seeds", i, png.getWidth * png.getHeight) if options[:verbose]
+						end
+					end
+					if options[:distance] != false
+						Pxlsrt::Helpers.progress("Removing seed clusters", 0, seeds.length) if options[:verbose]
+						results = []
+						i = 0
+						for current in seeds
+							add = true
+						  	for other in results
+						    	d = Math.sqrt((current[:anchor][:x] - other[:anchor][:x]) ** 2 + (current[:anchor][:y] - other[:anchor][:y]) ** 2)
+						    	add = false if d > 0 and d < options[:distance]
+						  	end
+						  	if add
+							  	results.push(current)
+							end
+							i += 1
+							Pxlsrt::Helpers.progress("Removing seed clusters", i, seeds.length) if options[:verbose]
+						end
+						seeds = results
+					end
+				end
+				for r in (0...seeds.length)
+					traversed[seeds[r][:anchor][:x] + seeds[r][:anchor][:y] * png.getWidth] = r
+					count += 1
+				end
+				Pxlsrt::Helpers.verbose("Planted #{seeds.length} seeds") if options[:verbose]
+				step = 0
+				Pxlsrt::Helpers.progress("Watch them grow!", count, traversed.length) if options[:verbose]
+				while count < traversed.length and seeds.length != 0
+					r = 0
+					retired = []
+					for seed in seeds
+						if !seed[:retired]
+							n = seed[:spiral].next
+							if n[:x] >= 0 and n[:y] >= 0 and n[:x] < png.getWidth and n[:y] < png.getHeight and !traversed[n[:x] + n[:y] * png.getWidth]
+								seed[:pixels].push(png[n[:x], n[:y]])
+								traversed[n[:x] + n[:y] * png.getWidth] = r
+								seed[:xy].push(n)
+								seed[:placed] = true
+								count += 1
+							else
+								if seed[:placed] == true
+									seed[:placed] = {
+										:count => 1,
+										:direction => seed[:spiral].direction,
+										:cycle => seed[:spiral].cycles
+									}
+									case seed[:placed][:direction]
+									when "up", "down"
+										seed[:placed][:value] = seed[:spiral].pos[:y]
+										seed[:placed][:valueS] = :y
+									when "left", "right"
+										seed[:placed][:value] = seed[:spiral].pos[:x]
+										seed[:placed][:valueS] = :x
+									end
+								else
+									seed[:placed][:count] += 1
+									if seed[:spiral].cycles != seed[:placed][:cycle] and seed[:placed][:direction] == seed[:spiral].direction and seed[:placed][:value] == seed[:spiral].pos[seed[:placed][:valueS]]
+										seed[:retired] = true
+									end
+								end
+							end
+						end
+						r += 1
+					end
+					step += 1
+					Pxlsrt::Helpers.progress("Watch them grow!", count, traversed.length) if options[:verbose]
+				end
+				Pxlsrt::Helpers.progress("Sort seeds and place pixels", 0, seeds.length) if options[:verbose]
+				r = 0
+				for seed in seeds
+					spiral = Pxlsrt::Spiral.new(seed[:anchor][:x], seed[:anchor][:y])
+					band = Pxlsrt::Helpers.handlePixelSort(seed[:pixels], options)
+					i = 0
+					for k in seed[:xy]
+						png[k[:x], k[:y]] = band[i]
+						i += 1
+					end
+					r += 1
+					Pxlsrt::Helpers.progress("Sort seeds and place pixels", r, seeds.length) if options[:verbose]
+				end
+				endTime=Time.now
+				timeElapsed=endTime-startTime
+				if timeElapsed < 60
+					Pxlsrt::Helpers.verbose("Took #{timeElapsed.round(4)} second#{ timeElapsed!=1.0 ? "s" : "" }.") if options[:verbose]
+				else
+					minutes=(timeElapsed/60).floor
+					seconds=(timeElapsed % 60).round(4)
+					Pxlsrt::Helpers.verbose("Took #{minutes} minute#{ minutes!=1 ? "s" : "" } and #{seconds} second#{ seconds!=1.0 ? "s" : "" }.") if options[:verbose]
+				end
+				Pxlsrt::Helpers.verbose("Returning ChunkyPNG::Image...") if options[:verbose]
+				return png.returnModified
+			else
+				Pxlsrt::Helpers.error("Options specified do not follow the correct format.") if options[:verbose]
+				raise "Bad options"
+			end
+		end
+	end
+end

data/lib/pxlsrt/spiral.rb

@@ -0,0 +1,84 @@
+module Pxlsrt
+	##
+	# Spiral iteration.
+	class Spiral
+		def initialize(x, y)
+			@x = x
+			@y = y
+			@direction = "up"
+			@step = 1
+			@at = 0
+			@count = 0
+			@cycles = -1
+		end
+		##
+		# Return current x value.
+		def x
+			return @x
+		end
+		##
+		# Return current y value.
+		def y
+			return @y
+		end
+		##
+		# Return current direction.
+		def direction
+			return @direction
+		end
+		##
+		# Return amount iterated.
+		def count
+			return @count
+		end
+		##
+		# Return cycles gone through completely.
+		def cycles
+			return @cycles
+		end
+		##
+		# Return current position.
+		def pos
+			return {:x => @x, :y => @y}
+		end
+		##
+		# Goes to next position. Returns position.
+		def next
+			case @direction
+			when "left"
+				@x -= 1
+				@at += 1
+				if @at == @step
+					@direction = "down"
+					@at = 0
+					@step += 1
+				end
+			when "down"
+				@y += 1
+				@at += 1
+				if @at == @step
+					@direction = "right"
+					@at = 0
+				end
+			when "right"
+				@x += 1
+				@at += 1
+				if @at == @step
+					@direction = "up"
+					@at = 0
+					@step += 1
+				end
+			when "up"
+				@cycles += 1 if @at == 0
+				@y -= 1
+				@at += 1
+				if @at == @step
+					@direction = "left"
+					@at = 0
+				end
+			end
+			@count += 1
+			return pos
+		end
+	end
+end

data/lib/pxlsrt/version.rb

@@ -1,5 +1,5 @@
 ##
 # The main module, your best friend.
 module Pxlsrt
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

data/lib/pxlsrt.rb

@@ -5,4 +5,6 @@ require "pxlsrt/image"
 require "pxlsrt/colors"
 require "pxlsrt/brute"
 require "pxlsrt/smart"
-require "pxlsrt/kim"
+require "pxlsrt/kim"
+require "pxlsrt/spiral"
+require "pxlsrt/seed"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxlsrt
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - EVA-01
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -82,7 +82,9 @@ files:
 - lib/pxlsrt/image.rb
 - lib/pxlsrt/kim.rb
 - lib/pxlsrt/lines.rb
+- lib/pxlsrt/seed.rb
 - lib/pxlsrt/smart.rb
+- lib/pxlsrt/spiral.rb
 - lib/pxlsrt/version.rb
 homepage: https://github.com/EVA-01/pxlsrt
 licenses: