Merge pull request justadudewhohacks#395 from taeyoonwf/master

Point2[] to Contour, number[][] to Contour

Author: justadudewhohacks

cc/modules/imgproc/Contour.cc

@@ -7,11 +7,11 @@
 
 Nan::Persistent<v8::FunctionTemplate> Contour::constructor;
 
-void Contour::Init() {
-  v8::Local<v8::FunctionTemplate> ctor = Nan::New<v8::FunctionTemplate>(Contour::New);
-  constructor.Reset(ctor);
-  ctor->InstanceTemplate()->SetInternalFieldCount(1);
-  ctor->SetClassName(Nan::New("Contour").ToLocalChecked());
+NAN_MODULE_INIT(Contour::Init) {
+	v8::Local<v8::FunctionTemplate> ctor = Nan::New<v8::FunctionTemplate>(Contour::New);
+	constructor.Reset(ctor);
+	ctor->InstanceTemplate()->SetInternalFieldCount(1);
+	ctor->SetClassName(Nan::New("Contour").ToLocalChecked());
 
 	Nan::SetAccessor(ctor->InstanceTemplate(), FF_NEW_STRING("isConvex"), GetIsConvex);
 	Nan::SetAccessor(ctor->InstanceTemplate(), FF_NEW_STRING("area"), GetArea);
@@ -33,8 +33,48 @@ void Contour::Init() {
 	Nan::SetPrototypeMethod(ctor, "matchShapes", MatchShapes);
 	Nan::SetPrototypeMethod(ctor, "fitEllipse", FitEllipse);
 	Nan::SetPrototypeMethod(ctor, "moments", _Moments);
+
+	target->Set(Nan::New("Contour").ToLocalChecked(), ctor->GetFunction());
 };
 
+NAN_METHOD(Contour::New) {
+	if (info.Length() > 1) {
+		return Nan::ThrowError("Contour::New - expected one or zero argument");
+	}
+	if (info.Length() == 1 && !info[0]->IsArray()) {
+		return Nan::ThrowError("Contour::New - expected arg0 to be an array");
+	}
+
+	Contour* self = new Contour();
+	if (info.Length() == 1) {
+		FF_ARR jsPts = FF_ARR::Cast(info[0]);
+		self->contour.reserve(jsPts->Length());
+		for (int i = 0; i < jsPts->Length(); i++) {
+			cv::Point2d cv_pt;
+			auto jsPt = jsPts->Get(i);
+			if (jsPt->IsArray()) {
+				FF_ARR jsObj = FF_ARR::Cast(jsPt);
+				if (jsObj->Length() != 2)
+					return Nan::ThrowError("Contour::New - expected arg0 to consist of only Point2 or array of length 2");
+				double x = jsObj->Get(0)->NumberValue();
+				double y = jsObj->Get(1)->NumberValue();
+				cv_pt = cv::Point2d(x, y);
+			}
+			else if (FF_IS_INSTANCE(Point2::constructor, jsPt)) {
+				FF_OBJ jsObj = FF_CAST_OBJ(jsPt);
+				cv_pt = FF_UNWRAP_PT2_AND_GET(jsObj);
+			}
+			else {
+				return Nan::ThrowError("Contour::New - expected arg0 to consist of only Point2 or array of length 2");
+			}
+			self->contour.emplace_back(cv::Point2i(cv_pt.x, cv_pt.y));
+		}
+	}
+	self->hierarchy = cv::Vec4i(-1, -1, -1, -1);
+	self->Wrap(info.Holder());
+	info.GetReturnValue().Set(info.Holder());
+}
+
 NAN_METHOD(Contour::GetPoints) {
 	info.GetReturnValue().Set(Point::packJSPoint2Array(FF_UNWRAP_CONTOUR_AND_GET(info.This())));
 }

cc/modules/imgproc/Contour.h

@@ -11,13 +11,8 @@ class Contour: public Nan::ObjectWrap {
   std::vector<cv::Point2i> contour;
   cv::Vec4i hierarchy;
 
-	static void Init();
-
-	static NAN_METHOD(New) {
-		Contour* self = new Contour();
-		self->Wrap(info.Holder());
-		info.GetReturnValue().Set(info.Holder());
-	}
+	static NAN_MODULE_INIT(Init);
+	static NAN_METHOD(New);
 
 	static NAN_GETTER(GetNumPoints) {
 		info.GetReturnValue().Set(Nan::New((uint)FF_UNWRAP_CONTOUR_AND_GET(info.This()).size()));

cc/modules/imgproc/imgproc.cc

@@ -33,7 +33,7 @@ NAN_MODULE_INIT(Imgproc::Init) {
   Nan::SetMethod(target, "canny", Canny);
 #endif
   Moments::Init(target);
-  Contour::Init();
+  Contour::Init(target);
 };
 
 NAN_METHOD(Imgproc::GetStructuringElement) {

lib/typings/Contour.d.ts

@@ -9,6 +9,9 @@ export class Contour {
   readonly area: number;
   readonly isConvex: boolean;
   readonly hierarchy: Vec4;
+  constructor();
+  constructor(pts: Point2[]);
+  constructor(pts: number[][]);
   approxPolyDP(epsilon: number, closed: boolean): Point2[];
   approxPolyDPContour(epsilon: number, closed: boolean): Contour;
   arcLength(closed?: boolean): number;