Merge branch 'waitkey' into beta

peterbraden · Mar 11, 2013 · ebd1f6e · ebd1f6e
2 parents daca1a1 + e88d2d6
commit ebd1f6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/smoke/smoketest.js b/smoke/smoketest.js
@@ -4,9 +4,9 @@ var win = new cv.NamedWindow("foo");
 cv.readImage('./examples/stuff.png', function(e, im){
   im.pyrDown();
   win.show(im);
-  setTimeout(function(){
-    win.destroy();
-  }, 1000)
+  console.log(win.blockingWaitKey(0), "!!")
+  win.destroy();
+
 })
 
 

diff --git a/src/HighGUI.cc b/src/HighGUI.cc
@@ -19,6 +19,7 @@ NamedWindow::Init(Handle<Object> target) {
 
 	  NODE_SET_PROTOTYPE_METHOD(constructor, "show", Show);
 	  NODE_SET_PROTOTYPE_METHOD(constructor, "destroy", Destroy);
+	  NODE_SET_PROTOTYPE_METHOD(constructor, "blockingWaitKey", BlockingWaitKey);
     target->Set(String::NewSymbol("NamedWindow"), constructor->GetFunction());
 };
 
@@ -65,3 +66,15 @@ NamedWindow::Destroy(const v8::Arguments& args){
   cv::destroyWindow(self->winname);
 	return scope.Close(args.Holder());
 }
+
+
+Handle<Value>
+NamedWindow::BlockingWaitKey(const v8::Arguments& args){
+	SETUP_FUNCTION(NamedWindow)
+	int time = 0;
+  if (args.Length() > 0){
+    time = args[1]->IntegerValue();
+  }
+  int res = cv::waitKey(time);
+	return scope.Close(Number::New(res));
+}
diff --git a/src/HighGUI.h b/src/HighGUI.h
@@ -15,5 +15,6 @@ class NamedWindow: public node::ObjectWrap {
 
     JSFUNC(Show);
     JSFUNC(Destroy);
+    JSFUNC(BlockingWaitKey);
 
 };