prototype standalone

This commit is contained in:
hennieliminator 2013-01-10 02:18:25 +01:00
parent a0a37bfd1e
commit 4cffaaf303
6 changed files with 353 additions and 131 deletions

View File

@ -15,11 +15,7 @@
<entry name="?*.tld" />
<entry name="?*.ftl" />
</wildcardResourcePatterns>
<annotationProcessing>
<profile default="true" name="Default" enabled="false">
<processorPath useClasspath="true" />
</profile>
</annotationProcessing>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
</project>

View File

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="IdProvider" IDEtalkID="C6B333EE82B1D0849786F1C7113F0428" />
<component name="ProjectResources">
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true">
<output url="file://$PROJECT_DIR$/out" />
</component>
@ -11,6 +15,7 @@
<PyConsoleSettings />
</option>
</component>
<component name="WebServicesPlugin" addRequiredLibraries="true" />
<component name="masterDetails">
<states>
<state key="ProjectJDKs.UI">

View File

@ -2,17 +2,20 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="72d93b4a-de8e-43f1-9d4b-34713e827c14" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/bootstrap/css/style.css" afterPath="$PROJECT_DIR$/bootstrap/css/style.css" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/oscMap.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/compiler.xml" afterPath="$PROJECT_DIR$/.idea/compiler.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app.js" afterPath="$PROJECT_DIR$/app.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/index.html" afterPath="$PROJECT_DIR$/index.html" />
</list>
<ignored path="nodeartnet.iws" />
<ignored path=".idea/workspace.xml" />
<file path="$PROJECT_DIR$/../hackcentercontrol/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356729852724" ignored="false" />
<file path="/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356736182346" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747261765" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737465166" ignored="false" />
<file path="/style.css" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747281902" ignored="false" />
<file path="/Dummy.txt" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356737465166" ignored="false" />
<file path="/index.html" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356747261765" ignored="false" />
<file path="/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356736182346" ignored="false" />
<file path="$PROJECT_DIR$/../hackcentercontrol/app.js" changelist="72d93b4a-de8e-43f1-9d4b-34713e827c14" time="1356729852724" ignored="false" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -27,7 +30,7 @@
<disable_hints />
</component>
<component name="DebuggerManager">
<breakpoint_any default_suspend_policy="SuspendAll" default_condition_enabled="true">
<breakpoint_any default_suspend_policy="SuspendAll">
<breakpoint>
<option name="NOTIFY_CAUGHT" value="true" />
<option name="NOTIFY_UNCAUGHT" value="true" />
@ -35,7 +38,6 @@
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" />
@ -51,7 +53,6 @@
<option name="LOG_ENABLED" value="false" />
<option name="LOG_EXPRESSION_ENABLED" value="false" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="SUSPEND" value="true" />
<option name="COUNT_FILTER_ENABLED" value="false" />
<option name="COUNT_FILTER" value="0" />
<option name="CONDITION_ENABLED" value="true" />
@ -61,8 +62,8 @@
<option name="LOG_MESSAGE" value="" />
</breakpoint>
</breakpoint_any>
<breakpoint_rules default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<ui_properties default_suspend_policy="SuspendAll" default_condition_enabled="true" />
<ui_properties default_suspend_policy="SuspendAll" />
<breakpoint_rules default_suspend_policy="SuspendAll" />
<breakpoint_rules />
<ui_properties />
</component>
@ -72,10 +73,19 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="app.js" pinned="false" current="false" current-in-tab="false">
<file leaf-file-name="app.js" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state line="46" column="20" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.0">
<state line="72" column="38" selection-start="1986" selection-end="1986" vertical-scroll-proportion="0.61538464">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="oscMap.json" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/oscMap.json">
<provider selected="true" editor-type-id="text-editor">
<state line="30" column="16" selection-start="612" selection-end="612" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@ -84,18 +94,16 @@
<file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state line="80" column="74" selection-start="3859" selection-end="3859" vertical-scroll-proportion="-12.716216">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="style.css" pinned="false" current="true" current-in-tab="true">
<file leaf-file-name="style.css" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="1.3847874">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
@ -111,26 +119,22 @@
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component>
<component name="GitLogSettings">
<option name="myDateState">
<MyDateState />
</option>
</component>
<component name="IdeDocumentHistory">
<option name="changedFiles">
<list>
<option value="$PROJECT_DIR$/bootstrap/css/screen.css" />
<option value="$PROJECT_DIR$/app.js" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/bootstrap/css/style.css" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/oscMap.json" />
<option value="$PROJECT_DIR$/app.js" />
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="-4" />
<option name="y" value="25" />
<option name="width" value="1608" />
<option name="height" value="853" />
<option name="x" value="2" />
<option name="y" value="18" />
<option name="width" value="1362" />
<option name="height" value="729" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true">
<OptionsSetting value="true" id="Add" />
@ -139,6 +143,8 @@
<OptionsSetting value="true" id="Update" />
<OptionsSetting value="true" id="Status" />
<OptionsSetting value="true" id="Edit" />
<OptionsSetting value="true" id="Undo Check Out" />
<OptionsSetting value="true" id="Get Latest Version" />
<ConfirmationsSetting value="0" id="Add" />
<ConfirmationsSetting value="0" id="Remove" />
</component>
@ -158,8 +164,16 @@
<sortByType />
</navigator>
<panes>
<pane id="Scope" />
<pane id="PackagesPane" />
<pane id="Scope">
<subPane subId="Project Files">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="ProjectPane">
<subPane>
<PATH>
@ -188,7 +202,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="bootstrap" />
<option name="myItemId" value="node_modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@ -202,16 +216,79 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="bootstrap" />
<option name="myItemId" value="node_modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="css" />
<option name="myItemId" value="node-osc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="node_modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="node-osc" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="node_modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="artnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="nodeartnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="node_modules" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="artnet" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@ -234,7 +311,13 @@
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m" />
<option name="PROGRAM_PARAMETERS" />
<method />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
@ -242,7 +325,31 @@
<option name="SHMEM_ADDRESS" value="javadebug" />
<option name="HOST" value="localhost" />
<option name="PORT" value="5005" />
<method />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -270,20 +377,13 @@
<envs />
<properties />
<listeners />
<method />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<method />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -298,7 +398,13 @@
<option name="PASS_PARENT_ENVS" value="true" />
<module name="" />
<envs />
<method />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
@ -319,7 +425,13 @@
</option>
<envs />
<patterns />
<method />
<method>
<option name="AntTarget" enabled="false" />
<option name="BuildArtifacts" enabled="false" />
<option name="Make" enabled="true" />
<option name="Maven.BeforeRunTask" enabled="false" />
<option name="RakeTask" enabled="false" />
</method>
</configuration>
<list size="0" />
<configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
@ -372,28 +484,32 @@
<servers />
</component>
<component name="ToolWindowManager">
<frame x="-4" y="25" width="1608" height="853" extended-state="6" />
<editor active="false" />
<frame x="2" y="18" width="1362" height="729" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3286119" sideWeight="0.497426" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Data Sources" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18616144" sideWeight="0.497426" order="7" side_tool="false" content_ui="tabs" />
<window_info id="JetGradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" 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" weight="0.3286119" sideWeight="0.4980695" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24961948" sideWeight="0.21746293" order="2" side_tool="true" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24967825" sideWeight="0.6713881" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24961948" sideWeight="0.81383854" order="0" side_tool="false" content_ui="combo" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
</layout>
@ -420,6 +536,7 @@
<option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" />
<option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" />
<option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="false" />
<option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
<option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
@ -429,11 +546,9 @@
<option name="SOFT_WRAPS_IN_SHORT_DIFF" value="true" />
<option name="INCLUDE_TEXT_INTO_PATCH" value="false" />
<option name="INCLUDE_TEXT_INTO_SHELF" value="false" />
<option name="CREATE_PATCH_EXPAND_DETAILS_DEFAULT" value="true" />
<option name="SHOW_FILE_HISTORY_DETAILS" value="true" />
<option name="SHOW_VCS_ERROR_NOTIFICATIONS" value="true" />
<option name="SHOW_DIRTY_RECURSIVELY" value="false" />
<option name="LIMIT_HISTORY" value="true" />
<option name="MAXIMUM_HISTORY_ROWS" value="1000" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="bugfix" />
@ -468,31 +583,76 @@
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="96" selection-start="672" selection-end="672" vertical-scroll-proportion="0.0">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<provider selected="true" editor-type-id="text-editor">
<state line="46" column="20" selection-start="1338" selection-end="1338" vertical-scroll-proportion="0.0">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/index.html">
<provider selected="true" editor-type-id="text-editor">
<state line="186" column="21" selection-start="8852" selection-end="8852" vertical-scroll-proportion="-17.5">
<folding>
<element signature="n#style#0;n#br#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state line="80" column="74" selection-start="3859" selection-end="3859" vertical-scroll-proportion="-12.716216">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/bootstrap/css/style.css">
<entry file="file://$PROJECT_DIR$/oscMap.json">
<provider selected="true" editor-type-id="text-editor">
<state line="67" column="22" selection-start="1008" selection-end="1008" vertical-scroll-proportion="1.3847874">
<state line="30" column="16" selection-start="612" selection-end="612" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/artnet/lib/artnet_client.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-0.18681319">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/artnet/index.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/artnet/package.json">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/lib/osc.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="-1.0576923">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/lesser.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/node_modules/node-osc/index.js">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app.js">
<provider selected="true" editor-type-id="text-editor">
<state line="72" column="38" selection-start="1986" selection-end="1986" vertical-scroll-proportion="0.61538464">
<folding />
</state>
</provider>

View File

@ -2,15 +2,25 @@ var express = require('express');
var app = express();
var server = require('http').createServer(app), io = require('socket.io').listen(server);
var osc = require('node-osc');
var oscMap = require('./oscMap.json');
var host = process.argv.length > 2 ? process.argv[2] : 'distinto.lp-server.net';
var port = process.argv.length > 3 ? process.argv[3] : '5001';
var host = process.argv.length > 2 ? process.argv[2] : '192.168.8.101';
var port = process.argv.length > 3 ? process.argv[3] : '9000';
var oscSender = new osc.Client(host, port);
var oscReceiver = new osc.Server(3333, '0.0.0.0');
var artnetclient = require('./node_modules/artnet/lib/artnet_client');
var dmxClient = artnetclient.createClient("192.168.8.255", 6454);
var states = [];
var dmxData = new Array(512);
for(var i=0; i<512;i++) {
dmxData[i] = 0;
}
server.listen(8080);
server.listen(8081);
app.use(express.static('bootstrap'));
app.get('/', function (req, res) {
@ -18,7 +28,6 @@ app.get('/', function (req, res) {
});
io.sockets.on('connection', function (socket) {
//socket.emit('news', { hello: 'world' });
var address = socket.handshake.address;
console.log("New connection from " + address.address + ":" + address.port);
@ -28,8 +37,25 @@ io.sockets.on('connection', function (socket) {
var chan = data.chan;
var value = data.val;
if(chan == null) return;
// hier noch nicht einkommentieren, das sendet das sofort ins hackcenter
//oscSender.send(chan, value);
handleMessage(new Array(chan, value))
//console.log(address, chan, value);
});
});
oscReceiver.on("message", function (msg, rinfo) {
handleMessage(msg)
});
function handleMessage(msg) {
console.log("Message:");
console.log(msg);
var chan = msg[0],
value = msg[1];
if(chan == null) return;
// sync states array with value
if(value == null) {
if(states[chan] == null) {
states[chan] = 1
@ -39,12 +65,15 @@ io.sockets.on('connection', function (socket) {
states[chan] = 1;
}
value = states[chan];
} else {
states[chan] = value;
}
// hier noch nicht einkommentieren, das sendet das sofort ins hackcenter
//oscSender.send(chan, value);
console.log(address, chan, value);
});
});
// get mapped dmx channel
dmxData[oscMap[chan]] = value*255;
dmxClient.send(dmxData);
// update osc devices to show the current state
// to be done in extra function (with whole states array?)
oscSender.send(chan, value);
}

View File

@ -14,49 +14,49 @@
<div class="row">
<div class="span3">
<div class="btn-group wabe-1-1-red" data-channel="/2/multitoggle/1/1">
<div class="btn-group wabe-1-1-red" data-channel="/1/wabe1/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-1-1-green" data-channel="/2/multitoggle/2/1">
<div class="btn-group wabe-1-1-green" data-channel="/1/wabe1/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-1-1-blue" data-channel="/2/multitoggle/1/2">
<div class="btn-group wabe-1-1-blue" data-channel="/1/wabe1/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3 spansmall">
<div class="btn-group wabe-2-1-red" data-channel="/2/multitoggle/1/16">
<div class="btn-group wabe-2-1-red" data-channel="/1/lamp1/white">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-3-1-red" data-channel="/2/multitoggle/3/1">
<div class="btn-group wabe-3-1-red" data-channel="/1/wabe2/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-3-1-green" data-channel="/2/multitoggle/4/1">
<div class="btn-group wabe-3-1-green" data-channel="/1/wabe2/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-3-1-blue" data-channel="/2/multitoggle/3/2">
<div class="btn-group wabe-3-1-blue" data-channel="/1/wabe2/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-4-1-red" data-channel="/2/multitoggle/5/1">
<div class="btn-group wabe-4-1-red" data-channel="/1/wabe3/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-4-1-green" data-channel="/2/multitoggle/6/1">
<div class="btn-group wabe-4-1-green" data-channel="/1/wabe3/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-4-1-blue" data-channel="/2/multitoggle/5/2">
<div class="btn-group wabe-4-1-blue" data-channel="/1/wabe3/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
@ -64,49 +64,49 @@
</div>
<div class="row">
<div class="span3">
<div class="btn-group wabe-5-1-red" data-channel="/2/multitoggle/1/3">
<div class="btn-group wabe-5-1-red" data-channel="/1/wabe4/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-5-1-green" data-channel="/2/multitoggle/2/3">
<div class="btn-group wabe-5-1-green" data-channel="/1/wabe4/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-5-1-blue" data-channel="/2/multitoggle/1/4">
<div class="btn-group wabe-5-1-blue" data-channel="/1/wabe4/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3 spansmall">
<div class="btn-group wabe-6-1-red" data-channel="/2/multitoggle/2/16">
<div class="btn-group wabe-6-1-red" data-channel="/1/lamp2/white">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-7-1-red" data-channel="/2/multitoggle/3/3">
<div class="btn-group wabe-7-1-red" data-channel="/1/wabe5/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-7-1-green" data-channel="/2/multitoggle/4/3">
<div class="btn-group wabe-7-1-green" data-channel="/1/wabe5/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-7-1-blue" data-channel="/2/multitoggle/3/4">
<div class="btn-group wabe-7-1-blue" data-channel="/1/wabe5/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-8-1-red" data-channel="/2/multitoggle/5/3">
<div class="btn-group wabe-8-1-red" data-channel="/1/wabe6/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-8-1-green" data-channel="/2/multitoggle/6/3">
<div class="btn-group wabe-8-1-green" data-channel="/1/wabe6/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-8-1-blue" data-channel="/2/multitoggle/5/4">
<div class="btn-group wabe-8-1-blue" data-channel="/1/wabe6/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
@ -114,49 +114,49 @@
</div>
<div class="row">
<div class="span3">
<div class="btn-group wabe-9-1-red" data-channel="/2/multitoggle/1/5">
<div class="btn-group wabe-9-1-red" data-channel="/1/wabe7/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-9-1-green" data-channel="/2/multitoggle/2/5">
<div class="btn-group wabe-9-1-green" data-channel="/1/wabe7/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-9-1-blue" data-channel="/2/multitoggle/1/6">
<div class="btn-group wabe-9-1-blue" data-channel="/1/wabe7/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3 spansmall">
<div class="btn-group wabe-10-1-red" data-channel="/2/multitoggle/3/16">
<div class="btn-group wabe-10-1-red" data-channel="/1/lamp3/white">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-11-1-red" data-channel="/2/multitoggle/3/5">
<div class="btn-group wabe-11-1-red" data-channel="/1/wabe8/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-11-1-green" data-channel="/2/multitoggle/4/5">
<div class="btn-group wabe-11-1-green" data-channel="/1/wabe8/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-11-1-blue" data-channel="/2/multitoggle/3/6">
<div class="btn-group wabe-11-1-blue" data-channel="/1/wabe8/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
</div>
<div class="span3">
<div class="btn-group wabe-12-1-red" data-channel="/2/multitoggle/5/5">
<div class="btn-group wabe-12-1-red" data-channel="/1/wabe9/1/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-12-1-green" data-channel="/2/multitoggle/6/5">
<div class="btn-group wabe-12-1-green" data-channel="/1/wabe9/2/1">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>
<div class="btn-group wabe-12-1-blue" data-channel="/2/multitoggle/5/6">
<div class="btn-group wabe-12-1-blue" data-channel="/1/wabe9/1/2">
<button class="btn btn-success">on</button>
<button class="btn btn-danger">off</button>
</div>

32
nodeartnet/oscMap.json Normal file
View File

@ -0,0 +1,32 @@
{
"/1/wabe1/1/1":1,
"/1/wabe1/2/1":2,
"/1/wabe1/1/2":3,
"/1/wabe2/1/1":4,
"/1/wabe2/2/1":5,
"/1/wabe2/1/2":6,
"/1/wabe3/1/1":7,
"/1/wabe3/2/1":8,
"/1/wabe3/1/2":9,
"/1/wabe4/1/1":10,
"/1/wabe4/2/1":11,
"/1/wabe4/1/2":12,
"/1/wabe5/1/1":13,
"/1/wabe5/2/1":14,
"/1/wabe5/1/2":15,
"/1/wabe6/1/1":16,
"/1/wabe6/2/1":17,
"/1/wabe6/1/2":18,
"/1/wabe7/1/1":19,
"/1/wabe7/2/1":20,
"/1/wabe7/1/2":21,
"/1/wabe8/1/1":22,
"/1/wabe8/2/1":23,
"/1/wabe8/1/2":24,
"/1/wabe9/1/1":25,
"/1/wabe9/2/1":26,
"/1/wabe9/1/2":27,
"/1/lampe1":28,
"/1/lampe2":29,
"/1/lampe3":30
}