jan/euglena
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up old files

Browse Source
This commit is contained in:
jan 2016-07-10 18:33:27 -07:00
parent cd714a0274
commit a8c8240e1d
37 changed files with 242 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
.idea/compiler.xml
View File

@ -2,43 +2,7 @@
<project version="4">
<component name="CompilerConfiguration">
<excludeFromCompile>
<file url="file://$PROJECT_DIR$/src/circleArrayStim.java" />
<file url="file://$PROJECT_DIR$/src/objDensity.java" />
<file url="file://$PROJECT_DIR$/src/sketch.properties" />
<file url="file://$PROJECT_DIR$/src/protoGather.java" />
<file url="file://$PROJECT_DIR$/src/lineRotate.java" />
<file url="file://$PROJECT_DIR$/src/angleMove.java" />
<file url="file://$PROJECT_DIR$/src/heatup.java" />
<file url="file://$PROJECT_DIR$/src/angleGather.java" />
<file url="file://$PROJECT_DIR$/src/ObjectRecognition.java" />
<file url="file://$PROJECT_DIR$/src/colorScreen.java" />
<file url="file://$PROJECT_DIR$/src/RotateClass.java" />
<file url="file://$PROJECT_DIR$/src/squareCorridor.java" />
<file url="file://$PROJECT_DIR$/src/Presets.java" />
<file url="file://$PROJECT_DIR$/src/identifyEuglena.java" />
<file url="file://$PROJECT_DIR$/src/unidirectionStim.java" />
<file url="file://$PROJECT_DIR$/src/shrinkingCircle.java" />
<file url="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java" />
<file url="file://$PROJECT_DIR$/src/protoClear.java" />
<file url="file://$PROJECT_DIR$/src/gradientWindow.java" />
<file url="file://$PROJECT_DIR$/src/recordTimelapse.java" />
<file url="file://$PROJECT_DIR$/src/ShrinkClass.java" />
<file url="file://$PROJECT_DIR$/src/TranslateClass.java" />
<file url="file://$PROJECT_DIR$/src/translateCircle.java" />
<file url="file://$PROJECT_DIR$/src/developer.java" />
<file url="file://$PROJECT_DIR$/src/shrinkingWindow.java" />
<file url="file://$PROJECT_DIR$/src/ExpandClass.java" />
<file url="file://$PROJECT_DIR$/src/rectangularStim.java" />
<file url="file://$PROJECT_DIR$/src/separate.java" />
<file url="file://$PROJECT_DIR$/src/testing.java" />
<file url="file://$PROJECT_DIR$/src/merge.java" />
<file url="file://$PROJECT_DIR$/src/window.java" />
<file url="file://$PROJECT_DIR$/src/snapshot.java" />
<file url="file://$PROJECT_DIR$/src/randomLED.java" />
<file url="file://$PROJECT_DIR$/src/proto488flashraster.java" />
<file url="file://$PROJECT_DIR$/src/clearDisplay.java" />
<file url="file://$PROJECT_DIR$/src/clearScreen.java" />
<file url="file://$PROJECT_DIR$/src/showCV.java" />
<directory url="file://$PROJECT_DIR$/src/oldfiles" includeSubdirectories="true" />
</excludeFromCompile>
<resourceExtensions />
<wildcardResourcePatterns>

360
.idea/workspace.xml
View File

@ -2,14 +2,43 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="6e752a8c-6cb9-4ef9-9031-0329ce15fcb4" name="Default" comment="Ellipse can be drawn...">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/EuglenaApplet.java" afterPath="$PROJECT_DIR$/src/EuglenaApplet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Expand.java" afterPath="$PROJECT_DIR$/src/Expand.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Menu.java" afterPath="$PROJECT_DIR$/src/Menu.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Rectangle.java" afterPath="$PROJECT_DIR$/src/Rectangle.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Rotate.java" afterPath="$PROJECT_DIR$/src/Rotate.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Shrink.java" afterPath="$PROJECT_DIR$/src/Shrink.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Translate.java" afterPath="$PROJECT_DIR$/src/Translate.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/euglena_basic_stimuli.java" afterPath="$PROJECT_DIR$/src/euglena_basic_stimuli.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/ProjectorCommandException.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/ObjectRecognition.java" afterPath="$PROJECT_DIR$/src/oldfiles/ObjectRecognition.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/Presets.java" afterPath="$PROJECT_DIR$/src/oldfiles/Presets.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/angleGather.java" afterPath="$PROJECT_DIR$/src/oldfiles/angleGather.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/angleMove.java" afterPath="$PROJECT_DIR$/src/oldfiles/angleMove.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/circleArrayStim.java" afterPath="$PROJECT_DIR$/src/oldfiles/circleArrayStim.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/clearScreen.java" afterPath="$PROJECT_DIR$/src/oldfiles/clearScreen.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/colorScreen.java" afterPath="$PROJECT_DIR$/src/oldfiles/colorScreen.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/developer.java" afterPath="$PROJECT_DIR$/src/oldfiles/developer.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/euglena_basic_stimuli.java" afterPath="$PROJECT_DIR$/src/oldfiles/euglena_basic_stimuli.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/gradientWindow.java" afterPath="$PROJECT_DIR$/src/oldfiles/gradientWindow.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/heatup.java" afterPath="$PROJECT_DIR$/src/oldfiles/heatup.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/identifyEuglena.java" afterPath="$PROJECT_DIR$/src/oldfiles/identifyEuglena.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/lineRotate.java" afterPath="$PROJECT_DIR$/src/oldfiles/lineRotate.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/merge.java" afterPath="$PROJECT_DIR$/src/oldfiles/merge.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/objDensity.java" afterPath="$PROJECT_DIR$/src/oldfiles/objDensity.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/proto488flashraster.java" afterPath="$PROJECT_DIR$/src/oldfiles/proto488flashraster.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/protoClear.java" afterPath="$PROJECT_DIR$/src/oldfiles/protoClear.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/protoGather.java" afterPath="$PROJECT_DIR$/src/oldfiles/protoGather.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/randomLED.java" afterPath="$PROJECT_DIR$/src/oldfiles/randomLED.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/recordTimelapse.java" afterPath="$PROJECT_DIR$/src/oldfiles/recordTimelapse.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/rectangularStim.java" afterPath="$PROJECT_DIR$/src/oldfiles/rectangularStim.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/separate.java" afterPath="$PROJECT_DIR$/src/oldfiles/separate.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/showCV.java" afterPath="$PROJECT_DIR$/src/oldfiles/showCV.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/shrinkingCircle.java" afterPath="$PROJECT_DIR$/src/oldfiles/shrinkingCircle.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/shrinkingWindow.java" afterPath="$PROJECT_DIR$/src/oldfiles/shrinkingWindow.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/sketch.properties" afterPath="$PROJECT_DIR$/src/oldfiles/sketch.properties" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/snapshot.java" afterPath="$PROJECT_DIR$/src/oldfiles/snapshot.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/squareCorridor.java" afterPath="$PROJECT_DIR$/src/oldfiles/squareCorridor.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/testing.java" afterPath="$PROJECT_DIR$/src/oldfiles/testing.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/translateCircle.java" afterPath="$PROJECT_DIR$/src/oldfiles/translateCircle.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/unidirectionStim.java" afterPath="$PROJECT_DIR$/src/oldfiles/unidirectionStim.java" />
<change type="MOVED" beforePath="$PROJECT_DIR$/src/window.java" afterPath="$PROJECT_DIR$/src/oldfiles/window.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ProjectorApplet.java" afterPath="$PROJECT_DIR$/src/ProjectorApplet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ProjectorCommand.java" afterPath="$PROJECT_DIR$/src/ProjectorCommand.java" />
</list>
<ignored path="processing-intellij.iws" />
<ignored path=".idea/workspace.xml" />
@ -31,10 +60,10 @@
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="euglena_basic_stimuli.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-807">
<caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
<state relative-caret-position="630">
<caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -56,26 +85,24 @@
<file leaf-file-name="EuglenaApplet.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/EuglenaApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="29" column="29" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="30" selection-start-line="0" selection-start-column="30" selection-end-line="0" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProjectorApplet.java" pinned="false" current-in-tab="false">
<file leaf-file-name="ProjectorApplet.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<state relative-caret-position="-26">
<caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#545#546#0" expanded="true" />
<element signature="e#604#605#0" expanded="true" />
<element signature="e#1739#1740#0" expanded="true" />
<element signature="e#1779#1780#0" expanded="true" />
<element signature="e#1744#1745#0" expanded="true" />
<element signature="e#1784#1785#0" expanded="true" />
</folding>
</state>
</provider>
@ -84,8 +111,8 @@
<file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="856">
<caret line="159" column="5" selection-start-line="159" selection-start-column="5" selection-end-line="159" selection-end-column="5" />
<state relative-caret-position="514">
<caret line="221" column="23" selection-start-line="221" selection-start-column="23" selection-end-line="223" selection-end-column="89" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -93,6 +120,39 @@
</provider>
</entry>
</file>
<file leaf-file-name="ProjectorCommand.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ProjectorCommand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="17" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ProjectorCommandException.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/ProjectorCommandException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
<folding>
<element signature="e#98#99#0" expanded="true" />
<element signature="e#128#129#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="testing.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/oldfiles/testing.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Rotate.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Rotate.java">
<provider selected="true" editor-type-id="text-editor">
@ -119,11 +179,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="Translate.java" pinned="false" current-in-tab="true">
<file leaf-file-name="Translate.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Translate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-664">
<caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
<state relative-caret-position="-844">
<caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
@ -183,9 +243,7 @@
<option value="$PROJECT_DIR$/src/Line.java" />
<option value="$PROJECT_DIR$/src/Ellipse.java" />
<option value="$PROJECT_DIR$/src/Triangle.java" />
<option value="$PROJECT_DIR$/src/ProjectorCommand.java" />
<option value="$PROJECT_DIR$/src/RotateClass.java" />
<option value="$PROJECT_DIR$/src/ProjectorApplet.java" />
<option value="$PROJECT_DIR$/src/Rectangle.java" />
<option value="$PROJECT_DIR$/src/EuglenaApplet.java" />
<option value="$PROJECT_DIR$/src/Menu.java" />
@ -194,6 +252,9 @@
<option value="$PROJECT_DIR$/src/Translate.java" />
<option value="$PROJECT_DIR$/src/Expand.java" />
<option value="$PROJECT_DIR$/src/euglena_basic_stimuli.java" />
<option value="$PROJECT_DIR$/src/ProjectorCommand.java" />
<option value="$PROJECT_DIR$/src/ProjectorCommandException.java" />
<option value="$PROJECT_DIR$/src/ProjectorApplet.java" />
</list>
</option>
</component>
@ -229,7 +290,56 @@
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane />
<subPane>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="processing-intellij" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="processing-intellij" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="eug3" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="processing-intellij" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="eug3" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="processing-intellij" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="eug3" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="src" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="oldfiles" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Scratches" />
<pane id="PackagesPane" />
@ -243,6 +353,11 @@
<property name="project.structure.proportion" value="0.15" />
<property name="project.structure.side.proportion" value="0.2" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="$PROJECT_DIR$/src/oldfiles" />
</key>
</component>
<component name="RunManager" selected="Application.ExampleApplet">
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
@ -389,14 +504,14 @@
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4006192" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.40014902" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="true" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2675112" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2675112" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.18503937" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.18503937" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.328614" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2159031" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
@ -456,16 +571,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/LEDControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="22" column="0" selection-start-line="22" selection-start-column="0" selection-end-line="22" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Camera.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="720">
@ -498,7 +603,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -512,9 +617,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="522">
<caret line="40" column="35" selection-start-line="40" selection-start-column="35" selection-end-line="40" selection-end-column="35" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -526,14 +629,14 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/angleGather.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/angleGather.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -547,9 +650,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -557,9 +658,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -567,9 +666,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -577,9 +674,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -587,9 +682,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
@ -597,14 +690,12 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/LEDtest.java" />
<entry file="file://$PROJECT_DIR$/src/heatup.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/heatup.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
@ -612,7 +703,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/gradientWindow.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/gradientWindow.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@ -620,7 +711,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/angleGather.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/angleGather.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="216">
<caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
@ -635,7 +726,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/snapshot.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/snapshot.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" />
@ -662,13 +753,6 @@
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Procedure.java" />
<entry file="file://$PROJECT_DIR$/src/testing.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="180">
<caret line="5" column="10" selection-start-line="5" selection-start-column="10" selection-end-line="5" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/clearDisplay.java" />
<entry file="jar:///usr/lib/jvm/java-8-openjdk-amd64/jre/lib/rt.jar!/java/lang/Integer.class">
<provider selected="true" editor-type-id="text-editor">
@ -705,18 +789,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorCommand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="162">
<caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding>
<element signature="e#206#207#0" expanded="true" />
<element signature="e#236#237#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Presets.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/Presets.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="36">
<caret line="30" column="6" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" />
@ -766,7 +839,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/merge.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/merge.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="828">
<caret line="46" column="58" selection-start-line="46" selection-start-column="58" selection-end-line="46" selection-end-column="58" />
@ -774,7 +847,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/shrinkingCircle.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/shrinkingCircle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="7" selection-start-line="35" selection-start-column="7" selection-end-line="35" selection-end-column="7" />
@ -802,7 +875,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ObjectRecognition.java">
<entry file="file://$PROJECT_DIR$/src/oldfiles/ObjectRecognition.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="6" selection-start-line="0" selection-start-column="6" selection-end-line="0" selection-end-column="6" />
@ -810,20 +883,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378">
<caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#545#546#0" expanded="true" />
<element signature="e#604#605#0" expanded="true" />
<element signature="e#1739#1740#0" expanded="true" />
<element signature="e#1779#1780#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/LEDControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="516">
@ -834,26 +893,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="856">
<caret line="159" column="5" selection-start-line="159" selection-start-column="5" selection-end-line="159" selection-end-column="5" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/EuglenaApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="29" column="29" selection-start-line="29" selection-start-column="11" selection-end-line="29" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Rotate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1082">
@ -888,24 +927,83 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/Translate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-664">
<caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
<state relative-caret-position="-844">
<caret line="14" column="37" selection-start-line="14" selection-start-column="37" selection-end-line="14" selection-end-column="37" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java">
<entry file="file://$PROJECT_DIR$/src/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-807">
<caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
<state relative-caret-position="514">
<caret line="221" column="23" selection-start-line="221" selection-start-column="23" selection-end-line="223" selection-end-column="89" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorCommand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="17" selection-start-line="0" selection-start-column="17" selection-end-line="0" selection-end-column="17" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/oldfiles/testing.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="198">
<caret line="11" column="0" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorCommandException.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="72">
<caret line="4" column="1" selection-start-line="4" selection-start-column="1" selection-end-line="4" selection-end-column="1" />
<folding>
<element signature="e#98#99#0" expanded="true" />
<element signature="e#128#129#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/EuglenaApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="30" selection-start-line="0" selection-start-column="30" selection-end-line="0" selection-end-column="30" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/oldfiles/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630">
<caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-26">
<caret line="38" column="38" selection-start-line="38" selection-start-column="38" selection-end-line="38" selection-end-column="38" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#545#546#0" expanded="true" />
<element signature="e#604#605#0" expanded="true" />
<element signature="e#1744#1745#0" expanded="true" />
<element signature="e#1784#1785#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
<component name="masterDetails">
<states>

8
src/ProjectorApplet.java
View File

@ -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<Integer> 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() {

6
src/ProjectorCommand.java
View File

@ -1,9 +1,3 @@
public interface ProjectorCommand {
boolean run(ProjectorApplet p) throws ProjectorCommandException;
}
class ProjectorCommandException extends Exception {
ProjectorCommandException(String message) {
super(message);
}
}

5
src/ProjectorCommandException.java Normal file
View File

@ -0,0 +1,5 @@
class ProjectorCommandException extends Exception {
ProjectorCommandException(String message) {
super(message);
}
}

2
src/ObjectRecognition.java → src/oldfiles/ObjectRecognition.java
View File

@ -1,3 +1,5 @@
package oldfiles;
class EuglenaCounter {
int roiX, roiY, roiWidth, roiHeight, lastMillis, avgTime;

2
src/Presets.java → src/oldfiles/Presets.java
View File

@ -1,4 +1,4 @@
/*
package oldfiles;/*
Previously implemented programs which we need to redo using classes
case 2 : // Starts clear program
clearScreen();

0
src/angleGather.java → src/oldfiles/angleGather.java
View File

0
src/angleMove.java → src/oldfiles/angleMove.java
View File

0
src/circleArrayStim.java → src/oldfiles/circleArrayStim.java
View File

0
src/clearScreen.java → src/oldfiles/clearScreen.java
View File

0
src/colorScreen.java → src/oldfiles/colorScreen.java
View File

0
src/developer.java → src/oldfiles/developer.java
View File

0
src/euglena_basic_stimuli.java → src/oldfiles/euglena_basic_stimuli.java
View File

0
src/gradientWindow.java → src/oldfiles/gradientWindow.java
View File

0
src/heatup.java → src/oldfiles/heatup.java
View File

0
src/identifyEuglena.java → src/oldfiles/identifyEuglena.java
View File

0
src/lineRotate.java → src/oldfiles/lineRotate.java
View File

0
src/merge.java → src/oldfiles/merge.java
View File

0
src/objDensity.java → src/oldfiles/objDensity.java
View File

0
src/proto488flashraster.java → src/oldfiles/proto488flashraster.java
View File

0
src/protoClear.java → src/oldfiles/protoClear.java
View File

0
src/protoGather.java → src/oldfiles/protoGather.java
View File

0
src/randomLED.java → src/oldfiles/randomLED.java
View File

0
src/recordTimelapse.java → src/oldfiles/recordTimelapse.java
View File

0
src/rectangularStim.java → src/oldfiles/rectangularStim.java
View File

0
src/separate.java → src/oldfiles/separate.java
View File

0
src/showCV.java → src/oldfiles/showCV.java
View File

0
src/shrinkingCircle.java → src/oldfiles/shrinkingCircle.java
View File

0
src/shrinkingWindow.java → src/oldfiles/shrinkingWindow.java
View File

0
src/sketch.properties → src/oldfiles/sketch.properties
View File

0
src/snapshot.java → src/oldfiles/snapshot.java
View File

0
src/squareCorridor.java → src/oldfiles/squareCorridor.java
View File

0
src/testing.java → src/oldfiles/testing.java
View File

0
src/translateCircle.java → src/oldfiles/translateCircle.java
View File

0
src/unidirectionStim.java → src/oldfiles/unidirectionStim.java
View File

0
src/window.java → src/oldfiles/window.java
View File