Fix issue #744, related to failed code generation with contours (#745)

Author: phurley

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/Pipeline.h.vm

@@ -14,6 +14,8 @@
 \#include <stdio.h>
 \#include <stdlib.h>
 \#include <map>
+\#include <vector>
+\#include <string>
 \#include <math.h>
 
 namespace grip {

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/Pipeline.vm

@@ -37,7 +37,7 @@ $fileName::$fileName() {
 #set($outCnt = 0)
 #foreach($step in $pipeline.getSteps())
 #foreach($out in $step.getOutputs())
-	outputs.insert(make_pair(string("$out.name().toLowerCase().replaceAll("_", "")"), (AbsPipeline::Output)&$fileName::get${out.name()}));
+	outputs.insert(make_pair(std::string("$out.name().toLowerCase().replaceAll("_", "")"), (AbsPipeline::Output)&$fileName::get${out.name()}));
 #set($outCnt = $outCnt + 1)
 #end
 #end

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/macros.vm

@@ -1,25 +1,25 @@
 #macro(cType $type)#if($type.equals("Double") || $type.equals("Number"))
 double#elseif($type.equals("Object"))
 void#elseif ($type.equals("ContoursReport"))
-vector<vector<Point> >#elseif ($type.equals("BlobsReport"))
-vector<KeyPoint>#elseif ($type.equals("LinesReport"))
-vector<Line>#elseif ($type.equals("RectsReport"))
-vector<Rect>#elseif($type == "Integer" )
+std::vector<std::vector<cv::Point> >#elseif ($type.equals("BlobsReport"))
+std::vector<cv::KeyPoint>#elseif ($type.equals("LinesReport"))
+std::vector<Line>#elseif ($type.equals("RectsReport"))
+std::vector<cv::Rect>#elseif($type == "Integer" )
 int#elseif($type == "Boolean" || "boolean")
 bool#elseif($type.equals("String"))
-string#elseif($type.contains("Enum"))
+std::string#elseif($type.contains("Enum"))
 int#elseif($type.equalsIgnoreCase("BlurType"))
 BlurType#elseif($type.contains("Type"))
 int#elseif($type.equalsIgnoreCase("MaskSize"))
-string#elseif($type.equalsIgnoreCase("Interpolation"))
+std::string#elseif($type.equalsIgnoreCase("Interpolation"))
 int#elseif($type.equalsIgnoreCase("FlipCode"))
 FlipCode#elseif($type.equalsIgnoreCase("List"))
 List#else
 cv::$type#end#end
 
 #macro(funPassType $baseType)
 #set($type = "#cType($baseType)")
-#if($type.equals("double") || $type.equals("int") || $type.equals("bool") || $type.equals("string"))
+#if($type.equals("double") || $type.equals("int") || $type.equals("bool") || $type.equals("std::string"))
 #else
 &#end#end
 
@@ -67,13 +67,13 @@ $name(#foreach($inp in $step.getInputs())#param($inp $names[$count])#set($count
 #elseif ($input.type().contains("Enum"))
 	int ${tMeth.name($input.name())} = $input.value();  // ENUM $input.type()
 #elseif ($input.type().equals("MaskSize") )
-    string ${tMeth.name($input.name())} = "$input.value()";
+    std::string ${tMeth.name($input.name())} = "$input.value()";
 #elseif ($input.type().equals("FlipCode") || $input.type().equals("BlurType") )
 	$input.type() ${tMeth.name($input.name())} = $input.type()::#cvVal($input.value());
 #elseif ($input.type().contains("Type") || $input.type().equals("Interpolation"))
 	int ${tMeth.name($input.name())} = #cvVal($input.value());
 #elseif ($input.type().equals("String"))
-	string ${tMeth.name($input.name())} = "$input.value()";
+	std::string ${tMeth.name($input.name())} = "$input.value()";
 #elseif ($input.type().equals("List"))
 #set($inputEndValue = $input.value().length() - 1)
 	double ${tMeth.name($input.name())}[] = {$input.value().substring(1,$inputEndValue)};

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/operations/Convex_Hulls.vm

@@ -5,9 +5,9 @@
 	 * @param outputContours The contours where the output will be stored.
 	 */
 	void $fileName::#func($step, ["inputContours", "outputContours"]) {
-		std::vector<vector<cv::Point> > hull (inputContours.size());
+		std::vector<std::vector<cv::Point> > hull (inputContours.size());
 		outputContours.clear();
-		for (int i = 0; i < inputContours.size(); i++ ) {
+		for (size_t i = 0; i < inputContours.size(); i++ ) {
 			cv::convexHull(cv::Mat((inputContours)[i]), hull[i], false);
 		}
 		outputContours = hull;

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/operations/Filter_Contours.vm

@@ -20,14 +20,14 @@ This creates the C++ OpenCV Filter Contours function
 	void $fileName::#func($step ["inputContours", "minArea", "minPerimeter", "minWidth", "maxWidth", "minHeight", "maxHeight", "solidity", "maxVertexCount", "minVertexCount", "minRatio", "maxRatio", "output"]) {
 		std::vector<cv::Point> hull;
 		output.clear();
-		for (std::vector<Point> contour: inputContours) {
+		for (std::vector<cv::Point> contour: inputContours) {
 			cv::Rect bb = boundingRect(contour);
 			if (bb.width < minWidth || bb.width > maxWidth) continue;
 			if (bb.height < minHeight || bb.height > maxHeight) continue;
 			double area = cv::contourArea(contour);
 			if (area < minArea) continue;
 			if (arcLength(contour, true) < minPerimeter) continue;
-			cv::convexHull(Mat(contour, true), hull);
+			cv::convexHull(cv::Mat(contour, true), hull);
 			double solid = 100 * area / cv::contourArea(hull);
 			if (solid < solidity[0] || solid > solidity[1]) continue;
 			if (contour.size() < minVertexCount || contour.size() > maxVertexCount)	continue;

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/operations/Filter_Lines.vm

@@ -8,7 +8,7 @@
 	 */
 	void $fileName::#func($step ["inputs", "minLength", "angle", "outputs"]) {
 	outputs.clear();
-	for (cv::Line line: inputs) {
+	for (Line line: inputs) {
 		if (line.length()>abs(minLength)) {
 			if ((line.angle() >= angle[0] && line.angle() <= angle[1]) ||
 					(line.angle() + 180.0 >= angle[0] && line.angle() + 180.0 <=angle[1])) {

ui/src/main/resources/edu/wpi/grip/ui/codegeneration/cpp/operations/Find_Contours.vm

@@ -8,7 +8,7 @@
 	void $fileName::#func($step ["input", "externalOnly", "contours"]) {
 		std::vector<cv::Vec4i> hierarchy;
 		contours.clear();
-		int mode = externalOnly ? RETR_EXTERNAL : RETR_LIST;
-		int method = CHAIN_APPROX_SIMPLE;
+		int mode = externalOnly ? cv::RETR_EXTERNAL : cv::RETR_LIST;
+		int method = cv::CHAIN_APPROX_SIMPLE;
 		cv::findContours(input, contours, hierarchy, mode, method);
 	}