pxlsrt 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9904ad442d8b272d6aa9e196085efc13e9e6c0e
-  data.tar.gz: 145c0cae2d397312d85a4c3627581eb2076a95a8
+  metadata.gz: 656493d31b58b436d501a9211402394cb3527753
+  data.tar.gz: ab1f3e92f84610d992a7bf1295db33e556309ec6
 SHA512:
-  metadata.gz: 2fc1fd26d049302824076066ec5a495ba27f76402263e20aba2a02dd673357a6b46d4b5685bea5a1c6935ad51512ba566ded3ee43b0f786f0e1baf1dd80aa25d
-  data.tar.gz: 204629fbe1687469b21fea3f1bf2a94350fa2ad1b657625cbd753cf11a9ddba06a683542bc470678cab1116720263ba491ca3190368b6d058ce8d4ed7e3e3dd9
+  metadata.gz: 8acafe9a33025af289c5753f8abb320f87cb16633fefa9b43b2008dfec9193917bc8386d9fec9896901c5229b301a3c5de59222622ef2767050ffec70b2cbb64
+  data.tar.gz: 952ada3617bb2514ff162c466b9f7935aab2e6ff396201a2b1e614739c431652a4dfd36934597da519f6ed1bbb237d2008a27d11f9136050ae3f17e4b041c842

data/bin/pxlsrt

@@ -20,6 +20,7 @@ class CLI < Thor
 	class_option :smooth, :type => :boolean, :default => false, :aliases => "-s"
 	class_option :method, :type => :string, :default => "sum-rgb", :banner => "[sum-rgb | red | green | blue | sum-hsb | hue | saturation | brightness | uniqueness | luma | random | cyan | magenta | yellow | alpha | sum-rgba | sum-hsba]", :aliases => "-m", :enum => ["sum-rgb", "red", "green", "blue", "sum-hsb", "hue", "saturation", "brightness", "uniqueness", "luma", "random", "cyan", "magenta", "yellow", "alpha", "sum-rgba", "sum-hsba"]
 	class_option :verbose, :type => :boolean, :default => false, :aliases => "-V"
+	class_option :middle, :type => :boolean, :default => false, :aliases => "-M"
 
 	option :min, :type => :numeric, :default => Float::INFINITY, :banner => "MINIMUM BANDWIDTH"
 	option :max, :type => :numeric, :default => Float::INFINITY, :banner => "MAXIMUM BANDWIDTH"

data/lib/pxlsrt/brute.rb

@@ -27,7 +27,8 @@ module Pxlsrt
 				:verbose => false,
 				:min => Float::INFINITY,
 				:max => Float::INFINITY,
-				:trusted => false
+				:trusted => false,
+				:middle => false
 			}
 			defRules={
 				:reverse => ["no", "reverse", "either"],
@@ -38,7 +39,8 @@ module Pxlsrt
 				:verbose => [false, true],
 				:min => [Float::INFINITY, {:class => [Fixnum]}],
 				:max => [Float::INFINITY, {:class => [Fixnum]}],
-				:trusted => [false, true]
+				:trusted => [false, true],
+				:middle => [false, true]
 			}
 			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)
@@ -91,12 +93,14 @@ module Pxlsrt
 						newInTown=[]
 						if options[:smooth]!=true
 							for ranger in sliceRanges
-								newInTown.concat(Pxlsrt::Colors.pixelSort(m[ranger[0]..ranger[1]], options[:method].downcase, nre))
+								newInTown.concat(Pxlsrt::Lines.middlate(Pxlsrt::Colors.pixelSort(m[ranger[0]..ranger[1]], options[:method].downcase, nre))) if options[:middle]
+								newInTown.concat(Pxlsrt::Colors.pixelSort(m[ranger[0]..ranger[1]], options[:method].downcase, nre)) if !options[:middle]
 							end
 						else
 							for ranger in sliceRanges
 								k=(m[ranger[0]..ranger[1]]).group_by { |x| x }
 								g=Pxlsrt::Colors.pixelSort(k.keys, options[:method].downcase, nre)
+								g=Pxlsrt::Lines.middlate(g) if options[:middle]
 								j=g.map { |x| k[x] }.flatten(1)
 								newInTown.concat(j)
 							end
@@ -112,12 +116,14 @@ module Pxlsrt
 						newInTown=[]
 						if options[:smooth]!=true
 							for ranger in sliceRanges
-								newInTown.concat(Pxlsrt::Colors.pixelSort(dia[m][ranger[0]..ranger[1]], options[:method].downcase, nre))
+								newInTown.concat(Pxlsrt::Lines.middlate(Pxlsrt::Colors.pixelSort(dia[m][ranger[0]..ranger[1]], options[:method].downcase, nre))) if options[:middle]
+								newInTown.concat(Pxlsrt::Colors.pixelSort(dia[m][ranger[0]..ranger[1]], options[:method].downcase, nre)) if !options[:middle]
 							end
 						else
 							for ranger in sliceRanges
 								k=(dia[m][ranger[0]..ranger[1]]).group_by { |x| x }
 								g=Pxlsrt::Colors.pixelSort(k.keys, options[:method].downcase, nre)
+								g=Pxlsrt::Lines.middlate(g) if options[:middle]
 								j=g.map { |x| k[x] }.flatten(1)
 								newInTown.concat(j)
 							end

data/lib/pxlsrt/lines.rb

@@ -25,6 +25,21 @@ module Pxlsrt
 			return nu
 		end
 		##
+		# Some fancy rearranging.
+		# [a, b, c, d, e] -> [d, b, a, c, e]
+		def self.middlate(arr)
+			a=[]
+			f=(arr.length/2.0).ceil-1
+			for e in 1..arr.length
+				if (arr.length+e)%2==0
+					a[f+(e/2.0).floor]=arr[e-1]
+				elsif (arr.length+e)%2==1
+					a[f-(e/2.0).floor]=arr[e-1]
+				end
+			end
+			return a
+		end
+		##
 		# Gets "rows" of an array based on a width
 		def self.imageRGBLines(image, width)
 			return image.each_slice(width).to_a

data/lib/pxlsrt/smart.rb

@@ -29,7 +29,8 @@ module Pxlsrt
 				:absolute => false,
 				:threshold => 20,
 				:edge => 2,
-				:trusted => false
+				:trusted => false,
+				:middle => false
 			}
 			defRules={
 				:reverse => ["no", "reverse", "either"],
@@ -41,7 +42,8 @@ module Pxlsrt
 				:absolute => [false, true],
 				:threshold => [{:class => [Float, Fixnum]}],
 				:edge => [{:class => [Fixnum]}],
-				:trusted => [false, true]
+				:trusted => [false, true],
+				:middle => [false, true]
 			}
 			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)
@@ -149,11 +151,13 @@ module Pxlsrt
 					if options[:smooth]
 						for band in bands
 							u=band.group_by {|x| x}
-							image.concat(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1))
+							image.concat(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1)) if !options[:middle]
+							image.concat(Pxlsrt::Lines(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1))) if options[:middle]
 						end
 					else
 						for band in bands
-							image.concat(Pxlsrt::Colors.pixelSort(band, options[:method], nre))
+							image.concat(Pxlsrt::Colors.pixelSort(band, options[:method], nre)) if !options[:middle]
+							image.concat(Pxlsrt::Lines.middlate(Pxlsrt::Colors.pixelSort(band, options[:method], nre))) if options[:middle]
 						end
 					end
 				else
@@ -204,11 +208,13 @@ module Pxlsrt
 						if options[:smooth]
 							for band in dia[j]
 								u=band.group_by {|x| x}
-								ell.concat(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1))
+								ell.concat(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1)) if !options[:middle]
+								ell.concat(Pxlsrt::Lines.middlate(Pxlsrt::Colors.pixelSort(u.keys, options[:method], nre).map { |x| u[x] }.flatten(1))) if options[:middle]
 							end
 						else
 							for band in dia[j]
-								ell.concat(Pxlsrt::Colors.pixelSort(band, options[:method], nre))
+								ell.concat(Pxlsrt::Colors.pixelSort(band, options[:method], nre)) if !options[:middle]
+								ell.concat(Pxlsrt::Lines.middlate(Pxlsrt::Colors.pixelSort(band, options[:method], nre))) if options[:middle]
 							end
 						end
 						dia[j]=ell

data/lib/pxlsrt/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pxlsrt
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - EVA-01
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-06 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler