Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'waitkey' into beta

  • Loading branch information...
commit ebd1f6e4e82183fff591dcebadeb1ae855687c60 2 parents daca1a1 + e88d2d6
@peterbraden authored
Showing with 17 additions and 3 deletions.
  1. +3 −3 smoke/smoketest.js
  2. +13 −0 src/HighGUI.cc
  3. +1 −0  src/HighGUI.h
View
6 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();
+
})
View
13 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));
+}
View
1  src/HighGUI.h
@@ -15,5 +15,6 @@ class NamedWindow: public node::ObjectWrap {
JSFUNC(Show);
JSFUNC(Destroy);
+ JSFUNC(BlockingWaitKey);
};
Please sign in to comment.
Something went wrong with that request. Please try again.