calcHist works!

Author: Florin

scripts/calcHist.coffee

@@ -52,20 +52,19 @@ histImg = tmp.zeros sbins * scale, hbins * 10, cv.CV_8UC3
 for h in [0..hbins - 1]
 	for s in [0..sbins - 1]
 		binVal = hist.at h, s
-		
 		intensity = Math.round(binVal * 255 / minMax.maxVal)
-		cv.rectangle histImg, {x: h*scale, y: s*scale}, {x: (h+1)*scale - 1, y: (s+1)*scale - 1}, [255, 0, 0, 0], -1
+		cv.rectangle histImg, {x: h*scale, y: s*scale}, {x: (h+1)*scale - 1, y: (s+1)*scale - 1}, [intensity, intensity, intensity, intensity], -1
 
 cv.namedWindow "H-S Histogram", 1
 cv.imshow "H-S Histogram", histImg
 
-keypress process.stdin
-process.stdin.on 'keypress', (char, key) ->
-	if key.name == 'escape'
-		console.log 'Stopping.'
-		process.exit 0
+doATick = ->
+	cv.doTick();
+	process.nextTick doATick
 
-process.stdin.setRawMode true
-process.stdin.resume()		
-console.log 'Press ESC to stop.'
+doATick()
+
+setTimeout ->
+	process.exit -1
+, 1000
 

src/opencv_manual.cpp

@@ -13,6 +13,7 @@ namespace opencvjs {
 	METHOD_BEGIN(0);
 
 #ifdef _WIN32
+	//Todo: Very raw, probably better to process all messages in the queue and then return
 	MSG msg;
 	if (GetMessage(&msg, NULL, 0, 0)){
 		TranslateMessage(&msg);
@@ -29,7 +30,7 @@ namespace opencvjs {
 		//Experimental - not tested
 		cv::Mat* _this = bea::Convert<cv::Mat*>::FromJS(args.This(), 0);
 		int i = bea::Convert<int>::FromJS(args[0], 0);
-		int j = bea::Optional<int>::FromJS(args, 0, 0); 
+		int j = bea::Optional<int>::FromJS(args, 1, 0); 
 		v8::Handle<v8::Value> retVal; 	
 			switch(_this->depth()){
 				case CV_8U:

src/opencvjs.cpp

@@ -3085,7 +3085,7 @@ namespace opencvjs {
 	}
 
 	v8::Handle<v8::Value> JOpenCV::minMaxLoc(const v8::Arguments& args) {
-		METHOD_BEGIN(1);	
+		METHOD_BEGIN(1);
 		//minMaxLocRet minMaxLoc(const Mat& a)
 		cv::Mat* a = bea::Convert<cv::Mat*>::FromJS(args[0], 0);
 		minMaxLocRet fnRetVal;
@@ -3199,6 +3199,7 @@ namespace opencvjs {
 		obj->exposeMethod("calcBackProject", calcBackProject);
 		obj->exposeMethod("minMaxLoc", minMaxLoc);
 		obj->exposeMethod("cvSmooth", cvSmooth);
+		obj->exposeMethod("doTick", doTick);
 		obj->exposeMethod("discardMats", discardMats);
 		obj->exposeMethod("fillPoly", fillPoly);
 		obj->exposeMethod("getTextSize", getTextSize);
@@ -3576,6 +3577,7 @@ namespace opencvjs {
 		BEA_DEFINE_CONSTANT(target, FONT_HERSHEY_SCRIPT_SIMPLEX);
 		BEA_DEFINE_CONSTANT(target, FONT_HERSHEY_SCRIPT_COMPLEX);
 		BEA_DEFINE_CONSTANT(target, FONT_ITALIC);
+		BEA_DEFINE_CONSTANT(target, CV_FILLED);
 	}
 
 }

src/opencvjs.h

@@ -244,6 +244,7 @@ namespace opencvjs {
 			static v8::Handle<v8::Value> calcBackProject(const v8::Arguments& args);
 			static v8::Handle<v8::Value> minMaxLoc(const v8::Arguments& args);
 			static v8::Handle<v8::Value> cvSmooth(const v8::Arguments& args);
+			static v8::Handle<v8::Value> doTick(const v8::Arguments& args);
 			static v8::Handle<v8::Value> discardMats(const v8::Arguments& args);
 			static v8::Handle<v8::Value> fillPoly(const v8::Arguments& args);
 			static v8::Handle<v8::Value> getTextSize(const v8::Arguments& args);