diff --git a/gs-cv/src/main/java/org/genericsystem/cv/ClassImgFieldsDetector.java b/gs-cv/src/main/java/org/genericsystem/cv/ClassImgFieldsDetector.java index 5c991bce0..03341a1af 100644 --- a/gs-cv/src/main/java/org/genericsystem/cv/ClassImgFieldsDetector.java +++ b/gs-cv/src/main/java/org/genericsystem/cv/ClassImgFieldsDetector.java @@ -3,13 +3,13 @@ import java.io.File; import java.util.stream.Stream; -import javafx.scene.layout.GridPane; - import org.opencv.core.Core; import org.opencv.core.Scalar; import org.opencv.core.Size; import org.opencv.imgcodecs.Imgcodecs; +import javafx.scene.layout.GridPane; + public class ClassImgFieldsDetector extends AbstractApp { static { System.loadLibrary(Core.NATIVE_LIBRARY_NAME); @@ -30,8 +30,6 @@ protected void fillGrid(GridPane mainGrid) { mainGrid.add(imgClass.getMean().getImageView(), columnIndex, rowIndex++); mainGrid.add(imgClass.getVariance().getImageView(), columnIndex, rowIndex++); - // imgClass.addMapper(img -> img.eraseCorners(0.1).dilateBlacks(86, 255, - // 76, new Size(20, 3))); // mainGrid.add(imgClass.getMean().getImageView(), columnIndex, // rowIndex++); // mainGrid.add(imgClass.getVariance().getImageView(), columnIndex, @@ -54,6 +52,7 @@ protected void fillGrid(GridPane mainGrid) { zones = Zones.load(imgClassDirectory); } catch (RuntimeException e) { System.out.println("could not load accurate zones"); + imgClass.addMapper(img -> img.eraseCorners(0.1).dilateBlacks(86, 255, 76, new Size(20, 3))); zones = Zones.get(imgClass.getClosedVarianceZones(new Size(9, 10)), 300, 6, 6); } Img model = imgClass.getMean(); @@ -65,7 +64,6 @@ protected void fillGrid(GridPane mainGrid) { System.out.println("File : " + file.getName()); if (i++ > 3) continue; - // System.out.println("File : " + file.getName()); Img img = new Img(Imgcodecs.imread(file.getPath())); for (Zone zone : zones) { System.out.println("Zone n°" + zone.getNum()); @@ -84,4 +82,3 @@ protected void fillGrid(GridPane mainGrid) { } } } - diff --git a/gs-cv/src/main/java/org/genericsystem/cv/Img.java b/gs-cv/src/main/java/org/genericsystem/cv/Img.java index 3798d26a3..e071f1e69 100644 --- a/gs-cv/src/main/java/org/genericsystem/cv/Img.java +++ b/gs-cv/src/main/java/org/genericsystem/cv/Img.java @@ -430,7 +430,7 @@ public Img otsuInv() { } public Img dilateBlacks(double valueThreshold, double saturatioThreshold, double blueThreshold, Size dilatation) { - return range(new Scalar(0, 0, 0), new Scalar(255, saturatioThreshold, valueThreshold), true).range(new Scalar(0, 0, 0), new Scalar(blueThreshold, 255, 255), false).gray().morphologyEx(Imgproc.MORPH_DILATE, Imgproc.MORPH_RECT, dilatation); + return range(new Scalar(0, 0, 0), new Scalar(255, saturatioThreshold, valueThreshold), true).range(new Scalar(0, 0, 0), new Scalar(blueThreshold, 255, 255), false).morphologyEx(Imgproc.MORPH_DILATE, Imgproc.MORPH_RECT, dilatation); } public Img equalizeHisto() { diff --git a/gs-cv/src/main/java/org/genericsystem/cv/Zones.java b/gs-cv/src/main/java/org/genericsystem/cv/Zones.java index 91ea0bca0..570209d73 100644 --- a/gs-cv/src/main/java/org/genericsystem/cv/Zones.java +++ b/gs-cv/src/main/java/org/genericsystem/cv/Zones.java @@ -117,7 +117,6 @@ public static Zones load(File file) { try { return mapper.readValue(file, Zones.class); } catch (IOException e) { - e.printStackTrace(); throw new RuntimeException(e); } }