Merge pull request #644 from phrack/641fix

Fixes #641 and fixes #643.  Fixes click to shot

Author: phrack

src/main/java/com/shootoff/camera/CameraManager.java

@@ -257,22 +257,22 @@ public void setFeedResolution(int width, int height) {
 
 	// Used by click-to-shoot and tests to inject a shot via the shot detector
 	public void injectShot(ShotColor color, double x, double y, boolean scaleShot) {
-		shotDetector.addShot(color, x, y, getCurrentFrameTimestamp(), scaleShot);
+		shotDetector.addShot(color, x, y, System.currentTimeMillis(), scaleShot);
 	}
 
 	public void clearShots() {
 		cameraView.clearShots();
 	}
 
 	public void reset() {
-		resetStartTime();
+		resetStartTime(0);
 		shotDetector.reset();
 		deduplicationProcessor.reset();
 		cameraView.reset();
 	}
 
-	private void resetStartTime() {
-		startTime = System.currentTimeMillis();
+	private void resetStartTime(long timestamp) {
+		startTime = timestamp;
 	}
 
 	@Override
@@ -779,7 +779,7 @@ public int getFrameCount() {
 
 	public long getCurrentFrameTimestamp() {
 		if (startTime == 0) {
-			resetStartTime();
+			resetStartTime(System.currentTimeMillis());
 			return 0;
 		}
 
@@ -788,7 +788,7 @@ public long getCurrentFrameTimestamp() {
 
 	public long cameraTimeToShotTime(long timestamp) {
 		if (startTime == 0) {
-			resetStartTime();
+			resetStartTime(timestamp);
 			return 0;
 		}
 

src/main/java/com/shootoff/gui/CanvasManager.java

@@ -161,7 +161,7 @@ public CanvasManager(Group canvasGroup, Resetter resetter, String cameraName,
 				// addArenaShot when they go through the arena camera feed's
 				// canvas manager
 				if (this instanceof MirroredCanvasManager) {
-					final long shotTimestamp = cameraManager == null ? 0 : cameraManager.getCurrentFrameTimestamp();
+					final long shotTimestamp = System.currentTimeMillis();
 
 					addShot(new Shot(shotColor, event.getX(), event.getY(), shotTimestamp, config.getMarkerRadius()),
 							false);