diff --git a/src/main/java/org/baxter/disco/ocr/Cli.java b/src/main/java/org/baxter/disco/ocr/Cli.java index 864c90f..5b12538 100644 --- a/src/main/java/org/baxter/disco/ocr/Cli.java +++ b/src/main/java/org/baxter/disco/ocr/Cli.java @@ -97,8 +97,6 @@ public class Cli switch (userInput) { case 1: - println("Setting up cameras..."); - println("This may take a moment..."); configureCameras(); camerasConfigured = true; break; @@ -143,6 +141,7 @@ public class Cli printHelp(); break; case 8: + ErrorLogging.logError("DEBUG: User requested manual exit of program. Cleanly exiting..."); break; default: //Input handling already done by inputFiltering() diff --git a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java index 13b5a91..821af53 100644 --- a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java +++ b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java @@ -76,13 +76,13 @@ public class OpenCVFacade //Initial Camera creation static { + ErrorLogging.logError("Initialising cameras..."); File devDirectory = new File("/dev"); for(File cameraFile : devDirectory.listFiles( (file) -> { return file.getName().contains(CAMERA_FILE_PREFIX); })) { String cameraName = cameraFile.getName(). substring(CAMERA_FILE_PREFIX.length()); - ErrorLogging.logError("DEBUG: Camera name: " + cameraName); newCamera(cameraName, cameraFile.getAbsolutePath()); } } diff --git a/umlAndStateFlow.xmi b/umlAndStateFlow.xmi index a1edaa8..c1362c8 100644 --- a/umlAndStateFlow.xmi +++ b/umlAndStateFlow.xmi @@ -1,5 +1,5 @@ - + umbrello uml modeller 2.32.3 http://umbrello.kde.org @@ -60,12 +60,13 @@ - + - - + + + @@ -102,7 +103,7 @@ - +