From 2e8d3e62392ec8c86007d05c647e74c3e61500e3 Mon Sep 17 00:00:00 2001
From: Blizzard Finnegan <blizzardfinnegan@gmail.com>
Date: Thu, 9 Feb 2023 15:48:47 -0500
Subject: [PATCH] Minor updates to improve ease of use

- UI now reports back more helpful information on current activities
- version bump affected files
---
 pom.xml                                         |  2 +-
 src/main/java/org/baxter/disco/ocr/Cli.java     | 17 ++++++++++++++---
 .../java/org/baxter/disco/ocr/ConfigFacade.java |  2 +-
 .../java/org/baxter/disco/ocr/ErrorLogging.java |  5 +++--
 .../java/org/baxter/disco/ocr/OpenCVFacade.java |  6 ++----
 5 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index fab47a0..e687fcb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baxter.disco</groupId>
     <artifactId>ocr</artifactId>
-    <version>4.0.0</version>
+    <version>4.0.1</version>
     <packaging>jar</packaging>
     <name>Disco OCR Accuracy Over Life Testing</name>
     <description>Testing Discos for long-term accuracy, using automated optical character recognition.</description>
diff --git a/src/main/java/org/baxter/disco/ocr/Cli.java b/src/main/java/org/baxter/disco/ocr/Cli.java
index 44ff618..63219db 100644
--- a/src/main/java/org/baxter/disco/ocr/Cli.java
+++ b/src/main/java/org/baxter/disco/ocr/Cli.java
@@ -17,10 +17,15 @@ import java.util.concurrent.locks.ReentrantLock;
  * classes).
  *
  * @author Blizzard Finnegan
- * @version 1.4.0, 08 Feb. 2023
+ * @version 1.4.1, 09 Feb. 2023
  */
 public class Cli
 {
+    /**
+     * Complete build version number
+     */
+
+    private static final String version = "4.0.0";
     /**
      * Currently saved iteration count.
      */
@@ -78,6 +83,10 @@ public class Cli
 
     public static void main(String[] args)
     {
+        ErrorLogging.logError("========================");
+        ErrorLogging.logError("Accuracy Over Life Test");
+        ErrorLogging.logError("Version: " + version);
+        ErrorLogging.logError("========================");
         try{
             inputScanner = new Scanner(System.in);
 
@@ -385,7 +394,7 @@ public class Cli
         println("Will the image be thresholded? " + thresholdImage);
         String cameraActive = ((ConfigFacade.getValue(cameraName,ConfigProperties.ACTIVE) != 0) ? "yes" : "no");
         println("Will the camera be used when running tests? " + cameraActive);
-        println("Tesseract parsed value: " + tesseractValue);
+        println("Tesseract parsed value for camera " + cameraName + ": " + tesseractValue);
         println("------------------------------------");
         println("1. Change Crop X");
         println("2. Change Crop Y");
@@ -573,7 +582,8 @@ public class Cli
                 }
                 else if(modifiedProperty != ConfigProperties.PRIME)
                 {
-                    prompt("Enter new value for this property (" + modifiedProperty.toString() + "): ");
+                    prompt("Enter new value for this property (" + modifiedProperty.toString() + ", currently : " +
+                            ConfigFacade.getValue(cameraName,modifiedProperty) + "): ");
                     userInput = inputFiltering(inputScanner.nextLine());
                     ConfigFacade.setValue(cameraName,modifiedProperty,userInput);
                     //if(canvas != null) canvas.dispose();
@@ -764,6 +774,7 @@ public class Cli
         fixture.closeGPIO();
         ErrorLogging.logError("DEBUG: END OF PROGRAM.");
         ErrorLogging.closeLogs();
+        println("The program has exited successfully. Please press Ctrl-c to return to the terminal prompt.");
     }
 
     /**
diff --git a/src/main/java/org/baxter/disco/ocr/ConfigFacade.java b/src/main/java/org/baxter/disco/ocr/ConfigFacade.java
index b3daadd..88cc815 100644
--- a/src/main/java/org/baxter/disco/ocr/ConfigFacade.java
+++ b/src/main/java/org/baxter/disco/ocr/ConfigFacade.java
@@ -23,7 +23,7 @@ import java.util.ArrayList;
  * Can write to file when requested, reads from file on initial start.
  *
  * @author Blizzard Finnegan
- * @version 1.3.0, 08 Feb. 2023
+ * @version 1.3.1, 09 Feb. 2023
  */
 public class ConfigFacade
 {
diff --git a/src/main/java/org/baxter/disco/ocr/ErrorLogging.java b/src/main/java/org/baxter/disco/ocr/ErrorLogging.java
index 596b26a..fb1c540 100644
--- a/src/main/java/org/baxter/disco/ocr/ErrorLogging.java
+++ b/src/main/java/org/baxter/disco/ocr/ErrorLogging.java
@@ -17,7 +17,7 @@ import org.apache.commons.lang3.exception.ExceptionUtils;
  * as well as stderr.
  *
  * @author Blizzard Finnegan
- * @version 1.3.0, 03 Feb. 2023
+ * @version 1.3.1, 09 Feb. 2023
  */
 
 public class ErrorLogging
@@ -87,7 +87,8 @@ public class ErrorLogging
     {
         String errorStackTrace = ExceptionUtils.getStackTrace(error);
         String errorMessage = datetime.format(LocalDateTime.now())  + " - " + errorStackTrace;
-        logError(errorMessage);
+        fileOut.println(errorMessage);
+        fileOut.flush();
     }
 
     /**
diff --git a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java
index 3145a5d..5cd8270 100644
--- a/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java
+++ b/src/main/java/org/baxter/disco/ocr/OpenCVFacade.java
@@ -22,7 +22,7 @@ import java.util.List;
  * Performs image capture, as well as image manipulation.
  *
  * @author Blizzard Finnegan
- * @version 1.4.0, 08 Feb. 2023
+ * @version 1.4.1, 09 Feb. 2023
  */
 public class OpenCVFacade
 {
@@ -136,9 +136,7 @@ public class OpenCVFacade
      * @return List of available Webcam names.
      */
     public static Set<String> getCameraNames()
-    {
-        return cameraMap.keySet();
-    }
+    { return cameraMap.keySet(); }
 
 
     /** 
-- 
2.47.2