Merge pull request atduskgreg#95 from ncmikkelsen/master

atduskgreg · web-flow · commit 21135f2e6328 · 2017-05-21T15:56:01.000-07:00
Update size() parameters of examples
diff --git a/examples/BrightestPoint/BrightestPoint.pde b/examples/BrightestPoint/BrightestPoint.pde
@@ -5,7 +5,7 @@ OpenCV opencv;
 void setup() {
   PImage src = loadImage("robot_light.jpg");
   src.resize(800, 0);
-  size(src.width, src.height);
+  size(800, 533);
   
   opencv = new OpenCV(this, src);  
 }
@@ -18,5 +18,4 @@ void draw() {
   strokeWeight(4);
   noFill();
   ellipse(loc.x, loc.y, 10, 10);
-}
-
+}
diff --git a/examples/BrightnessContrast/BrightnessContrast.pde b/examples/BrightnessContrast/BrightnessContrast.pde
@@ -5,13 +5,12 @@ OpenCV opencv;
 
 void setup(){
   img = loadImage("test.jpg");
-  size(img.width, img.height);
+  size(1080, 720);
   opencv = new OpenCV(this, img);  
 }
 
 void draw(){
   opencv.loadImage(img);
   opencv.brightness((int)map(mouseX, 0, width, -255, 255));
   image(opencv.getOutput(),0,0);
-}
-
+}
diff --git a/examples/CalibrationDemo/CalibrationDemo.pde b/examples/CalibrationDemo/CalibrationDemo.pde
@@ -7,7 +7,7 @@ OpenCV opencv;
 void setup() {
   src = loadImage("checkerboard.jpg");
   src.resize(500, 0);
-  size(src.width, src.height);
+  size(500, 333);
 
   opencv = new OpenCV(this, src);
   opencv.gray();
@@ -22,4 +22,4 @@ void draw() {
   for(PVector p : cornerPoints){
     ellipse(p.x, p.y, 5, 5);
   }
-}
+}
diff --git a/examples/ColorChannels/ColorChannels.pde b/examples/ColorChannels/ColorChannels.pde
@@ -9,7 +9,7 @@ void setup() {
   src = loadImage("green_object.png");
   src.resize(800,0);
   opencv = new OpenCV(this, src);  
-  size(int(opencv.width*1.5), int(opencv.height * 1.5));
+  size(1200, 672);
   
   imgH = src.height/2;
   imgW = src.width/2;
@@ -43,4 +43,4 @@ void draw() {
   image(h, 0, 2*imgH, imgW, imgH);
   image(s, imgW, 2*imgH, imgW, imgH);
   image(v, 2*imgW, 2*imgH, imgW, imgH);
-}
+}
diff --git a/examples/DepthFromStereo/DepthFromStereo.pde b/examples/DepthFromStereo/DepthFromStereo.pde
@@ -15,8 +15,8 @@ void setup() {
 
   ocvR = new OpenCV(this, imgR);
 
-  size(ocvL.width * 2, ocvL.height*2);
-
+  size(768, 576);
+  
   ocvL.gray();
   ocvR.gray();
   Mat left = ocvL.getGray();
@@ -54,5 +54,4 @@ void draw() {
   text("right", 10 + imgL.width, 20);
   text("stereo SGBM", 10, imgL.height + 20);
   text("stereo BM", 10 + imgL.width, imgL.height+ 20);
-}
-
+}
diff --git a/examples/DilationAndErosion/DilationAndErosion.pde b/examples/DilationAndErosion/DilationAndErosion.pde
@@ -6,7 +6,7 @@ OpenCV opencv;
 void setup() {
   src = loadImage("pen_sketch.jpg"); 
   src.resize(src.width/2, 0);
-  size(src.width*2, src.height*2);
+  size(800, 786);
 
   opencv = new OpenCV(this, src);
 
@@ -47,5 +47,4 @@ void draw() {
   text("erode", src.width + 20, 20);
   text("dilate", 20, src.height+20);
   text("dilate then erode\n(close holes)", src.width+20, src.height+20);
-}
-
+}
diff --git a/examples/FaceDetection/FaceDetection.pde b/examples/FaceDetection/FaceDetection.pde
@@ -6,7 +6,7 @@ Rectangle[] faces;
 
 void setup() {
   opencv = new OpenCV(this, "test.jpg");
-  size(opencv.width, opencv.height);
+  size(1080, 720);
 
   opencv.loadCascade(OpenCV.CASCADE_FRONTALFACE);  
   faces = opencv.detect();
@@ -21,5 +21,4 @@ void draw() {
   for (int i = 0; i < faces.length; i++) {
     rect(faces[i].x, faces[i].y, faces[i].width, faces[i].height);
   }
-}
-
+}
diff --git a/examples/FilterImages/FilterImages.pde b/examples/FilterImages/FilterImages.pde
@@ -5,7 +5,7 @@ PImage  img, thresh, blur, adaptive;
 
 void setup() {
   img = loadImage("test.jpg");
-  size(img.width, img.height);
+  size(1080, 720);
 
   opencv = new OpenCV(this, img);  
   PImage gray = opencv.getSnapshot();
@@ -36,5 +36,4 @@ void draw() {
   text("threshold", img.width - 100, 20 );
   text("blur", img.width/2 - 100, img.height/2 + 20 );
   text("adaptive threshold", img.width - 150, img.height/2 + 20 );
-}
-
+}
diff --git a/examples/FindContours/FindContours.pde b/examples/FindContours/FindContours.pde
@@ -8,7 +8,7 @@ ArrayList<Contour> polygons;
 
 void setup() {
   src = loadImage("test.jpg"); 
-  size(src.width, src.height/2);
+  size(1080, 360);
   opencv = new OpenCV(this, src);
 
   opencv.gray();
@@ -38,5 +38,4 @@ void draw() {
     }
     endShape();
   }
-}
-
+}
diff --git a/examples/FindEdges/FindEdges.pde b/examples/FindEdges/FindEdges.pde
@@ -5,7 +5,7 @@ PImage src, canny, scharr, sobel;
 
 void setup() {
   src = loadImage("test.jpg");
-  size(src.width, src.height);
+  size(1080, 720);
   
   opencv = new OpenCV(this, src);
   opencv.findCannyEdges(20,75);
@@ -34,5 +34,4 @@ void draw() {
   text("Canny", src.width/2 + 10, 25); 
   text("Scharr", 10, src.height/2 + 25); 
   text("Sobel", src.width/2 + 10, src.height/2 + 25);
-}
-
+}
diff --git a/examples/HSVColorTracking/HSVColorTracking.pde b/examples/HSVColorTracking/HSVColorTracking.pde
@@ -28,7 +28,7 @@ void setup() {
   opencv = new OpenCV(this, video.width, video.height);
   contours = new ArrayList<Contour>();
   
-  size(2*opencv.width, opencv.height, P2D);
+  size(1280, 480, P2D);
 }
 
 void draw() {
@@ -104,4 +104,4 @@ void mousePressed() {
   
   rangeLow = hue - 5;
   rangeHigh = hue + 5;
-}
+}
diff --git a/examples/HistogramSkinDetection/HistogramSkinDetection.pde b/examples/HistogramSkinDetection/HistogramSkinDetection.pde
@@ -16,7 +16,7 @@ Mat skinHistogram;
 void setup(){
   src = loadImage("test.jpg");
   src.resize(src.width/2, 0);
-  size(src.width*2 + 256, src.height);
+  size(1336, 360);
   // third argument is: useColor
   opencv = new OpenCV(this, src, true);  
 
@@ -58,4 +58,4 @@ void draw(){
   image(src,0,0);
   image(dst, src.width, 0);
   image(hist, src.width*2, 0);
-}
+}
diff --git a/examples/HoughLineDetection/HoughLineDetection.pde b/examples/HoughLineDetection/HoughLineDetection.pde
@@ -6,7 +6,7 @@ ArrayList<Line> lines;
 void setup() {
   PImage src = loadImage("film_scan.jpg");
   src.resize(0, 800);
-  size(src.width, src.height);
+  size(796, 800);
 
   opencv = new OpenCV(this, src);
   opencv.findCannyEdges(20, 75);
@@ -34,5 +34,4 @@ void draw() {
       line(line.start.x, line.start.y, line.end.x, line.end.y);
     }
   }
-}
-
+}
diff --git a/examples/HueRangeSelection/HueRangeSelection.pde b/examples/HueRangeSelection/HueRangeSelection.pde
@@ -10,7 +10,7 @@ int upperb = 100;
 void setup() {
   img = loadImage("colored_balls.jpg");
   opencv = new OpenCV(this, img);
-  size(opencv.width, opencv.height);
+  size(1024, 768);
   opencv.useColor(HSB);
 }
 
@@ -60,5 +60,4 @@ void mouseMoved() {
 
   upperb = constrain(upperb, lowerb, 255);
   lowerb = constrain(lowerb, 0, upperb-1);
-}
-
+}
diff --git a/examples/ImageDiff/ImageDiff.pde b/examples/ImageDiff/ImageDiff.pde
@@ -6,7 +6,7 @@ PImage  before, after, grayDiff;
 void setup() {
   before = loadImage("before.jpg");
   after = loadImage("after.jpg");
-  size(before.width, before.height);
+  size(640, 480);
 
   opencv = new OpenCV(this, before);    
   opencv.diff(after);
@@ -34,5 +34,4 @@ void draw() {
   text("gray diff", before.width/2 + 10, before.height/2+ 20);
 
 //  text("color diff", 10, before.height/2+ 20);
-}
-
+}
diff --git a/examples/ImageFiltering/ImageFiltering.pde b/examples/ImageFiltering/ImageFiltering.pde
@@ -44,7 +44,7 @@ void setup() {
   opencv = new OpenCV(this, 640, 480);
   contours = new ArrayList<Contour>();
   
-  size(opencv.width + 200, opencv.height, P2D);
+  size(840, 480, P2D);
   
   // Init Controls
   cp5 = new ControlP5(this);
@@ -293,5 +293,4 @@ void setLock(Controller theController, boolean theValue) {
     theController.setColorBackground(color(buttonBgColor));
     theController.setColorForeground(color(buttonColor));
   }
-}
-
+}
diff --git a/examples/ImageFilteringWithBlobPersistence/ImageFilteringWithBlobPersistence.pde b/examples/ImageFilteringWithBlobPersistence/ImageFilteringWithBlobPersistence.pde
@@ -62,7 +62,7 @@ void setup() {
   // Blobs list
   blobList = new ArrayList<Blob>();
   
-  size(opencv.width + 200, opencv.height, P2D);
+  size(840, 480, P2D);
   
   // Init Controls
   cp5 = new ControlP5(this);
@@ -451,5 +451,4 @@ void setLock(Controller theController, boolean theValue) {
     theController.setColorBackground(color(buttonBgColor));
     theController.setColorForeground(color(buttonColor));
   }
-}
-
+}
diff --git a/examples/LoadAndDisplayImage/LoadAndDisplayImage.pde b/examples/LoadAndDisplayImage/LoadAndDisplayImage.pde
@@ -4,10 +4,9 @@ OpenCV opencv;
 
 void setup() {
   opencv = new OpenCV(this, "test.jpg");
-  size(opencv.width, opencv.height);
+  size(1080, 720);
 }
 
 void draw() {
   image(opencv.getOutput(), 0, 0);
-}
-
+}
diff --git a/examples/LumaVsGray/LumaVsGray.pde b/examples/LumaVsGray/LumaVsGray.pde
@@ -18,7 +18,8 @@ PImage colorImage, grayImage;
 void setup() {
   colorImage = loadImage("flashlight.jpg");
   opencv = new OpenCV(this, colorImage);  
-  size(opencv.width, opencv.height);
+  size(1080, 720);
+  
   // Save the gray image so we can compare it to Luma
   grayImage = opencv.getSnapshot();
   // Use built-in OpenCV function to conver the color image from BGR to LAB color space.
@@ -40,4 +41,4 @@ void draw() {
   fill(255);
   text("GRAY", 30, height -25);
   text("LUMA", width/2 + 30, height - 25);
-}
+}
diff --git a/examples/MarkerDetection/MarkerDetection.pde b/examples/MarkerDetection/MarkerDetection.pde
@@ -23,7 +23,7 @@ boolean[][] markerCells;
 
 void setup() {
   opencv = new OpenCV(this, "marker_test.jpg");
-  size(opencv.width, opencv.height/2);
+  size(1000, 365);
   src = opencv.getInput();
 
   // hold on to this for later, since adaptiveThreshold is destructive
@@ -208,5 +208,4 @@ void draw() {
   }
 
   popMatrix();
-}
-
+}
diff --git a/examples/MultipleColorTracking/MultipleColorTracking.pde b/examples/MultipleColorTracking/MultipleColorTracking.pde
@@ -39,7 +39,7 @@ void setup() {
   opencv = new OpenCV(this, video.width, video.height);
   contours = new ArrayList<Contour>();
   
-  size(opencv.width + opencv.width/4 + 30, opencv.height, P2D);
+  size(830, 480, P2D);
   
   // Array for detection colors
   colors = new int[maxColors];
@@ -194,4 +194,4 @@ void keyPressed() {
 
 void keyReleased() {
   colorToChange = -1; 
-}
+}
diff --git a/examples/OpticalFlow/OpticalFlow.pde b/examples/OpticalFlow/OpticalFlow.pde
@@ -5,7 +5,7 @@ OpenCV opencv;
 Movie video;
 
 void setup() {
-  size(568*2, 320);
+  size(1136, 320);
   video = new Movie(this, "sample1.mov");
   opencv = new OpenCV(this, 568, 320);
   video.loop();
@@ -32,5 +32,4 @@ void draw() {
 
 void movieEvent(Movie m) {
   m.read();
-}
-
+}
diff --git a/examples/RegionOfInterest/RegionOfInterest.pde b/examples/RegionOfInterest/RegionOfInterest.pde
@@ -11,7 +11,8 @@ boolean useROI = true;
 void setup() {
   src = loadImage("test.jpg");
   opencv = new OpenCV(this, src);
-  size(opencv.width, opencv.height);
+  size(1080, 720);
+  println(opencv.width, opencv.height);
 }
 
 void draw() {
@@ -39,5 +40,4 @@ void keyPressed() {
   if (!useROI) {
     opencv.releaseROI();
   }
-}
-
+}
diff --git a/examples/WarpPerspective/WarpPerspective.pde b/examples/WarpPerspective/WarpPerspective.pde
diff --git a/examples/WorkingWithColorImages/WorkingWithColorImages.pde b/examples/WorkingWithColorImages/WorkingWithColorImages.pde

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ ArrayList<Contour> polygons;`
`8`	`8`
`9`	`9`	`void setup() {`
`10`	`10`	`src = loadImage("test.jpg");`
`11`		`- size(src.width, src.height/2);`
	`11`	`+ size(1080, 360);`
`12`	`12`	`opencv = new OpenCV(this, src);`
`13`	`13`
`14`	`14`	`opencv.gray();`
`@@ -38,5 +38,4 @@ void draw() {`
`38`	`38`	`}`
`39`	`39`	`endShape();`
`40`	`40`	`}`
`41`		`-}`
`42`		`-`
	`41`	`+}`