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

animations work

Browse Source
This commit is contained in:
jan 2016-07-10 18:20:55 -07:00
parent 19ca54add7
commit cd714a0274
9 changed files with 192 additions and 307 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

405
.idea/workspace.xml
View File

@ -2,24 +2,14 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="6e752a8c-6cb9-4ef9-9031-0329ce15fcb4" name="Default" comment="Ellipse can be drawn..."> <list default="true" id="6e752a8c-6cb9-4ef9-9031-0329ce15fcb4" name="Default" comment="Ellipse can be drawn...">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Expand.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Rotate.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Shrink.java" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/src/Translate.java" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/ExpandClass.java" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/RotateClass.java" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/ShrinkClass.java" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/src/TranslateClass.java" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/ClickGetter.java" afterPath="$PROJECT_DIR$/src/ClickGetter.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Ellipse.java" afterPath="$PROJECT_DIR$/src/Ellipse.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/EuglenaApplet.java" afterPath="$PROJECT_DIR$/src/EuglenaApplet.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/EuglenaApplet.java" afterPath="$PROJECT_DIR$/src/EuglenaApplet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Line.java" afterPath="$PROJECT_DIR$/src/Line.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/Menu.java" afterPath="$PROJECT_DIR$/src/Menu.java" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Rectangle.java" afterPath="$PROJECT_DIR$/src/Rectangle.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Rectangle.java" afterPath="$PROJECT_DIR$/src/Rectangle.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/Triangle.java" afterPath="$PROJECT_DIR$/src/Triangle.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" />
</list> </list>
<ignored path="processing-intellij.iws" /> <ignored path="processing-intellij.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -43,8 +33,8 @@
<file leaf-file-name="euglena_basic_stimuli.java" pinned="false" current-in-tab="true"> <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/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432"> <state relative-caret-position="-807">
<caret line="83" column="4" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="4" /> <caret line="33" column="49" selection-start-line="33" selection-start-column="49" selection-end-line="33" selection-end-column="49" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -63,11 +53,23 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<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>
</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="false">
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java"> <entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1530"> <state relative-caret-position="378">
<caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" /> <caret line="21" column="0" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#545#546#0" expanded="true" /> <element signature="e#545#546#0" expanded="true" />
@ -79,11 +81,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Ellipse.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Menu.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Ellipse.java"> <entry file="file://$PROJECT_DIR$/src/Menu.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450"> <state relative-caret-position="856">
<caret line="58" column="0" selection-start-line="58" selection-start-column="0" selection-end-line="79" selection-end-column="5" /> <caret line="159" column="5" selection-start-line="159" selection-start-column="5" selection-end-line="159" selection-end-column="5" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -91,45 +93,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Rectangle.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Rectangle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306">
<caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Triangle.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Triangle.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="252">
<caret line="50" column="0" selection-start-line="50" selection-start-column="0" selection-end-line="50" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="shrinkingCircle.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/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" />
<folding>
<element signature="e#0#1183#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Rotate.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Rotate.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Rotate.java"> <entry file="file://$PROJECT_DIR$/src/Rotate.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="1082">
<caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" /> <caret line="71" column="73" selection-start-line="71" selection-start-column="73" selection-end-line="71" selection-end-column="73" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -140,22 +108,22 @@
<file leaf-file-name="Shrink.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Shrink.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Shrink.java"> <entry file="file://$PROJECT_DIR$/src/Shrink.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576"> <state relative-caret-position="38">
<caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" /> <caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#821#822#0" expanded="true" /> <element signature="e#828#829#0" expanded="true" />
<element signature="e#869#870#0" expanded="true" /> <element signature="e#876#877#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Translate.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Translate.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/Translate.java"> <entry file="file://$PROJECT_DIR$/src/Translate.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="542"> <state relative-caret-position="-664">
<caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" /> <caret line="22" column="33" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -166,8 +134,8 @@
<file leaf-file-name="Expand.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Expand.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/Expand.java"> <entry file="file://$PROJECT_DIR$/src/Expand.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360"> <state relative-caret-position="1098">
<caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" /> <caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
</folding> </folding>
@ -209,23 +177,23 @@
<option value="$PROJECT_DIR$/src/MouseGetter.java" /> <option value="$PROJECT_DIR$/src/MouseGetter.java" />
<option value="$PROJECT_DIR$/src/Procedure.java" /> <option value="$PROJECT_DIR$/src/Procedure.java" />
<option value="$PROJECT_DIR$/src/LEDControl.java" /> <option value="$PROJECT_DIR$/src/LEDControl.java" />
<option value="$PROJECT_DIR$/src/euglena_basic_stimuli.java" />
<option value="$PROJECT_DIR$/src/Calibrator.java" /> <option value="$PROJECT_DIR$/src/Calibrator.java" />
<option value="$PROJECT_DIR$/src/clearDisplay.java" /> <option value="$PROJECT_DIR$/src/clearDisplay.java" />
<option value="$PROJECT_DIR$/src/Menu.java" />
<option value="$PROJECT_DIR$/src/EuglenaApplet.java" />
<option value="$PROJECT_DIR$/src/ClickGetter.java" /> <option value="$PROJECT_DIR$/src/ClickGetter.java" />
<option value="$PROJECT_DIR$/src/Line.java" /> <option value="$PROJECT_DIR$/src/Line.java" />
<option value="$PROJECT_DIR$/src/Ellipse.java" /> <option value="$PROJECT_DIR$/src/Ellipse.java" />
<option value="$PROJECT_DIR$/src/Rectangle.java" />
<option value="$PROJECT_DIR$/src/Triangle.java" /> <option value="$PROJECT_DIR$/src/Triangle.java" />
<option value="$PROJECT_DIR$/src/ProjectorCommand.java" /> <option value="$PROJECT_DIR$/src/ProjectorCommand.java" />
<option value="$PROJECT_DIR$/src/RotateClass.java" /> <option value="$PROJECT_DIR$/src/RotateClass.java" />
<option value="$PROJECT_DIR$/src/ProjectorApplet.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" />
<option value="$PROJECT_DIR$/src/Shrink.java" /> <option value="$PROJECT_DIR$/src/Shrink.java" />
<option value="$PROJECT_DIR$/src/Rotate.java" /> <option value="$PROJECT_DIR$/src/Rotate.java" />
<option value="$PROJECT_DIR$/src/Translate.java" /> <option value="$PROJECT_DIR$/src/Translate.java" />
<option value="$PROJECT_DIR$/src/Expand.java" /> <option value="$PROJECT_DIR$/src/Expand.java" />
<option value="$PROJECT_DIR$/src/euglena_basic_stimuli.java" />
</list> </list>
</option> </option>
</component> </component>
@ -261,38 +229,7 @@
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="ProjectPane"> <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>
</subPane>
</pane> </pane>
<pane id="Scratches" /> <pane id="Scratches" />
<pane id="PackagesPane" /> <pane id="PackagesPane" />
@ -451,16 +388,17 @@
<frame x="1920" y="0" width="1280" height="1440" extended-state="4" /> <frame x="1920" y="0" width="1280" height="1440" extended-state="4" />
<editor active="true" /> <editor active="true" />
<layout> <layout>
<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="true" show_stripe_button="true" weight="0.18503937" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<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="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.4006192" 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="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="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="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="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="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="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="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="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="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" /> <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" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39940387" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39940387" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@ -469,7 +407,6 @@
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" 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="5" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" 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="5" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32879257" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
@ -519,20 +456,6 @@
<option name="FILTER_TARGETS" value="false" /> <option name="FILTER_TARGETS" value="false" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="558">
<caret line="33" column="18" selection-start-line="33" selection-start-column="8" selection-end-line="33" selection-end-column="18" />
<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"> <entry file="file://$PROJECT_DIR$/src/LEDControl.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="378"> <state relative-caret-position="378">
@ -591,10 +514,6 @@
<caret line="40" column="35" selection-start-line="40" selection-start-column="35" selection-end-line="40" selection-end-column="35" /> <caret line="40" column="35" selection-start-line="40" selection-start-column="35" selection-end-line="40" selection-end-column="35" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -630,10 +549,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -644,10 +559,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -658,10 +569,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -672,10 +579,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -686,10 +589,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -700,10 +599,6 @@
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding> <folding>
<element signature="imports" expanded="true" /> <element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -783,26 +678,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/LEDControl.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
<caret line="7" column="20" selection-start-line="7" selection-start-column="20" selection-end-line="7" selection-end-column="20" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Menu.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="396">
<caret line="190" column="46" selection-start-line="190" selection-start-column="46" selection-end-line="190" selection-end-column="46" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Calibrator.java"> <entry file="file://$PROJECT_DIR$/src/Calibrator.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="416"> <state relative-caret-position="416">
@ -822,30 +697,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/euglena_basic_stimuli.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="432">
<caret line="83" column="4" selection-start-line="83" selection-start-column="0" selection-end-line="83" selection-end-column="4" />
<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="918">
<caret line="55" column="44" selection-start-line="55" selection-start-column="39" selection-end-line="55" selection-end-column="44" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#2317#2318#0" expanded="true" />
<element signature="e#2360#2361#0" expanded="true" />
<element signature="e#2415#2416#0" expanded="true" />
<element signature="e#2458#2459#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/ClickGetter.java"> <entry file="file://$PROJECT_DIR$/src/ClickGetter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="540"> <state relative-caret-position="540">
@ -899,20 +750,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/ProjectorApplet.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1530">
<caret line="97" column="0" selection-start-line="97" selection-start-column="0" selection-end-line="97" 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/TranslateClass.java"> <entry file="file://$PROJECT_DIR$/src/TranslateClass.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="90"> <state relative-caret-position="90">
@ -937,48 +774,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Expand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="360">
<caret line="20" column="33" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Translate.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="542">
<caret line="94" column="29" selection-start-line="94" selection-start-column="29" selection-end-line="94" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Shrink.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="576">
<caret line="39" column="34" selection-start-line="39" selection-start-column="34" selection-end-line="39" selection-end-column="34" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#821#822#0" expanded="true" />
<element signature="e#869#870#0" 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="540">
<caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/shrinkingCircle.java"> <entry file="file://$PROJECT_DIR$/src/shrinkingCircle.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="630"> <state relative-caret-position="630">
@ -1001,12 +796,116 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/Rectangle.java"> <entry file="file://$PROJECT_DIR$/src/Rectangle.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="306"> <state relative-caret-position="344">
<caret line="39" column="37" selection-start-line="39" selection-start-column="37" selection-end-line="39" selection-end-column="37" /> <caret line="46" column="0" selection-start-line="46" selection-start-column="0" selection-end-line="46" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/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" />
<folding />
</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">
<caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</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">
<caret line="71" column="73" selection-start-line="71" selection-start-column="73" selection-end-line="71" selection-end-column="73" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Expand.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1098">
<caret line="91" column="29" selection-start-line="91" selection-start-column="29" selection-end-line="91" selection-end-column="29" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/Shrink.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="45" column="0" selection-start-line="45" selection-start-column="0" selection-end-line="45" selection-end-column="0" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#828#829#0" expanded="true" />
<element signature="e#876#877#0" expanded="true" />
</folding>
</state>
</provider>
</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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/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" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component> </component>
<component name="masterDetails"> <component name="masterDetails">
<states> <states>

14
src/EuglenaApplet.java
View File

@ -18,6 +18,7 @@ public class EuglenaApplet extends PApplet {
//Pen //Pen
int penColor = color(200); int penColor = color(200);
int penWidth = 15; int penWidth = 15;
int operationSpeed = 10; //speed for Shrink, Expand, etc.
public static void main(String args[]) { public static void main(String args[]) {
@ -119,18 +120,7 @@ public class EuglenaApplet extends PApplet {
projectorApplet.calibrator.deactivate(); projectorApplet.calibrator.deactivate();
ledControl.allOff(); ledControl.allOff();
projectorApplet.clear(); projectorApplet.reset();
// lines.clear();
// ellipses.clear();
// rectangles.clear();
// triangles.clear();
// shrinkwindows.clear();
// expandwindows.clear();
// translatewindows.clear();
// rotatewindows.clear();
} }
} }
} }

9
src/Expand.java
View File

@ -5,7 +5,7 @@ import static processing.core.PApplet.*;
public class Expand { public class Expand {
float corner1x, corner1y, corner2x, corner2y, speed; float corner1x, corner1y, corner2x, corner2y, speed;
int timeElapsed, millisInit; int timeElapsed, millisInit;
PImage expandRegion; PImage expandRegion = null;
private boolean corner1complete; private boolean corner1complete;
@ -48,6 +48,11 @@ public class Expand {
ProjectorCommand makeProjectorCommand() { ProjectorCommand makeProjectorCommand() {
return (ProjectorApplet p) -> { return (ProjectorApplet p) -> {
if (expandRegion == null) {
millisInit = p.millis();
saveExpandRegion(p);
}
timeElapsed = p.millis() - millisInit; timeElapsed = p.millis() - millisInit;
float spaceElapsed = speed * (timeElapsed / 1000f); float spaceElapsed = speed * (timeElapsed / 1000f);
@ -85,8 +90,6 @@ public class Expand {
} else { } else {
corner2x = x; corner2x = x;
corner2y = y; corner2y = y;
millisInit = p.millis();
saveExpandRegion(p);
p.commandQueue.add(makeProjectorCommand()); p.commandQueue.add(makeProjectorCommand());
return true; return true;

18
src/Menu.java
View File

@ -208,16 +208,20 @@ class Menu {
} else if (theEvent.isFrom(animateList)){ } else if (theEvent.isFrom(animateList)){
switch((int) animateList.getValue()) { switch((int) animateList.getValue()) {
case 0: case 0:
// shrink.reset(); parent.clickGetter = new Shrink(parent.operationSpeed)
.makeClickGetter(parent.projectorApplet);
break; break;
case 1: case 1:
// expand.reset(); parent.clickGetter = new Expand(parent.operationSpeed)
.makeClickGetter(parent.projectorApplet);
break; break;
case 2: case 2:
// translate.reset(); parent.clickGetter = new Translate(parent.operationSpeed)
.makeClickGetter(parent.projectorApplet);
break; break;
case 3: case 3:
// rotate.reset(); parent.clickGetter = new Rotate(parent.operationSpeed)
.makeClickGetter(parent.projectorApplet);
break; break;
} }
} else if (theEvent.isFrom(presetsList)){ } else if (theEvent.isFrom(presetsList)){
@ -247,7 +251,11 @@ class Menu {
} }
// parent.lagTime = Integer.parseInt(lagField.getText()); // parent.lagTime = Integer.parseInt(lagField.getText());
// parent.totalTime = Integer.parseInt(totaltimeField.getText()); // parent.totalTime = Integer.parseInt(totaltimeField.getText());
// parent.speed = Integer.parseInt(speedField.getText()); try {
parent.operationSpeed = Integer.parseInt(speedField.getText());
} catch (NumberFormatException e) {
println("Ignored bad background color.");
}
break; break;
case "Reset": case "Reset":

1
src/Rectangle.java
View File

@ -61,6 +61,7 @@ class Rectangle {
corner1y = y; corner1y = y;
corner1complete = true; corner1complete = true;
return false; return false;
} else { } else {
corner2x = x; corner2x = x;
corner2y = y; corner2y = y;

9
src/Rotate.java
View File

@ -5,7 +5,7 @@ import static processing.core.PApplet.*;
public class Rotate { public class Rotate {
float centerx, centery, radius, speed; float centerx, centery, radius, speed;
int timeElapsed, millisInit; int timeElapsed, millisInit;
PImage rotateRegion; PImage rotateRegion = null;
private boolean centercomplete; private boolean centercomplete;
@ -33,6 +33,11 @@ public class Rotate {
ProjectorCommand makeProjectorCommand() { ProjectorCommand makeProjectorCommand() {
return (ProjectorApplet p) -> { return (ProjectorApplet p) -> {
if (rotateRegion == null) {
millisInit = p.millis();
saveRotateRegion(p);
}
timeElapsed = p.millis() - millisInit; timeElapsed = p.millis() - millisInit;
p.noFill(); p.noFill();
@ -65,8 +70,6 @@ public class Rotate {
} else { } else {
radius = sqrt(pow(x - centerx, 2) + pow(y - centery, 2)); radius = sqrt(pow(x - centerx, 2) + pow(y - centery, 2));
millisInit = p.millis();
saveRotateRegion(p);
p.commandQueue.add(makeProjectorCommand()); p.commandQueue.add(makeProjectorCommand());
return true; return true;

9
src/Shrink.java
View File

@ -5,7 +5,7 @@ import static processing.core.PApplet.*;
class Shrink { class Shrink {
float corner1x, corner1y, corner2x, corner2y, speed; float corner1x, corner1y, corner2x, corner2y, speed;
int timeElapsed, millisInit; int timeElapsed, millisInit;
PImage shrinkRegion; PImage shrinkRegion = null;
private boolean corner1complete; private boolean corner1complete;
@ -46,6 +46,11 @@ class Shrink {
ProjectorCommand makeProjectorCommand() { ProjectorCommand makeProjectorCommand() {
return (ProjectorApplet p) -> { return (ProjectorApplet p) -> {
if (shrinkRegion == null) {
millisInit = p.millis();
saveShrinkRegion(p);
}
timeElapsed = p.millis() - millisInit; timeElapsed = p.millis() - millisInit;
if (p.convertXDistance(corner2x-corner1x) - speed * aspectRatio() * (timeElapsed/1000f) < 25) { if (p.convertXDistance(corner2x-corner1x) - speed * aspectRatio() * (timeElapsed/1000f) < 25) {
@ -79,8 +84,6 @@ class Shrink {
} else { } else {
corner2x = x; corner2x = x;
corner2y = y; corner2y = y;
millisInit = p.millis();
saveShrinkRegion(p);
p.commandQueue.add(makeProjectorCommand()); p.commandQueue.add(makeProjectorCommand());
return true; return true;

9
src/Translate.java
View File

@ -5,7 +5,7 @@ import static processing.core.PApplet.*;
public class Translate { public class Translate {
float corner1x, corner1y, corner2x, corner2y, endpointx, endpointy, speed; float corner1x, corner1y, corner2x, corner2y, endpointx, endpointy, speed;
int timeElapsed, millisInit; int timeElapsed, millisInit;
PImage translateRegion; PImage translateRegion = null;
private boolean corner1complete, corner2complete; private boolean corner1complete, corner2complete;
@ -54,6 +54,11 @@ public class Translate {
ProjectorCommand makeProjectorCommand() { ProjectorCommand makeProjectorCommand() {
return (ProjectorApplet p) -> { return (ProjectorApplet p) -> {
if (translateRegion == null) {
millisInit = p.millis();
saveTranslateRegion(p);
}
timeElapsed = p.millis() - millisInit; timeElapsed = p.millis() - millisInit;
float spaceElapsed = timeElapsed * speed / 1000f; float spaceElapsed = timeElapsed * speed / 1000f;
@ -100,8 +105,6 @@ public class Translate {
} else{ } else{
endpointx = x; endpointx = x;
endpointy = y; endpointy = y;
millisInit = p.millis();
saveTranslateRegion(p);
p.commandQueue.add(makeProjectorCommand()); p.commandQueue.add(makeProjectorCommand());
return true; return true;

25
src/euglena_basic_stimuli.java
View File

@ -21,9 +21,6 @@ final int roiCornerX = 610;
final int roiCornerY = 290; final int roiCornerY = 290;
final int centerY = 540; // Center Y coordinate
final int centerX = 860; // Center X coordinate
/* Global Variables */ /* Global Variables */
///////////////// Miscellaneaous Variables ///////////////// Miscellaneaous Variables
boolean load = false; // Boolean to determine if user wants to load previously saved led sequences or paint boolean load = false; // Boolean to determine if user wants to load previously saved led sequences or paint
@ -75,11 +72,6 @@ boolean densityMeasured = false;
FloatList fadeXCoord = new FloatList(); // Stores x-coordinate of each point FloatList fadeXCoord = new FloatList(); // Stores x-coordinate of each point
FloatList fadeYCoord = new FloatList(); FloatList fadeYCoord = new FloatList();
Shrink shrink = new Shrink();
Expand expand = new Expand();
Translate translate = new Translate();
Rotate rotate = new Rotate();
void setup() { void setup() {
count = 1; count = 1;
@ -102,23 +94,6 @@ void draw() {
recordTimelapse(lagTime, totalTime); //Note: the maximum fps is around 5 recordTimelapse(lagTime, totalTime); //Note: the maximum fps is around 5
for (int i=0; i < shrinkwindows.size(); i++) {
shrinkwindows.get(i).draw();
}
for (int i=0; i < expandwindows.size(); i++) {
expandwindows.get(i).draw();
}
for (int i=0; i < translatewindows.size(); i++) {
translatewindows.get(i).draw();
}
for (int i=0; i < rotatewindows.size(); i++) {
rotatewindows.get(i).draw();
}
} }