diff --git a/originalJavaUML.xmi b/originalJavaUML.xmi deleted file mode 100644 index 15aba98..0000000 --- a/originalJavaUML.xmi +++ /dev/null @@ -1,474 +0,0 @@ - - - - - umbrello uml modeller http://umbrello.kde.org - 1.6.18 - UnicodeUTF8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom.xml b/pom.xml index 9ba0377..e300bae 100644 --- a/pom.xml +++ b/pom.xml @@ -186,7 +186,7 @@ 3.4.1 + --> diff --git a/pythonUML.xmi b/pythonUML.xmi deleted file mode 100644 index d2499f9..0000000 --- a/pythonUML.xmi +++ /dev/null @@ -1,920 +0,0 @@ - - - - - umbrello uml modeller http://umbrello.kde.org - 1.6.18 - UnicodeUTF8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/main/java/org/baxter/disco/ocr/Cli.java b/src/main/java/org/baxter/disco/ocr/Cli.java index 45c5181..fae6b6d 100644 --- a/src/main/java/org/baxter/disco/ocr/Cli.java +++ b/src/main/java/org/baxter/disco/ocr/Cli.java @@ -337,10 +337,52 @@ public class Cli println("3. Change Threshold Value"); println("4. Toggle crop"); println("5. Toggle threshold"); - println("6. Exit"); + println("6. Help"); + println("7. Exit"); println("===================================="); } + /** + * Pre-defined menu for printing camera configuration options + */ + private static void printCameraConfigHelpMenu() + { + println("\n\n"); + println("============================================================"); + println("Camera Config Menu options:"); + println("------------------------------------------------------------"); + println("1. Change Crop Region:"); + println("\tChange where to crop the image down to."); + println("\tThis crop should only include the numbers"); + println("\ton the screen of the DUT, and not include"); + println("\tthe battery symbol, the degree symbol, or"); + println("\tany other additional items on the screen."); + println("2. Change Composite Frame Count:"); + println("\tChange the number of images to stack on top of each other."); + println("\tA higher number here can compensate slightly for low "); + println("\tthreshold value."); + println(""); + println("3. Change Threshold Value:"); + println("\tChange the threshold point used on the image."); + println("\tValid numbers range from 0 to 255."); + println("\tA higher number will make more of the image black."); + println("\tA lower number will make more of the image white."); + println(""); + println("4. Toggle crop:"); + println("\tTurn off cropping for the preview."); + println(""); + println("5. Toggle threshold:"); + println("\tTurn off thesholding for the preview."); + println(""); + println("6. Help:"); + println("\tShow this menu"); + println(""); + println("7. Exit:"); + println("\t Exit to the previous menu to pick another camera"); + println("============================================================"); + println("Press enter to continue..."); + } + /** * Sub-function used to configure cameras. */ @@ -404,6 +446,10 @@ public class Cli modifiedProperty = ConfigProperties.THRESHOLD; break; case 6: + printCameraConfigHelpMenu(); + inputScanner.nextLine(); + break; + case 7: modifiedProperty = ConfigProperties.PRIME; break; default: diff --git a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java index fe20f69..13b5a91 100644 --- a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java +++ b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java @@ -249,6 +249,16 @@ public class OpenCVFacade { Mat uncroppedImage = takePicture(cameraName); Rect roi = selectROI("Pick Crop Location", uncroppedImage); + if(roi.x() == 0 && roi.y() == 0 && roi.width() == 0 && roi.height() == 0) + { + ErrorLogging.logError("Crop error! - Invalid crop selection."); + ErrorLogging.logError("If the crop region did not have a box indicating is location, please restart the program."); + ConfigFacade.setValue(cameraName,ConfigProperties.CROP_X,ConfigProperties.CROP_X.getDefaultValue()); + ConfigFacade.setValue(cameraName,ConfigProperties.CROP_Y,ConfigProperties.CROP_Y.getDefaultValue()); + ConfigFacade.setValue(cameraName,ConfigProperties.CROP_W,ConfigProperties.CROP_W.getDefaultValue()); + ConfigFacade.setValue(cameraName,ConfigProperties.CROP_H,ConfigProperties.CROP_H.getDefaultValue()); + return; + } ConfigFacade.setValue(cameraName,ConfigProperties.CROP_X, roi.x()); ConfigFacade.setValue(cameraName,ConfigProperties.CROP_Y, roi.y()); ConfigFacade.setValue(cameraName,ConfigProperties.CROP_W, roi.width()); diff --git a/umlAndStateFlow.xmi b/umlAndStateFlow.xmi new file mode 100644 index 0000000..a1edaa8 --- /dev/null +++ b/umlAndStateFlow.xmi @@ -0,0 +1,144 @@ + + + + + umbrello uml modeller 2.32.3 http://umbrello.kde.org + 1.7.3 + UnicodeUTF8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +