blizzardfinnegan/javaOCR
1
1
Fork 0
Code Issues Pull requests Projects Releases 5 Packages Wiki Activity Actions

Fix minor glitch with DataSaving

Browse source 
Also expand buffer range on MovementFacade
This commit is contained in:
Blizzard Finnegan 2023-03-10 12:14:56 -05:00
parent 429386c428
commit 6b23c0e156
No known key found for this signature in database
GPG key ID: DE547EDF547DDA49
4 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dependency-reduced-pom.xml
View file

@ -4,7 +4,7 @@
<groupId>org.baxter.disco</groupId> <groupId>org.baxter.disco</groupId>
<artifactId>ocr</artifactId> <artifactId>ocr</artifactId>
<name>Disco OCR Accuracy Over Life Testing</name> <name>Disco OCR Accuracy Over Life Testing</name>
<version>4.3.5</version> <version>4.3.6</version>
<description>Testing Discos for long-term accuracy, using automated optical character recognition.</description> <description>Testing Discos for long-term accuracy, using automated optical character recognition.</description>
<organization> <organization>
<name>Baxter International</name> <name>Baxter International</name>
@ -91,9 +91,6 @@
<plugin> <plugin>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>3.4.1</version> <version>3.4.1</version>
<configuration>
<show>private</show>
</configuration>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>

2
pom.xml
View file

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.baxter.disco</groupId> <groupId>org.baxter.disco</groupId>
<artifactId>ocr</artifactId> <artifactId>ocr</artifactId>
<version>4.3.5</version> <version>4.3.6</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Disco OCR Accuracy Over Life Testing</name> <name>Disco OCR Accuracy Over Life Testing</name>
<description>Testing Discos for long-term accuracy, using automated optical character recognition.</description> <description>Testing Discos for long-term accuracy, using automated optical character recognition.</description>

2
src/main/java/org/baxter/disco/ocr/DataSaving.java
View file

@ -228,7 +228,7 @@ public class DataSaving
boolean output = false; boolean output = false;
int cellnum = 0; int cellnum = 0;
int startingRow = outputSheet.getLastRowNum(); int startingRow = outputSheet.getLastRowNum();
HSSFRow row = (cycle == 1) ? outputSheet.getRow(++startingRow) : outputSheet.createRow(++startingRow); HSSFRow row = (cycle == 1) ? outputSheet.getRow(startingRow) : outputSheet.createRow(++startingRow);
List<String> cameraNames = new ArrayList<>(cameraToFile.keySet()); List<String> cameraNames = new ArrayList<>(cameraToFile.keySet());
cycle++; cycle++;

4
src/main/java/org/baxter/disco/ocr/MovementFacade.java
View file

@ -44,7 +44,7 @@ public class MovementFacade
/** /**
* Amount of buffer between the found absolute speed, and used speed. * Amount of buffer between the found absolute speed, and used speed.
*/ */
private static final int SPEED_BUFFER = 5000; private static final int SPEED_BUFFER = 7500;
/** /**
* Minimum allowed speed of the fixture arm; also used for reset travels. * Minimum allowed speed of the fixture arm; also used for reset travels.
@ -455,7 +455,7 @@ public class MovementFacade
ErrorLogging.logError("DEBUG: Motor Frequency: " + FREQUENCY); ErrorLogging.logError("DEBUG: Motor Frequency: " + FREQUENCY);
ErrorLogging.logError("DEBUG: Motor calibrate on."); ErrorLogging.logError("DEBUG: Motor calibrate on.");
motorEnable.on(); motorEnable.on();
int TWO_SECONDS = 20 * TIME_CONVERSION; int TWO_SECONDS = 2 * TIME_CONVERSION;
for(int j = 0; j < TWO_SECONDS; j++) for(int j = 0; j < TWO_SECONDS; j++)
{ {
try{ Thread.sleep(POLL_WAIT); } catch(Exception e){ ErrorLogging.logError(e); } try{ Thread.sleep(POLL_WAIT); } catch(Exception e){ ErrorLogging.logError(e); }