From a8c8240e1df9fdfb10602bf9539a5720757e9217 Mon Sep 17 00:00:00 2001 From: jan Date: Sun, 10 Jul 2016 18:33:27 -0700 Subject: [PATCH] clean up old files --- .idea/compiler.xml | 38 +- .idea/workspace.xml | 360 +++++++++++------- src/ProjectorApplet.java | 8 +- src/ProjectorCommand.java | 6 - src/ProjectorCommandException.java | 5 + src/{ => oldfiles}/ObjectRecognition.java | 2 + src/{ => oldfiles}/Presets.java | 2 +- src/{ => oldfiles}/angleGather.java | 0 src/{ => oldfiles}/angleMove.java | 0 src/{ => oldfiles}/circleArrayStim.java | 0 src/{ => oldfiles}/clearScreen.java | 0 src/{ => oldfiles}/colorScreen.java | 0 src/{ => oldfiles}/developer.java | 0 src/{ => oldfiles}/euglena_basic_stimuli.java | 0 src/{ => oldfiles}/gradientWindow.java | 0 src/{ => oldfiles}/heatup.java | 0 src/{ => oldfiles}/identifyEuglena.java | 0 src/{ => oldfiles}/lineRotate.java | 0 src/{ => oldfiles}/merge.java | 0 src/{ => oldfiles}/objDensity.java | 0 src/{ => oldfiles}/proto488flashraster.java | 0 src/{ => oldfiles}/protoClear.java | 0 src/{ => oldfiles}/protoGather.java | 0 src/{ => oldfiles}/randomLED.java | 0 src/{ => oldfiles}/recordTimelapse.java | 0 src/{ => oldfiles}/rectangularStim.java | 0 src/{ => oldfiles}/separate.java | 0 src/{ => oldfiles}/showCV.java | 0 src/{ => oldfiles}/shrinkingCircle.java | 0 src/{ => oldfiles}/shrinkingWindow.java | 0 src/{ => oldfiles}/sketch.properties | 0 src/{ => oldfiles}/snapshot.java | 0 src/{ => oldfiles}/squareCorridor.java | 0 src/{ => oldfiles}/testing.java | 0 src/{ => oldfiles}/translateCircle.java | 0 src/{ => oldfiles}/unidirectionStim.java | 0 src/{ => oldfiles}/window.java | 0 37 files changed, 242 insertions(+), 179 deletions(-) create mode 100644 src/ProjectorCommandException.java rename src/{ => oldfiles}/ObjectRecognition.java (98%) rename src/{ => oldfiles}/Presets.java (99%) rename src/{ => oldfiles}/angleGather.java (100%) rename src/{ => oldfiles}/angleMove.java (100%) rename src/{ => oldfiles}/circleArrayStim.java (100%) rename src/{ => oldfiles}/clearScreen.java (100%) rename src/{ => oldfiles}/colorScreen.java (100%) rename src/{ => oldfiles}/developer.java (100%) rename src/{ => oldfiles}/euglena_basic_stimuli.java (100%) rename src/{ => oldfiles}/gradientWindow.java (100%) rename src/{ => oldfiles}/heatup.java (100%) rename src/{ => oldfiles}/identifyEuglena.java (100%) rename src/{ => oldfiles}/lineRotate.java (100%) rename src/{ => oldfiles}/merge.java (100%) rename src/{ => oldfiles}/objDensity.java (100%) rename src/{ => oldfiles}/proto488flashraster.java (100%) rename src/{ => oldfiles}/protoClear.java (100%) rename src/{ => oldfiles}/protoGather.java (100%) rename src/{ => oldfiles}/randomLED.java (100%) rename src/{ => oldfiles}/recordTimelapse.java (100%) rename src/{ => oldfiles}/rectangularStim.java (100%) rename src/{ => oldfiles}/separate.java (100%) rename src/{ => oldfiles}/showCV.java (100%) rename src/{ => oldfiles}/shrinkingCircle.java (100%) rename src/{ => oldfiles}/shrinkingWindow.java (100%) rename src/{ => oldfiles}/sketch.properties (100%) rename src/{ => oldfiles}/snapshot.java (100%) rename src/{ => oldfiles}/squareCorridor.java (100%) rename src/{ => oldfiles}/testing.java (100%) rename src/{ => oldfiles}/translateCircle.java (100%) rename src/{ => oldfiles}/unidirectionStim.java (100%) rename src/{ => oldfiles}/window.java (100%) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index f86c4f8..c2db97f 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,43 +2,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index edbfae3..1c9b7c1 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,14 +2,43 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -31,10 +60,10 @@ - + - - + + @@ -56,26 +85,24 @@ - - - - - + + + - + - - + + - - + + @@ -84,8 +111,8 @@ - - + + @@ -93,6 +120,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -119,11 +179,11 @@ - + - - + + @@ -183,9 +243,7 @@ @@ -229,7 +290,56 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -243,6 +353,11 @@ + + + + + - - - - - - - - - - @@ -498,7 +603,7 @@ - + @@ -512,9 +617,7 @@ - - - + @@ -526,14 +629,14 @@ - + - + @@ -547,9 +650,7 @@ - - - + @@ -557,9 +658,7 @@ - - - + @@ -567,9 +666,7 @@ - - - + @@ -577,9 +674,7 @@ - - - + @@ -587,9 +682,7 @@ - - - + @@ -597,14 +690,12 @@ - - - + - + @@ -612,7 +703,7 @@ - + @@ -620,7 +711,7 @@ - + @@ -635,7 +726,7 @@ - + @@ -662,13 +753,6 @@ - - - - - - - @@ -705,18 +789,7 @@ - - - - - - - - - - - - + @@ -766,7 +839,7 @@ - + @@ -774,7 +847,7 @@ - + @@ -802,7 +875,7 @@ - + @@ -810,20 +883,6 @@ - - - - - - - - - - - - - - @@ -834,26 +893,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -888,24 +927,83 @@ - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ProjectorApplet.java b/src/ProjectorApplet.java index da6f77f..da7e140 100644 --- a/src/ProjectorApplet.java +++ b/src/ProjectorApplet.java @@ -27,14 +27,11 @@ class ProjectorApplet extends PApplet { @Override public void setup() { clear(); - smooth(); -// calibrator.activate(); //for testing +// smooth(); // Smooth might create artefacts when animating? } @Override public void draw() { - calibrator.draw(parent); - ArrayList entriesToRemove = new ArrayList<>(); try { for (int i = 0; i < commandQueue.size(); i++) { @@ -53,6 +50,9 @@ class ProjectorApplet extends PApplet { for (int i = entriesToRemove.size() - 1; i >= 0; i--) { commandQueue.remove(i); } + + + calibrator.draw(parent); } public void reset() { diff --git a/src/ProjectorCommand.java b/src/ProjectorCommand.java index 37fbd87..9a77015 100644 --- a/src/ProjectorCommand.java +++ b/src/ProjectorCommand.java @@ -1,9 +1,3 @@ public interface ProjectorCommand { boolean run(ProjectorApplet p) throws ProjectorCommandException; } - -class ProjectorCommandException extends Exception { - ProjectorCommandException(String message) { - super(message); - } -} diff --git a/src/ProjectorCommandException.java b/src/ProjectorCommandException.java new file mode 100644 index 0000000..b7b4c5e --- /dev/null +++ b/src/ProjectorCommandException.java @@ -0,0 +1,5 @@ +class ProjectorCommandException extends Exception { + ProjectorCommandException(String message) { + super(message); + } +} \ No newline at end of file diff --git a/src/ObjectRecognition.java b/src/oldfiles/ObjectRecognition.java similarity index 98% rename from src/ObjectRecognition.java rename to src/oldfiles/ObjectRecognition.java index 08cabb3..4f3b7ee 100644 --- a/src/ObjectRecognition.java +++ b/src/oldfiles/ObjectRecognition.java @@ -1,3 +1,5 @@ +package oldfiles; + class EuglenaCounter { int roiX, roiY, roiWidth, roiHeight, lastMillis, avgTime; diff --git a/src/Presets.java b/src/oldfiles/Presets.java similarity index 99% rename from src/Presets.java rename to src/oldfiles/Presets.java index 35ac8dc..256ca32 100644 --- a/src/Presets.java +++ b/src/oldfiles/Presets.java @@ -1,4 +1,4 @@ -/* +package oldfiles;/* Previously implemented programs which we need to redo using classes case 2 : // Starts clear program clearScreen(); diff --git a/src/angleGather.java b/src/oldfiles/angleGather.java similarity index 100% rename from src/angleGather.java rename to src/oldfiles/angleGather.java diff --git a/src/angleMove.java b/src/oldfiles/angleMove.java similarity index 100% rename from src/angleMove.java rename to src/oldfiles/angleMove.java diff --git a/src/circleArrayStim.java b/src/oldfiles/circleArrayStim.java similarity index 100% rename from src/circleArrayStim.java rename to src/oldfiles/circleArrayStim.java diff --git a/src/clearScreen.java b/src/oldfiles/clearScreen.java similarity index 100% rename from src/clearScreen.java rename to src/oldfiles/clearScreen.java diff --git a/src/colorScreen.java b/src/oldfiles/colorScreen.java similarity index 100% rename from src/colorScreen.java rename to src/oldfiles/colorScreen.java diff --git a/src/developer.java b/src/oldfiles/developer.java similarity index 100% rename from src/developer.java rename to src/oldfiles/developer.java diff --git a/src/euglena_basic_stimuli.java b/src/oldfiles/euglena_basic_stimuli.java similarity index 100% rename from src/euglena_basic_stimuli.java rename to src/oldfiles/euglena_basic_stimuli.java diff --git a/src/gradientWindow.java b/src/oldfiles/gradientWindow.java similarity index 100% rename from src/gradientWindow.java rename to src/oldfiles/gradientWindow.java diff --git a/src/heatup.java b/src/oldfiles/heatup.java similarity index 100% rename from src/heatup.java rename to src/oldfiles/heatup.java diff --git a/src/identifyEuglena.java b/src/oldfiles/identifyEuglena.java similarity index 100% rename from src/identifyEuglena.java rename to src/oldfiles/identifyEuglena.java diff --git a/src/lineRotate.java b/src/oldfiles/lineRotate.java similarity index 100% rename from src/lineRotate.java rename to src/oldfiles/lineRotate.java diff --git a/src/merge.java b/src/oldfiles/merge.java similarity index 100% rename from src/merge.java rename to src/oldfiles/merge.java diff --git a/src/objDensity.java b/src/oldfiles/objDensity.java similarity index 100% rename from src/objDensity.java rename to src/oldfiles/objDensity.java diff --git a/src/proto488flashraster.java b/src/oldfiles/proto488flashraster.java similarity index 100% rename from src/proto488flashraster.java rename to src/oldfiles/proto488flashraster.java diff --git a/src/protoClear.java b/src/oldfiles/protoClear.java similarity index 100% rename from src/protoClear.java rename to src/oldfiles/protoClear.java diff --git a/src/protoGather.java b/src/oldfiles/protoGather.java similarity index 100% rename from src/protoGather.java rename to src/oldfiles/protoGather.java diff --git a/src/randomLED.java b/src/oldfiles/randomLED.java similarity index 100% rename from src/randomLED.java rename to src/oldfiles/randomLED.java diff --git a/src/recordTimelapse.java b/src/oldfiles/recordTimelapse.java similarity index 100% rename from src/recordTimelapse.java rename to src/oldfiles/recordTimelapse.java diff --git a/src/rectangularStim.java b/src/oldfiles/rectangularStim.java similarity index 100% rename from src/rectangularStim.java rename to src/oldfiles/rectangularStim.java diff --git a/src/separate.java b/src/oldfiles/separate.java similarity index 100% rename from src/separate.java rename to src/oldfiles/separate.java diff --git a/src/showCV.java b/src/oldfiles/showCV.java similarity index 100% rename from src/showCV.java rename to src/oldfiles/showCV.java diff --git a/src/shrinkingCircle.java b/src/oldfiles/shrinkingCircle.java similarity index 100% rename from src/shrinkingCircle.java rename to src/oldfiles/shrinkingCircle.java diff --git a/src/shrinkingWindow.java b/src/oldfiles/shrinkingWindow.java similarity index 100% rename from src/shrinkingWindow.java rename to src/oldfiles/shrinkingWindow.java diff --git a/src/sketch.properties b/src/oldfiles/sketch.properties similarity index 100% rename from src/sketch.properties rename to src/oldfiles/sketch.properties diff --git a/src/snapshot.java b/src/oldfiles/snapshot.java similarity index 100% rename from src/snapshot.java rename to src/oldfiles/snapshot.java diff --git a/src/squareCorridor.java b/src/oldfiles/squareCorridor.java similarity index 100% rename from src/squareCorridor.java rename to src/oldfiles/squareCorridor.java diff --git a/src/testing.java b/src/oldfiles/testing.java similarity index 100% rename from src/testing.java rename to src/oldfiles/testing.java diff --git a/src/translateCircle.java b/src/oldfiles/translateCircle.java similarity index 100% rename from src/translateCircle.java rename to src/oldfiles/translateCircle.java diff --git a/src/unidirectionStim.java b/src/oldfiles/unidirectionStim.java similarity index 100% rename from src/unidirectionStim.java rename to src/oldfiles/unidirectionStim.java diff --git a/src/window.java b/src/oldfiles/window.java similarity index 100% rename from src/window.java rename to src/oldfiles/window.java