Changeset 33449 for other-projects/is-sheet-music-encore/trunk/image-identification-terminal/javaClassifierComparison.java

Timestamp:

2019-09-02T17:08:03+12:00 (5 years ago)

Author:

cpb16

Message:

termnal version executes correctly. (Didnt include init threshold in fucntion ~_~). Need to create new code version. With simplier series of processing

File:

• other-projects/is-sheet-music-encore/trunk/image-identification-terminal/javaClassifierComparison.java (modified) (14 diffs)

other-projects/is-sheet-music-encore/trunk/image-identification-terminal/javaClassifierComparison.java

@@ -182 +182 @@
                 //Execute classifierType defined from arguement
 
+                File imgCheck = new File(imageFilename);
+                if(!imgCheck.exists()){System.err.println("Image not found: "+ imageFilename);}
+
                 //Split output by tab for processing in next java program
                 //imageFilename = 1, result = 3, classifierType = 4
@@ -201 +204 @@
                         break;
                     case "morphology":
-                        algorithmResult = Algorithm_MorphologyOLD(imageFilename);
+                        algorithmResult = Algorithm_Morphology(imageFilename);
                         bw.write("Filename:" + '\t' + imageFilename + '\t' + "Classified as:" + '\t' + algorithmResult.getBoolean() + '\t' + "Number of areas:" + '\t' + algorithmResult.getInteger() + '\t' + classifierType + '\n');
                         break;
@@ -330 +333 @@
         Boolean isSheetMusic = null;
         Pair returnVariables = new Pair();
+        int areaCounter = 0;
         try{
-            //Variables
-            int areaCounter = 0;
             Mat edgesDetectedRGB = new Mat();
             Mat original = Imgcodecs.imread(filename, Imgcodecs.IMREAD_GRAYSCALE);
+
+            System.out.println("Width: " + original.width() + " Height: " + original.height());
 
             ArrayList<MatOfPoint> contours = new ArrayList<MatOfPoint>();
@@ -361 +365 @@
             for (int i = 0; i < contours.size(); i++) {
                 double area = Imgproc.contourArea(contours.get(i));
+                System.out.println("AREA: " + area);
                 //Check if area detected meets threshold
                 if(area > THRESHOLD_AREA_SIZE) {
                     areaCounter++;
-                    //System.out.println("AREA: " + area);
-                }
-            }
-
-
-
-
-
+
+                }
+            }
+            System.out.println("areacount = " + areaCounter);
 
             //Calculates if sheet music or not
             if(areaCounter >= THRESHOLD_AREA_COUNT){
-                returnVariables.setBoolean(true);
+                isSheetMusic = true;
+                returnVariables.setBoolean(isSheetMusic);
                 returnVariables.setInteger(areaCounter);
             }
@@ -389 +391 @@
         Boolean isSheetMusic = null;
         Pair returnVariables = new Pair();
+        int FILLED = -1;
         try{
-            int FILLED = -1;
-            //Display Original
-            //imageViewer("original", original1);
-            Mat original = Imgcodecs.imread(filename, Imgcodecs.IMREAD_GRAYSCALE);
+            Mat original1 = Imgcodecs.imread(filename, Imgcodecs.IMREAD_GRAYSCALE);
+            System.out.println("Width: " + original1.width() + " Height: " + original1.height());
+            Mat original = original1.clone();
+            Imgproc.adaptiveThreshold(original1, original,255, Imgproc.ADAPTIVE_THRESH_GAUSSIAN_C,Imgproc.THRESH_BINARY_INV, 15, THRESHOLD_C);
             Mat test = original.clone();
-            //imageViewer("00 Inverse Binarized Original", test);
-
-
             //************************************
             //Large Object Removal
@@ -408 +408 @@
             Mat denoize = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(5,5));
             Imgproc.morphologyEx(srcLOR,maskLOR, Imgproc.MORPH_OPEN, denoize);
-            //imageViewer("01 Denoize - mask", maskLOR);
 
             //close up gaps
             Mat gapCloser = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(5,5));
             Imgproc.morphologyEx(maskLOR,maskLOR,Imgproc.MORPH_CLOSE, gapCloser);
-            //imageViewer("02 gap closer - mask", maskLOR);
 
             //Isolate large items
             Mat isolateLarge = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(8, 8));
             Imgproc.morphologyEx(maskLOR,maskLOR,Imgproc.MORPH_OPEN, isolateLarge);
-            //imageViewer("03 Isolate Large - mask", maskLOR);
 
             //Remove large items from image
             Core.bitwise_not(maskLOR,maskLOR);
             srcLOR.copyTo(dstLOR, maskLOR);
-            //imageViewer("04 Large Items Removed", dstLOR);
 
             //****************************************
@@ -435 +431 @@
             Mat startSOR =Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(7,7));
             Imgproc.morphologyEx(srcSOR,maskSOR, Imgproc.MORPH_OPEN, startSOR);
-            //imageViewer("11 show small - mask", maskSOR);
 
             Mat highlightSmall = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(7,7));
             Imgproc.dilate(maskSOR, maskSOR, highlightSmall);
-            //imageViewer("12 highlight small - mask", maskSOR);
+
 
 /*              Mat isolateSmall =Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(10,10));
@@ -449 +444 @@
             Core.bitwise_not(maskSOR, maskSOR);
             srcSOR.copyTo(dstSOR, maskSOR);
-            //imageViewer("14 Small Items Removed", dstSOR);
 
 
@@ -458 +452 @@
             Mat kernelErode = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(15,2)); //10,2
             Imgproc.erode(dstSOR,test,kernelErode);
-            //imageViewer("21 Erode plus pre", test);
+
 
             Mat kernelDilate = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(10,4)); //20,3
             Imgproc.dilate(test,test,kernelDilate);
-            //imageViewer("22 Dilate", test);
+
 
             Mat kernelClose = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(10,4)); //4,4
             Imgproc.morphologyEx(test, test, Imgproc.MORPH_CLOSE, kernelClose);
-            //imageViewer("23 Close", test);
+
 
 
             Mat kernelErode02 = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(10,4)); //10,1
             Imgproc.erode(test,test,kernelErode02);
-            //imageViewer("24 Erode (Final)", test);
+
 
             //********************************************************************************
@@ -511 +505 @@
                 }
             }
-            //imageViewer("80 All Contours found", allContoursFound);
-            //imageViewer("81 Large Contours Found", largeContoursFound);
 
             //*****************************************************************
@@ -536 +528 @@
                 Imgproc.circle(circleOutput, centers[i], (int) radius[i][0],new Scalar(255, 0, 0), 1);
             }
-            //imageViewer("82 Circles found", circleOutput);
+
 
             //********************************************************************************
@@ -551 +543 @@
                 Imgproc.circle(centreOutput, new Point(x, y), 4, new Scalar(255, 255, 255), 30);
             }
-            //imageViewer("83 Centres found", centreOutput);
-
 
             //***********************************************
@@ -563 +553 @@
             Mat postDilate = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(150,15));
             Imgproc.dilate(centreOutput,centreOutput,postDilate);
-            //imageViewer("91 PostDilated", centreOutput);
 
             Mat postClose = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(10,4)); //4,4
             Imgproc.morphologyEx(centreOutput, centreOutput, Imgproc.MORPH_CLOSE, postClose);
-            //imageViewer("92 PostClose", centreOutput);
 
             Mat postDenoize = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(100,100));
             Imgproc.morphologyEx(centreOutput,centreOutput, Imgproc.MORPH_OPEN, postDenoize);
-            //imageViewer("93 PostDenoize", centreOutput);
-
-            //Mat postOutline = Imgproc.getStructuringElement(Imgproc.MORPH_RECT, new Size(50,50));
-            //Imgproc.morphologyEx(centreOutput, centreOutput, Imgproc.MORPH_GRADIENT, postOutline);
 
             //Find area
@@ -584 +568 @@
                 double area = Imgproc.contourArea(postContours.get(i));
                 if(area > THRESHOLD_AREA_SIZE) {
-                    System.out.println("POST AREA: " + area + "AREA COUNTER: " + areaCounter);
-                    //Imgproc.drawContours(postContoursFound, postContours, i, new Scalar(0, 255, 0), FILLED);
+                    //System.err.println("POST AREA: " + area);
+                    Imgproc.drawContours(postContoursFound, postContours, i, new Scalar(0, 255, 0), FILLED);
                     areaCounter++;
                 }
             }
-
-            //imageViewer("93 PostEND", postContoursFound);
-
-            //Calculates if sheet music or not
+            //Classifier Calculation
             if(areaCounter >= THRESHOLD_AREA_COUNT){
-                returnVariables = new Pair(true, areaCounter);
-                //returnVariables.setBoolean(true);
-                //returnVariables.setInteger(areaCounter);
-                System.out.println("TEST RETURN VARIABLES: "+ returnVariables.toString());
-            }
-
+                returnVariables.setBoolean(true);
+                returnVariables.setInteger(areaCounter);
+            }
         }
         catch(Exception e){