opencv-color 0.0.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6f9389ba605456ea89cc2df4da00aa6eaf41d3
-  data.tar.gz: ba4fb729a19870d603ecc5101efeab1d2f8b62c6
+  metadata.gz: feff117de0280ff57b59285aa76db2724f144938
+  data.tar.gz: ccdf925278830e065a2d77433037c7983637376a
 SHA512:
-  metadata.gz: e61dd2da1acbeeafacb6188706867211c1c61bbbd303bf2eb6e7aa87ec1dcad160484c31df835a459b5bb9d51f00e2ba2d39b0b43c16ce6bf4949e60c322e8e8
-  data.tar.gz: 0f34aea2acef8ce948f57bf7418f5c8436e976a80cfc48ef9a4ca4a4f9f3267504b6c58e7ad4988858b29a0390803afb02c0406f1eae585e039a55fb187353e9
+  metadata.gz: 52c6b3df2aead4ceb7786594374eeac3b8b4acd88136a77edc6d12a517a2c1754fd78b6fe1d079b44732da37d3becaf52baf2db5d6f8358f159d5b9801bc42b1
+  data.tar.gz: ea9a61f505b2d88a6aec3342b497462a741fe084d236723bde736afa892d8245e418dfe75838e59342e322fcf74a09bcdd2b1f018b402345a57a392438352be6

data/README.md

@@ -20,11 +20,11 @@ Or install it yourself as:
 
 ## Usage
 
-Put your color sample images input the following structure:
+Put your color sample images into the following structure:
 
 * color samples root directory
- * color name
-  * color sample image files
+  * color name
+    * color sample image files
 
 See color-samples directory as example.
 
@@ -50,7 +50,7 @@ Use the data in your application, the following example uses ruby-opencv gem:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/opencv-color/fork )
+1. Fork it ( https://github.com/xli/opencv-color/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/opencv-color

@@ -2,6 +2,7 @@
 
 require 'optparse'
 require 'yaml'
+require 'erb'
 
 #add lib for test environment
 if File.exists?(File.expand_path(File.dirname(__FILE__) + '/../lib/opencv-color.rb'))
@@ -15,9 +16,31 @@ rescue LoadError
   require 'opencv-color'
 end
 
-if ARGV.empty? || ['-h', '--help'].include?(ARGV[0])
-  puts "opencv-color <sample images directory path>"
-end
+require 'optparse'
+
+sample_images_dir = ARGV.pop
+
+options = {
+  format: 'yaml'
+}
+OptionParser.new do |opts|
+  opts.banner = "Usage: opencv-color [options] <sample images directory path>"
+
+  opts.on("-f", "--format [FORMAT]", "Output format 'yaml' or 'objc', default is yaml") do |format|
+    options[:format] = format
+  end
+
+  opts.on("-h", "--help", "Show this message") do |v|
+    puts opts
+    exit
+  end
+end.parse!
 
-data = OpenCVColor.learn(ARGV[0])
-puts YAML.dump(data)
+data = OpenCVColor.learn(sample_images_dir)
+puts case options[:format]
+when 'objc'
+  template = File.join(File.dirname(__FILE__), '..', 'lib', 'opencv-color', 'objc.erb')
+  ERB.new(File.read(template)).result(binding)
+else
+  YAML.dump(data)
+end

data/lib/opencv-color.rb

@@ -45,11 +45,11 @@ module OpenCVColor
       range = group.map(&:to_scale).inject({low: [], high: []}) do |memo, g|
         sd = g.sd
         mean = g.mean
-        memo[:low] << [mean - 3 * sd, 0].max
-        memo[:high] << mean + 3 * sd
+        memo[:low] << ([mean - 3 * sd, 0].max).floor
+        memo[:high] << (mean + 3 * sd).ceil
         memo
       end
-      [File.basename(color), range]
+      [File.basename(color).downcase.gsub(/[^a-z_]/, '_'), range]
     end]
   end
 

data/lib/opencv-color/objc.erb

@@ -0,0 +1,26 @@
+#ifndef ColorRanges_h
+#define ColorRanges_h
+
+#import <opencv2/opencv.hpp>
+using namespace cv;
+
+namespace cr {
+    struct ColorRange {
+        String name;
+        Scalar low;
+        Scalar high;
+        ColorRange(const String& n, const Scalar& l, const Scalar& h) {
+            name = n;
+            low = l;
+            high = h;
+        };
+    };
+
+<%= data.map {|color, range| "    static ColorRange #{color} = ColorRange(#{color.inspect}, Scalar(#{range[:low].join(', ')}), Scalar(#{range[:high].join(', ')}));" }.join("\n") %>
+
+    static ColorRange colors[<%= data.size %>] {
+      <%= data.map {|c, r| c}.join(",\n      ") %>
+    };
+}
+
+#endif

data/lib/opencv-color/version.rb

@@ -1,3 +1,3 @@
 module OpenCVColor
-  VERSION = "0.0.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opencv-color
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Xiao Li
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2014-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-opencv
@@ -132,6 +132,7 @@ files:
 - color-samples/yellow/yellow2.png
 - color-samples/yellow/yellow3.png
 - lib/opencv-color.rb
+- lib/opencv-color/objc.erb
 - lib/opencv-color/version.rb
 - opencv-color.gemspec
 homepage: https://github.com/xli/opencv-color