stitchify 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5895de25d1f7278da3b3f19429bc973bdc25d7b
-  data.tar.gz: ffbae7c51bff3f8313bbc37e5b39604d5d796c75
+  metadata.gz: 163c7b301bb8c593d7776451c1b6301d779431b9
+  data.tar.gz: 10c75dc399cad95003d8410e17b600dcb3d3a3bb
 SHA512:
-  metadata.gz: 87b63def2fbc5aa49d24af785ecf1886c46a0728f27cd2f86d72760b5e09d6bb3da8b411b53c50a0e7d360f6c66e093c5ccab173d6be27725c137b7e7a57ebac
-  data.tar.gz: 3538d477176f23a093161495db5abfef06bd7bc86f1ac635e68ee9add3ee4a3e16ceb58a250918037f09001cebc25fb4984821fddd3e771886567fd625a7be44
+  metadata.gz: 1265812071e71ab6a4c4a91fb0b7276985114b62d79dd7e20e3e4c0a0760d0f5d6a945dcf8ba086e9842fc941e11ae12811bc8ce0c31ae2aee42216aa8092bf6
+  data.tar.gz: 9d8431825fa940807b0b48bff170701cec914885369a858edfdc4a85546260a422bc644d06230cba02ee3001548093c073cd74dcdc0fa62a746d8f315482eaa8

data/lib/stitchify.rb

@@ -27,6 +27,7 @@ class Stitchifier
     ]
 
     attr_accessor :base_pixel_arr,
+                  :color_set,
                   :dominant_colors,
                   :img,
                   :img_path,
@@ -48,23 +49,27 @@ class Stitchifier
         self.dominant_colors = []
         self.stitch_map = []
         self.px = px
+        self.color_set = nil
 
         unless img_path.empty?
             make_img
-            set_dominant_colors
+            build_color_set
             build_pixel_array
 
-            d = DrawRasem.new(self.stitch_map, self.width, self.px)
-            d.stitch
+            stitch
         end
     end
 
+    def stitch
+        d = DrawRasem.new(self.stitch_map, self.width, self.px, self.color_set)
+        d.stitch
+    end
+
     def make_img
         self.img = ImageList.new(img_path).resize_to_fit(width)
     end
 
     def set_dominant_colors
-        color_pos = 0
         colors = black_and_white
         set_num_colors
         if self.num_of_colors > 3 && !img_path.empty?
@@ -74,13 +79,32 @@ class Stitchifier
             off_colors = build_off_color_arr(main_color)
             colors = miro_px + off_colors + colors
         end
+        set_px_shapes(colors)
+        self.dominant_colors = colors.uniq
+    end
+
+    def set_px_shapes(colors)
+        color_pos = 0
         colors.each do |px|
             if px.shape.nil?
                 px.shape = FILLABLE_SHAPES[color_pos]
                 color_pos = (color_pos + 1) % FILLABLE_SHAPES.length
             end
         end
-        self.dominant_colors = colors.uniq
+    end
+
+    def build_color_set(req_colors = [])
+        if req_colors.length == 0
+            set_dominant_colors
+            self.color_set = self.dominant_colors
+        else
+            set_dominant_colors
+            colors = self.dominant_colors
+            colors.slice!(0, req_colors.length)
+            color_map = colors + req_colors.map{ |x| Pixelfy.from_hex(x) }
+            self.color_set = set_px_shapes(color_map)
+        end
+        build_pixel_array
     end
 
     def black_and_white
@@ -105,7 +129,8 @@ class Stitchifier
     end
 
     def colorize_pixels
-        self.base_pixel_arr.each {|px| self.stitch_map << px.colorize(self.dominant_colors) }
+        self.stitch_map = []
+        self.base_pixel_arr.each {|px| self.stitch_map << px.colorize(self.color_set) }
     end
 
     def set_num_colors

data/lib/stitchify/draw_rasem.rb

@@ -1,11 +1,12 @@
 class DrawRasem
 
-    attr_accessor :px_arr, :width, :px, :pos_x, :pos_y, :height
+    attr_accessor :px_arr, :width, :px, :pos_x, :pos_y, :height, :color_set
 
-    def initialize(px_arr, width=50, px=10)
+    def initialize(px_arr, width=50, px=10, color_set=[])
         self.px_arr = px_arr
         self.width = width
         self.px = px
+        self.color_set = color_set
         clear_vars
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stitchify
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Ellen Wondra