spyglass 0.0.4.1 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa5d2efe1d75f4c772e76ee0c391e724796a5be9
-  data.tar.gz: ebc53f2c758d1fca38a8e76ae24472eebfd317df
+  metadata.gz: d8e0f9a857a304d3a87857e05baecfc761eae686
+  data.tar.gz: 56fe04d59eb6700545daae2f3c910185ca97d166
 SHA512:
-  metadata.gz: 6ad7ddc01fe98b6e3625e6570450f65f45ab336539f16a7cbda679a0be0cfa44ab7b1163e276c6c5f03247116338ca017e24c0a562c23276769b788e77090ae0
-  data.tar.gz: bf510a98a7e42ee00a407f3e91bec06b8b9949c905e4e93edd5bd4f6930618684deab57d54d708becf19f000e543c376c3d74881ec37118b5a5bdc24c9b28664
+  metadata.gz: 39b41c955236f3868616647e3bc264d4f3cdc17546f49b44386f2b71c8ce1f486b062265fbc7a25b9758b36eeb8d2301bfe826c0c4c7119b8a335bf380705851
+  data.tar.gz: 90d5814cc51555ce8b7fce8a4d6a4ea8a810da0295cf316a8d130bf39d4b7fceb585bdf68cc46b3ec5b7ba69f2811dfbd7b53b2f701d5bb1c72f8aec3bba17f2

data/examples/window_events.rb

@@ -0,0 +1,22 @@
+$LOAD_PATH.unshift('lib')
+require 'spyglass'
+
+include Spyglass 
+
+window  = GUI::Window.new "Original"
+card    = Image.load File.expand_path('images/card.jpg', File.dirname(__FILE__))
+
+window.on_click do |x, y|
+  puts "CLICKED: #{ x }, #{ y }"
+end
+
+window.on_right_click do |x, y|
+  puts "RIGHT CLICKED: #{ x }, #{ y }"
+end
+
+window.show(card)
+
+loop do
+  break if GUI::wait_key(10) > 0
+end
+

data/ext/spyglass/background_subtractor.h

@@ -6,6 +6,9 @@
 #include "bgslib_dp_prati_mediod_bgs.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_BG_SUBTRACTOR, cv::BackgroundSubtractor);
+
   namespace BackgroundSubtractor {
     void define_ruby_types();
     VALUE get_ruby_module();

data/ext/spyglass/cascade_classifier.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_CLASSIFIER, cv::CascadeClassifier);
+
   namespace CascadeClassifier {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/color.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_COLOR, cv::Scalar);
+
   namespace Color {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/contour.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_CONTOUR, std::vector<cv::Point *>);
+
   namespace Contour {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/image.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_IMAGE, cv::Mat);
+
   namespace Image {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/point.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_POINT, cv::Point);
+
   namespace Point {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/prelude.h

@@ -15,16 +15,6 @@
     return ptr; \
   }
 
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_BG_SUBTRACTOR,  cv::BackgroundSubtractor);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_CLASSIFIER,     cv::CascadeClassifier);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_COLOR,          cv::Scalar);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_CONTOUR,        std::vector<cv::Point *>);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_IMAGE,          cv::Mat);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_POINT,          cv::Point);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_RECT,           cv::Rect);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_SIZE,           cv::Size);
-SG_GEN_GET_OBJECT_FUNCTION(SG_GET_VIDEO_CAPTURE,  cv::VideoCapture);
-
 #define SG_OPTION(opts, type, key, default, expr) \
   type key = default; \
   if(RTEST(opts)) { \

data/ext/spyglass/rect.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_RECT, cv::Rect);
+
   namespace Rect {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/size.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_SIZE, cv::Size);
+
   namespace Size {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/video_capture.h

@@ -4,6 +4,9 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_VIDEO_CAPTURE, cv::VideoCapture);
+
   namespace VideoCapture {
     void define_ruby_class();
     VALUE get_ruby_class();

data/ext/spyglass/window.cc

@@ -14,6 +14,9 @@ namespace Spyglass {
         // Instance methods
         rb_define_method(WindowClass, "hide", RUBY_METHOD_FUNC(rb_hide), 0);
         rb_define_method(WindowClass, "move", RUBY_METHOD_FUNC(rb_move), 2);
+        rb_define_method(WindowClass, "on_click", RUBY_METHOD_FUNC(rb_on_click), 0);
+        rb_define_method(WindowClass, "on_right_click", RUBY_METHOD_FUNC(rb_on_right_click), 0);
+        rb_define_method(WindowClass, "on_move", RUBY_METHOD_FUNC(rb_on_move), 0);
         rb_define_method(WindowClass, "show", RUBY_METHOD_FUNC(rb_show), 1);
         rb_define_method(WindowClass, "title", RUBY_METHOD_FUNC(rb_get_title), 0);
       }
@@ -23,43 +26,90 @@ namespace Spyglass {
       }
 
       static VALUE rb_alloc(VALUE self) {
-        char *title = NULL;
-        return Data_Wrap_Struct(WindowClass, NULL, rb_free, title);
+        window_data *window = (window_data *)malloc(sizeof(window_data));
+        window->title = NULL;
+        return Data_Wrap_Struct(WindowClass, NULL, rb_free, window);
       }
 
-      static void rb_free(char *title) {
-        if(title != NULL)
-          free(title);
+      static void rb_free(window_data *window) {
+        if(window->title)
+          free(window->title);
+        free(window);
       }
 
+      static void _on_mouse_event(int event, int x, int y, int flags, void *obj) {
+        window_data *window = (window_data *)obj;
+        VALUE self = window->robj;
+
+        VALUE block = 0;
+        switch(event) {
+          case cv::EVENT_LBUTTONDOWN:
+            block = rb_ivar_get(self, rb_intern("@_click_block"));
+            break;
+
+          case cv::EVENT_RBUTTONDOWN:
+            block = rb_ivar_get(self, rb_intern("@_right_click_block"));
+            break;
+
+          case cv::EVENT_MOUSEMOVE:
+            block = rb_ivar_get(self, rb_intern("@_mouse_move_block"));
+            break;
+        }
+
+        if(block == 0 || !RTEST(block))
+          return;
+
+        rb_funcall(block, rb_intern("call"), 2, INT2FIX(x), INT2FIX(y));
+      }
+
+
       static VALUE rb_initialize(VALUE self, VALUE title) {
         Check_Type(title, T_STRING);
 
-        char *_title = strdup(StringValueCStr(title));
-        cv::namedWindow(_title);
-        Data_Set_Struct(self, _title);
+        window_data *window = SG_GET_WINDOW(self);
+        window->title = (char *)malloc(rb_str_length(title) + 1);
+        strncpy(window->title, StringValuePtr(title), rb_str_length(title));
 
+        window->robj = self;
+
+        cv::namedWindow(window->title);
+        cv::setMouseCallback(window->title, _on_mouse_event, window);
         return self;
       }
 
       static VALUE rb_hide(VALUE self) {
-        char *title;
-        Data_Get_Struct(self, char, title);
+        window_data *window = SG_GET_WINDOW(self);
 
-        cv::destroyWindow(title);
+        cv::destroyWindow(window->title);
         cv::waitKey(1);
 
         return self;
       }
 
+      static VALUE rb_on_click(VALUE self) {
+        rb_need_block();
+        rb_ivar_set(self, rb_intern("@_click_block"), rb_block_proc());
+        return self;
+      }
+
+      static VALUE rb_on_right_click(VALUE self) {
+        rb_need_block();
+        rb_ivar_set(self, rb_intern("@_right_click_block"), rb_block_proc());
+        return self;
+      }
+
+      static VALUE rb_on_move(VALUE self) {
+        rb_need_block();
+        rb_ivar_set(self, rb_intern("@_mouse_move_block"), rb_block_proc());
+        return self;
+      }
+
       static VALUE rb_move(VALUE self, VALUE x, VALUE y) {
         Check_Type(x, T_FIXNUM);
         Check_Type(y, T_FIXNUM);
 
-        char *title;
-        Data_Get_Struct(self, char, title);
-
-        cv::moveWindow(title, FIX2INT(x), FIX2INT(y));
+        window_data *window = SG_GET_WINDOW(self);
+        cv::moveWindow(window->title, FIX2INT(x), FIX2INT(y));
         cv::waitKey(1);
 
         return self;
@@ -73,20 +123,16 @@ namespace Spyglass {
 
         cv::Mat *img = SG_GET_IMAGE(image);
 
-        char *title;
-        Data_Get_Struct(self, char, title);
-
-        cv::imshow(title, *img);
+        window_data *window = SG_GET_WINDOW(self);
+        cv::imshow(window->title, *img);
         cv::waitKey(1);
 
         return self;
       }
 
       static VALUE rb_get_title(VALUE self) {
-        char *title;
-        Data_Get_Struct(self, char, title);
-
-        return rb_str_new2(title);
+        window_data *window = SG_GET_WINDOW(self);
+        return rb_str_new2(window->title);
       }
     }
   }

data/ext/spyglass/window.h

@@ -4,20 +4,32 @@
 #include "spyglass.h"
 
 namespace Spyglass {
+
+  typedef struct window_data {
+    char *title;
+    VALUE robj;
+  } window_data;
+
+  SG_GEN_GET_OBJECT_FUNCTION(SG_GET_WINDOW, window_data);
+
   namespace GUI {
     namespace Window {
       void define_ruby_class();
       VALUE get_ruby_class();
 
       static VALUE rb_alloc(VALUE self);
-      static void rb_free(char *title);
+      static void rb_free(window_data *window);
       static VALUE rb_initialize(VALUE self, VALUE title);
       static VALUE rb_hide(VALUE self);
       static VALUE rb_move(VALUE self, VALUE x, VALUE y);
+      static VALUE rb_on_click(VALUE self);
+      static VALUE rb_on_right_click(VALUE self);
+      static VALUE rb_on_move(VALUE self);
       static VALUE rb_show(VALUE self, VALUE image);
       static VALUE rb_get_title(VALUE self);
     }
   }
 }
 
+
 #endif // SPYGLASS_WINDOW_H_

data/lib/spyglass/version.rb

@@ -1,3 +1,3 @@
 module Spyglass
-  VERSION = "0.0.4.1"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyglass
 version: !ruby/object:Gem::Version
-  version: 0.0.4.1
+  version: 0.0.5
 platform: ruby
 authors:
 - André Medeiros
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ files:
 - examples/images/beach.jpg
 - examples/images/card.jpg
 - examples/video_capture.rb
+- examples/window_events.rb
 - ext/spyglass/background_subtractor.cc
 - ext/spyglass/background_subtractor.h
 - ext/spyglass/bgslib_bgs.h