opencv-color 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8384ba1119bb0e1bcdaa51e4dd9e6f672ac531b
-  data.tar.gz: 5b128b24d27bdfffcd1465c0dd65c07c2496506b
+  metadata.gz: 3d1ab524bb6fc4578ddff0366bf1211fa8aeb075
+  data.tar.gz: fd49bdf066ced28c96961ef4a9e2694d3f8ad4ce
 SHA512:
-  metadata.gz: 8ccb6cc737e2250ba3b99e620995c69d72fa3433dbbcc1cc6a2757035b68ed7b3c372953133f89a6f1c122daaffeb6363c93bcc8d3fc74ae74f8640ac359be41
-  data.tar.gz: d8ca0106ca1a427f7c237fe9f949f8edfe24a8bbed0c54e848fe88642712c4a4b8a4d41f84df3b15979f1c595fd89cf43caf4e012b773bd43217a0e1a7a64412
+  metadata.gz: f99dfd480a7d83a3b9039e4d99fe0d096756daa70dcad9cda613126f137286ec4588c4a9d502fb3efc27b3aa165070516f730282bfd0beb45e51f17702a2c9be
+  data.tar.gz: 2ea7688d6a4e4a7501e5aa59cb0b9fa717c6eeb6ce33aa0be418ef6f87f96737145b20e785ed54326d4dc6ed2663636938a87dc7db8c33a840e3405516a69bc9

data/TODO

@@ -0,0 +1,2 @@
+* red/pink color is special, it's range should be 0~2x and 16x~179
+** cluster colors before caculate mean and sd

data/lib/opencv-color.rb

@@ -33,28 +33,45 @@ module OpenCVColor
   end
 
   def learn(dir)
-    Hash[samples(dir).map do |color, files|
-      group = [[], [], [], []]
+    Hash[samples(dir).map do |color_dir, files|
+      group = [[], [], []]
       files.map(&method(:load_image_colors)).each do |colors|
         colors.each do |c|
-          4.times do |i|
+          3.times do |i|
             group[i] << c[i]
           end
         end
       end
-      range = group.map(&:to_scale).inject({low: [], high: []}) do |memo, g|
+      range = group.map(&:to_scale).each_with_index.inject({low: [], high: [], mean: [], sd: []}) do |memo, d|
+        g, index = d
         sd = g.sd
         mean = g.mean
-        memo[:low] << ([mean - 3 * sd, 0].max).floor
-        memo[:high] << (mean + 3 * sd).ceil
+        memo[:low] << ([mean - 3 * sd, min_value].max).floor
+        memo[:high] << ([mean + 3 * sd, max_value(index)].min).ceil
+        memo[:mean] << mean
+        memo[:sd] << sd
         memo
       end
-      [File.basename(color).downcase.gsub(/[^a-z_]/, '_'), range]
+      [color_name(color_dir), range]
     end]
   end
 
+  def color_name(path)
+    File.basename(path).downcase.gsub(/[^a-z_]/, '_')
+  end
+
+  def min_value
+    0
+  end
+
+  def max_value(i)
+    # H => 0
+    i == 0 ? 179 : 255
+  end
+
   def load_image_colors(file)
-    Colors.new(IplImage.load(file, OpenCV::CV_LOAD_IMAGE_ANYCOLOR | OpenCV::CV_LOAD_IMAGE_ANYDEPTH).BGR2HSV)
+    img = IplImage.load(file, OpenCV::CV_LOAD_IMAGE_ANYCOLOR | OpenCV::CV_LOAD_IMAGE_ANYDEPTH)
+    Colors.new(img.smooth(:median, 3).BGR2HSV)
   end
 
 end

data/lib/opencv-color/objc.erb

@@ -16,7 +16,7 @@ namespace cr {
         };
     };
 
-<%= data.map {|color, range| "    static ColorRange #{color} = ColorRange(#{color.inspect}, Scalar(#{range[:low].join(', ')}), Scalar(#{range[:high].join(', ')}));" }.join("\n") %>
+<%= data.map {|color, range| "    static ColorRange #{color} = ColorRange(#{color.inspect}, Scalar(#{range[:low].join(', ')}), Scalar(#{range[:high].join(', ')})); // mean: #{range[:mean]}, sd: #{range[:sd]}" }.join("\n") %>
 
     static ColorRange colors[<%= data.size %>] {
       <%= data.map {|c, r| c}.join(",\n      ") %>

data/lib/opencv-color/version.rb

@@ -1,3 +1,3 @@
 module OpenCVColor
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencv-color
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Xiao Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-28 00:00:00.000000000 Z
+date: 2014-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
@@ -81,6 +81,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO
 - bin/opencv-color
 - color-samples/blue/blue01.png
 - color-samples/blue/blue02.png