Fix bug in Contour draw() where beginShape() and endShape() were called

atduskgreg · atduskgreg · commit cf2f910e817e · 2013-06-25T16:12:31.000-04:00
per-point, making contours invisible. Also, add access to Contour
bounding boxes. Note: Imgproc has different methods for finding
bounding boxes of MatOfPoint and MatOfPoint2D
diff --git a/distribution/OpenCVPro-1/download/OpenCVPro-1.zip b/distribution/OpenCVPro-1/download/OpenCVPro-1.zip
diff --git a/distribution/OpenCVPro-1/download/OpenCVPro.zip b/distribution/OpenCVPro-1/download/OpenCVPro.zip
diff --git a/distribution/OpenCVPro-1/examples/MarkerDetection/MarkerDetection.pde b/distribution/OpenCVPro-1/examples/MarkerDetection/MarkerDetection.pde
@@ -133,9 +133,6 @@ ArrayList<MatOfPoint2f> selectMarkers(ArrayList<MatOfPoint2f> candidates) {
       continue;
     }
 
-
-
-
     result.add(candidate);
   }
 
diff --git a/distribution/OpenCVPro-1/examples/WorkingWithColorImages/WorkingWithColorImages.pde b/distribution/OpenCVPro-1/examples/WorkingWithColorImages/WorkingWithColorImages.pde
@@ -1,19 +1,19 @@
 import gab.opencvpro.*;
 
 OpenCVPro opencv;
-PImage threshold, blur;
+PImage threshold, blur, adaptive, gray;
 
 void setup() {
   PImage img = loadImage("test.jpg");
-  size(img.width, img.height/2);
+  size(img.width, img.height);
 
   // By default, OpenCVPro works with a gray
   // version of the source image
   opencv = new OpenCVPro(this, img);
   // but you can tell it explicitly to use color instead:
   opencv.useColor();  
 
-  // A lot of OpenCV operations only work on gray.
+  // A lot of OpenCV operations only work on grayscale images.
   // But some do work in color, like threshold, blur, findCannyEdges, findChessboardCorners, etc.:
   opencv.threshold(75);
   threshold = opencv.getSnapshot();
@@ -22,17 +22,22 @@ void setup() {
   blur = opencv.getSnapshot();
 
   // If you try an operation that does not work in color
-  // it will raise an exception and print out a message:
-  try{
-    opencv.adaptiveThreshold(591, 1);
-  } catch (Exception e){
-  }
-
+  // it will print out an error message and leave the image unaffected
+  opencv.adaptiveThreshold(591, 1);
+  adaptive = opencv.getSnapshot();
+  
+  // if you convert the image to gray then you can
+  // do gray-only operations
+  opencv.gray();
+  opencv.adaptiveThreshold(591, 1);
+  gray = opencv.getSnapshot();
 }
 
 void draw() {
   scale(0.5);
   image(threshold, 0, 0);
   image(blur, threshold.width,0);
+  image(adaptive, 0,threshold.height);
+  image(gray, threshold.width, threshold.height);
 }
 
diff --git a/distribution/OpenCVPro-1/reference/allclasses-frame.html b/distribution/OpenCVPro-1/reference/allclasses-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 All Classes (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/allclasses-noframe.html b/distribution/OpenCVPro-1/reference/allclasses-noframe.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 All Classes (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/constant-values.html b/distribution/OpenCVPro-1/reference/constant-values.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 Constant Field Values (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/deprecated-list.html b/distribution/OpenCVPro-1/reference/deprecated-list.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 Deprecated List (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/Contour.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/Contour.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 Contour (Javadocs: OpenCVPro)
 </TITLE>
@@ -140,6 +140,14 @@ <H2>
 <CODE>&nbsp;void</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../gab/opencvpro/Contour.html#draw()">draw</A></B>()</CODE>
 
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;<A HREF="http://java.sun.com/javase/6/docs/api/java/awt/Rectangle.html?is-external=true" title="class or interface in java.awt">Rectangle</A></CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../gab/opencvpro/Contour.html#getBoundingBox()">getBoundingBox</A></B>()</CODE>
+
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
@@ -316,6 +324,17 @@ <H2>
 </DL>
 </DD>
 </DL>
+<HR>
+
+<A NAME="getBoundingBox()"><!-- --></A><H3>
+getBoundingBox</H3>
+<PRE>
+public <A HREF="http://java.sun.com/javase/6/docs/api/java/awt/Rectangle.html?is-external=true" title="class or interface in java.awt">Rectangle</A> <B>getBoundingBox</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+</DL>
 <!-- ========= END OF CLASS DATA ========= -->
 <HR>
 
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/OpenCVPro.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/OpenCVPro.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 OpenCVPro (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-frame.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-frame.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 gab.opencvpro (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-summary.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-summary.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 gab.opencvpro (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/gab/opencvpro/package-tree.html b/distribution/OpenCVPro-1/reference/gab/opencvpro/package-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 gab.opencvpro Class Hierarchy (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/help-doc.html b/distribution/OpenCVPro-1/reference/help-doc.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 API Help (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/index-all.html b/distribution/OpenCVPro-1/reference/index-all.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 Index (Javadocs: OpenCVPro)
 </TITLE>
@@ -185,7 +185,10 @@
 <A NAME="_G_"><!-- --></A><H2>
 <B>G</B></H2>
 <DL>
-<DT><A HREF="./gab/opencvpro/package-summary.html"><B>gab.opencvpro</B></A> - package gab.opencvpro<DD>&nbsp;<DT><A HREF="./gab/opencvpro/OpenCVPro.html#getBufferA()"><B>getBufferA()</B></A> - 
+<DT><A HREF="./gab/opencvpro/package-summary.html"><B>gab.opencvpro</B></A> - package gab.opencvpro<DD>&nbsp;<DT><A HREF="./gab/opencvpro/Contour.html#getBoundingBox()"><B>getBoundingBox()</B></A> - 
+Method in class gab.opencvpro.<A HREF="./gab/opencvpro/Contour.html" title="class in gab.opencvpro">Contour</A>
+<DD>&nbsp;
+<DT><A HREF="./gab/opencvpro/OpenCVPro.html#getBufferA()"><B>getBufferA()</B></A> - 
 Method in class gab.opencvpro.<A HREF="./gab/opencvpro/OpenCVPro.html" title="class in gab.opencvpro">OpenCVPro</A>
 <DD>&nbsp;
 <DT><A HREF="./gab/opencvpro/OpenCVPro.html#getBufferB()"><B>getBufferB()</B></A> - 
diff --git a/distribution/OpenCVPro-1/reference/index.html b/distribution/OpenCVPro-1/reference/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Tue Jun 25 10:25:22 EDT 2013-->
+<!-- Generated by javadoc on Tue Jun 25 16:10:30 EDT 2013-->
 <TITLE>
 Javadocs: OpenCVPro
 </TITLE>
diff --git a/distribution/OpenCVPro-1/reference/overview-tree.html b/distribution/OpenCVPro-1/reference/overview-tree.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 10:25:22 EDT 2013 -->
+<!-- Generated by javadoc (build 1.6.0_45) on Tue Jun 25 16:10:30 EDT 2013 -->
 <TITLE>
 Class Hierarchy (Javadocs: OpenCVPro)
 </TITLE>
diff --git a/examples/FindContours/FindContours.pde b/examples/FindContours/FindContours.pde
@@ -29,11 +29,7 @@ void draw() {
   
   for (Contour contour : contours) {
     stroke(0, 255, 0);
-    beginShape();
-    for (PVector point : contour.getPoints()) {
-      vertex(point.x, point.y);
-    }
-    endShape();
+    contour.draw();
     
     stroke(255, 0, 0);
     beginShape();
diff --git a/src/gab/opencvpro/Contour.java b/src/gab/opencvpro/Contour.java
@@ -6,26 +6,40 @@
 import org.opencv.core.MatOfPoint;
 import org.opencv.core.MatOfPoint2f;
 import org.opencv.imgproc.Imgproc;
+import org.opencv.core.Rect;
 
 import org.opencv.core.Point;
 
+import java.awt.Rectangle;
+
+
 public class Contour {
 	private ArrayList<PVector> points;
 	private Point[] inputPoints;
 	private double polygonApproximationFactor;
 	PApplet parent;
+	Rectangle boundingBox;
 	
 	public Contour(PApplet parent, MatOfPoint mat){
 		polygonApproximationFactor = mat.size().height * 0.01;
 		this.parent = parent;
+		
+		Rect r = Imgproc.boundingRect(mat);
+		boundingBox = new Rectangle(r.x, r.y, r.width, r.height);
+		
 	    loadPoints(mat.toArray());
 	}
 	
 	public Contour(PApplet parent, MatOfPoint2f mat){
 		polygonApproximationFactor = mat.size().height * 0.01;
 		this.parent = parent;
-	    loadPoints(mat.toArray());	    
+		
+		Rect r = Imgproc.minAreaRect(mat).boundingRect();
+		boundingBox = new Rectangle(r.x, r.y, r.width, r.height);
+
+		loadPoints(mat.toArray());	    
 	}
+
 	
 	public void loadPoints(Point[] pts){
 	    points = new ArrayList<PVector>();
@@ -55,11 +69,12 @@ public Contour getPolygonApproximation(){
 	}
 	
 	public void draw(){
+		parent.beginShape();
 		for (PVector p : points) {
-		    parent.beginShape();
-		      parent.vertex(p.x, p.y);
-		    parent.endShape();
-		  }
+			parent.vertex(p.x, p.y);
+		}
+		parent.endShape();
+
 	}
 	
 	public ArrayList<PVector> getPoints(){
@@ -70,5 +85,8 @@ public int numPoints(){
 		return points.size();
 	}
 	
+	public Rectangle getBoundingBox(){
+		return boundingBox;
+	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -133,9 +133,6 @@ ArrayList<MatOfPoint2f> selectMarkers(ArrayList<MatOfPoint2f> candidates) {`
`133`	`133`	`continue;`
`134`	`134`	`}`
`135`	`135`
`136`		`-`
`137`		`-`
`138`		`-`
`139`	`136`	`result.add(candidate);`
`140`	`137`	`}`
`141`	`138`