[Openautomation-svn] SF.net SVN: openautomation:[285] CometVisu/trunk/visu

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 285
          http://openautomation.svn.sourceforge.net/openautomation/?rev=285&view=rev
Author:   mayerch
Date:     2011-02-06 18:27:09 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
Moved the content of the "neu" config to the "demo" config as the transition to the new format is done now

Modified Paths:
--------------
    CometVisu/trunk/visu/visu_config_demo.xml

Removed Paths:
-------------
    CometVisu/trunk/visu/visu_config_neu.xml

Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================

--- CometVisu/trunk/visu/visu_config_demo.xml	2011-02-06 18:04:14 UTC (rev 284)
+++ CometVisu/trunk/visu/visu_config_demo.xml	2011-02-06 18:27:09 UTC (rev 285)
@@ -38,7 +38,7 @@
     <statusbar>
       <status type="html"><![CDATA[
           <img src="icon/comet_64_ff8000.png" alt="CometVisu" /> by <a href="http://www.cometvisu.org/">CometVisu.org</a>
-          - <a href=".?config=demo">Reload</a>
+          - <a href=".?config=neu">Reload</a>
           - <a href=".">Default Config</a>
         ]]></status>
       <status type="html" condition="!edit"><![CDATA[
@@ -53,98 +53,52 @@
     </statusbar>
   </meta>
   <page name="Übersicht">
-    <text align="center">CometVisu widget demo</text>
-    <toggle address="1/0/2" datatype="1.001" response_address="1/0/2" mapping="OnOff" styling="RedGreen">Terrase Licht</toggle>
-    <trigger address="1/0/2" datatype="1.001" value="0" mapping="OnOff">Terrase Licht 0</trigger>
-    <trigger address="1/0/2" datatype="1.001" value="1" mapping="OnOff">Terrase Licht 1</trigger>
-    <trigger address="2/2/5" datatype="5.001" value="0">Rolladen Licht 0</trigger>
-    <trigger address="2/2/5" datatype="5.001" value="100">Rolladen Licht 100</trigger>
-    <switch address="1/0/50" datatype="1.001" response_address="1/4/50" mapping="OnOff">Schalt Schiebetüre Licht</switch>
-    <break/>
-    <dim address="1/2/51" datatype="5.010" response_address="1/3/51" response_datatype="5.010">Dim Esstisch</dim>
-    <shade address="2/4/5" datatype="5.001">Rollladen links</shade>
-    <slide address="12/4/250" datatype="9" min="-18" max="26">Slide</slide>
-    <info address="12/4/250" datatype="9" styling="BluePurpleRed">Slide Info</info>
-    <info address="12/4/250" datatype="9" styling="BluePurpleRed" mapping="Sign">Slide Info</info>
-    <designtoggle>Change design</designtoggle>
-    <colorchooser address_r="1/2/59" address_g="1/2/60" address_b="1/2/61" datatype="5.001">A colorChooser</colorchooser>
-    <info address="1/2/59" datatype="5.001">R</info>
-    <info address="1/2/60" datatype="5.001">G</info>
-    <info address="1/2/61" datatype="5.001">B</info>
-    <slide address="1/2/59" datatype="5.001">R</slide>
-    <line/>
-    <image src="icon/comet_128_ff8000.png">Ein Bild</image>
-    <image src="icon/comet_128_ff8000.png"/>
+    <text align="center">CometVisu format neu</text>
+    <info styling="BluePurpleRed">
+      <label>Slide Info</label>
+      <address transform="DPT:9">12/4/250</address>
+      <address transform="DPT:9.001">12/4/251</address>
+    </info>
+    <switch mapping="OnOff" styling="RedGreen">
+      <label>Terrase Licht</label>
+      <address transform="DPT:1.001">1/0/2</address>
+      <address transform="DPT:9.001" readonly="true">12/4/253</address>
+    </switch>
+    <slide min="-18" max="26">
+      <label>Slide</label>
+      <address transform="DPT:9">12/4/250</address>
+      <address transform="DPT:9.001" readonly="true">12/4/253</address>
+    </slide>
+    <break />
+    <trigger value="0" mapping="OnOff">
+      <label>Terrase Licht 0</label>
+      <address transform="DPT:1.001">1/0/2</address>
+    </trigger>
+    <trigger value="1" mapping="OnOff">
+      <label>Terrase Licht 1</label>
+      <address transform="DPT:1.001">1/0/2</address>
+    </trigger>
+    <line />
     <image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
-    <image src="http://www.e-zeeinternet.com/count.php?page=546016&amp;style=default&amp;nbdigits=9&amp;reloads=1" refresh="10">Update every 10 sec</image>
-    <break/>
-    <image src="http://www.yr.no/place/Germany/Bavaria/Holzkirchen~2899676/meteogram.png" refresh="1800"/>
-    <line/>
+    <image src="http://www.e-zeeinternet.com/count.php?page=546016&amp;style=default&amp;nbdigits=9&amp;reloads=1" refresh="10">
+      <label>Update every 10 sec</label>
+    </image>
+    <designtoggle>Change design</designtoggle>
     <page name="iframe Test">
       <iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
     </page>
-    <info address="1/0/41" datatype="1.000" mapping="OnOff">Treppenlicht</info>
-    <page name="Fenster Kontakte">
-      <info address="4/3/10" datatype="1" mapping="OpenClose" styling="GreenRed">Bad EG Reed Fenster</info>
-      <info address="4/3/20" datatype="1.001" mapping="OpenClose" styling="GreenRed">WC Reed Fenster</info>
-      <info address="4/3/30" datatype="1" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster links</info>
-      <info address="4/3/31" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster rechts</info>
-      <info address="4/3/32" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Tuere</info>
-      <info address="4/3/40" datatype="1.001" mapping="OpenClose" styling="GreenRed">Kueche Reed Fenster</info>
-      <info address="4/3/50" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Essen</info>
-      <info address="4/3/51" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Schiebetuere</info>
-      <info address="4/3/52" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Mitte</info>
-      <info address="4/3/53" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere links</info>
-      <info address="4/3/54" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere rechts</info>
-      <info address="4/3/70" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele EG Reed Tuere</info>
-      <info address="4/3/71" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele EG Reed Riegel</info>
-      <info address="4/3/110" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele UG Reed Tuere</info>
-      <info address="4/3/111" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele UG Reed Riegel</info>
-      <info address="4/3/120" datatype="1.001" mapping="OpenClose" styling="GreenRed">Bad UG Reed Fenster</info>
-      <info address="4/3/130" datatype="1.001" mapping="OpenClose" styling="GreenRed">Hobby1 Reed Fenster</info>
-      <info address="4/3/140" datatype="1.001" mapping="OpenClose">Hobby2 Reed Fenster</info>
-      <info address="4/3/200" datatype="1.001" mapping="OnOff">Klingel</info>
-      <info address="4/3/210" datatype="1.001">Lueftung Filter</info>
-      <info address="4/3/250" datatype="1.001" mapping="OnOff">Rauchmelder</info>
-    </page>
-    <page name="Temperaturen">
-      <info address="4/0/10" datatype="9.001" pre="ca. " post=" °C">Bad EG Boden Temperatur</info>
-      <info address="4/0/11" datatype="9.001" pre="ca. " post=" °C">Bad EG Luft Temperatur</info>
-      <info address="4/0/15" datatype="9.001" pre="ca. " post=" °C">Bad EG Dusche Temperatur</info>
-      <info address="4/2/10" datatype="5.001" post=" %">Bad EG Luftfeuchte</info>
-      <info address="4/0/20" datatype="9.001" pre="ca. " post=" °C">WC Temperatur</info>
-      <info address="4/0/30" datatype="9.001" pre="ca. " post=" °C">Schlafzimmer Temperatur</info>
-      <info address="4/0/50" datatype="9.001" pre="ca. " post=" °C">Wohnzimmer Temperatur</info>
-      <info address="4/0/60" datatype="9.001" pre="ca. " post=" °C">Diele EG Temperatur</info>
-      <info address="4/0/110" datatype="9.001" pre="ca. " post=" °C">Diele UG Temperatur</info>
-      <info address="4/0/120" datatype="9.001" pre="ca. " post=" °C">Bad UG Boden Temperatur</info>
-      <info address="4/0/121" datatype="9.001" pre="ca. " post=" °C">Bad UG Luft Temperatur</info>
-      <info address="4/2/120" datatype="5.001" post=" %">Bad UG Luftfeuchte</info>
-      <info address="4/0/130" datatype="9.001" pre="ca. " post=" °C">Hobby 1 Temperatur</info>
-      <info address="4/0/140" datatype="9.001" pre="ca. " post=" °C">Hobby 2 Temperatur</info>
-      <line/>
-      <info address="4/0/0" datatype="9.001" pre="ca. " post=" °C">Außen Temperatur</info>
-      <info address="4/2/0" datatype="5.001" post=" %">Außen Luftfeuchte</info>
-      <info address="4/0/200" datatype="9.001" pre="ca. " post=" °C">HK Vorlauf Temperatur</info>
-      <info address="4/0/201" datatype="9.001" pre="ca. " post=" °C">HK Rücklauf Temperatur</info>
-      <info address="4/0/204" datatype="9.001" pre="ca. " post=" °C">Zirkulation Temperatur</info>
-      <info address="4/0/202" datatype="9.001" pre="ca. " post=" °C">Warmwasser Temperatur</info>
-      <info address="4/0/203" datatype="9.001" pre="ca. " post=" °C">Kaltwasser Temperatur</info>
-      <info address="4/0/205" datatype="9.001" pre="ca. " post=" °C">Warmwasser UG Temperatur</info>
-    </page>
-    <page name="Rollläden">
-      <shade address="2/4/0" datatype="5.001">Rollladen Bad</shade>
-      <shade address="2/4/1" datatype="5.001">Rollladen Schlafen Fenster</shade>
-      <shade address="2/4/2" datatype="5.001">Rollladen Schlafen Türe</shade>
-      <shade address="2/4/3" datatype="5.001">Rollladen Küche</shade>
-      <shade address="2/4/4" datatype="5.001">Rollladen Seitentüre</shade>
-      <shade address="2/4/5" datatype="5.001">Rollladen PSK Türe</shade>
-      <shade address="2/4/6" datatype="5.001">Rollladen Zwischentüre</shade>
-      <shade address="2/4/7" datatype="5.001">Rollladen Doppeltüre</shade>
-      <line/>
-      <shade address="2/4/8" datatype="5.001">Rollladen Hobby 1</shade>
-      <shade address="2/4/9" datatype="5.001">Rollladen Hobby 2</shade>
-    </page>
+    <colorchooser>
+      <label>A colorChooser</label>
+      <address transform="DPT:5.001" color="r">1/2/59</address>
+      <address transform="DPT:5.001" color="g">1/2/60</address>
+      <address transform="DPT:5.001" color="b">1/2/61</address>
+    </colorchooser>
+    <info precision="4"><label>R</label><address transform="DPT:5.001">1/2/59</address></info>
+    <slide><label>R</label><address transform="DPT:5.001">1/2/59</address></slide>
+    <info precision="4"><label>G</label><address transform="DPT:5.001">1/2/60</address></info>
+    <slide><label>G</label><address transform="DPT:5.001">1/2/60</address></slide>
+    <info precision="4"><label>B</label><address transform="DPT:5.001">1/2/61</address></info>
+    <slide><label>B</label><address transform="DPT:5.001">1/2/61</address></slide>
     <diagram_popup undefined="DALI Strom L1" rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
   </page>
 </pages>

Deleted: CometVisu/trunk/visu/visu_config_neu.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_neu.xml	2011-02-06 18:04:14 UTC (rev 284)
+++ CometVisu/trunk/visu/visu_config_neu.xml	2011-02-06 18:27:09 UTC (rev 285)
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" design="pure" xsi:noNamespaceSchemaLocation="visu_config.xsd">
-  <meta>
-    <plugins>
-      <plugin name="colorchooser"/>
-      <plugin name="diagram"/>
-    </plugins>
-    <mappings>
-      <mapping name="OpenClose">
-        <entry value="0">zu</entry>
-        <entry value="1">offen</entry>
-      </mapping>
-      <mapping name="OnOff">
-        <entry value="0">Aus</entry>
-        <entry value="1">An</entry>
-      </mapping>
-      <mapping name="Sign">
-        <entry range_min="-1e99" range_max="0">Negativ</entry>
-        <entry value="0">Null</entry>
-        <entry range_min="0" range_max="1e99">Positiv</entry>
-      </mapping>
-    </mappings>
-    <stylings>
-      <styling name="RedGreen">
-        <entry value="0">red</entry>
-        <entry value="1">green</entry>
-      </styling>
-      <styling name="GreenRed">
-        <entry value="0">green</entry>
-        <entry value="1">red</entry>
-      </styling>
-      <styling name="BluePurpleRed">
-        <entry range_min="-100" range_max="0">blue</entry>
-        <entry value="0">purple</entry>
-        <entry range_min="0" range_max="100">red</entry>
-      </styling>
-    </stylings>
-    <statusbar>
-      <status type="html"><![CDATA[
-          <img src="icon/comet_64_ff8000.png" alt="CometVisu" /> by <a href="http://www.cometvisu.org/">CometVisu.org</a>
-          - <a href=".?config=neu">Reload</a>
-          - <a href=".">Default Config</a>
-        ]]></status>
-      <status type="html" condition="!edit"><![CDATA[
-          - <a href="edit_config.html">Edit</a>
-        ]]></status>
-      <status type="html" condition="edit"><![CDATA[
-          - <a href=".">normal Mode</a>
-        ]]></status>
-      <status type="html"><![CDATA[
-          - <a href="check_config.php">Check Config</a>
-        ]]></status>
-    </statusbar>
-  </meta>
-  <page name="Übersicht">
-    <text align="center">CometVisu format neu</text>
-    <info styling="BluePurpleRed">
-      <label>Slide Info</label>
-      <address transform="DPT:9">12/4/250</address>
-      <address transform="DPT:9.001">12/4/251</address>
-    </info>
-    <switch mapping="OnOff" styling="RedGreen">
-      <label>Terrase Licht</label>
-      <address transform="DPT:1.001">1/0/2</address>
-      <address transform="DPT:9.001" readonly="true">12/4/253</address>
-    </switch>
-    <slide min="-18" max="26">
-      <label>Slide</label>
-      <address transform="DPT:9">12/4/250</address>
-      <address transform="DPT:9.001" readonly="true">12/4/253</address>
-    </slide>
-    <break />
-    <trigger value="0" mapping="OnOff">
-      <label>Terrase Licht 0</label>
-      <address transform="DPT:1.001">1/0/2</address>
-    </trigger>
-    <trigger value="1" mapping="OnOff">
-      <label>Terrase Licht 1</label>
-      <address transform="DPT:1.001">1/0/2</address>
-    </trigger>
-    <line />
-    <image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
-    <image src="http://www.e-zeeinternet.com/count.php?page=546016&amp;style=default&amp;nbdigits=9&amp;reloads=1" refresh="10">
-      <label>Update every 10 sec</label>
-    </image>
-    <designtoggle>Change design</designtoggle>
-    <page name="iframe Test">
-      <iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
-    </page>
-    <colorchooser>
-      <label>A colorChooser</label>
-      <address transform="DPT:5.001" color="r">1/2/59</address>
-      <address transform="DPT:5.001" color="g">1/2/60</address>
-      <address transform="DPT:5.001" color="b">1/2/61</address>
-    </colorchooser>
-    <info precision="4"><label>R</label><address transform="DPT:5.001">1/2/59</address></info>
-    <slide><label>R</label><address transform="DPT:5.001">1/2/59</address></slide>
-    <info precision="4"><label>G</label><address transform="DPT:5.001">1/2/60</address></info>
-    <slide><label>G</label><address transform="DPT:5.001">1/2/60</address></slide>
-    <info precision="4"><label>B</label><address transform="DPT:5.001">1/2/61</address></info>
-    <slide><label>B</label><address transform="DPT:5.001">1/2/61</address></slide>
-    <diagram_popup undefined="DALI Strom L1" rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
-  </page>
-</pages>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




[Openautomation-svn] SF.net SVN: openautomation:[285] CometVisu/trunk/visu

Building automation (like KNX or OpenHAB) software (like CometVisu).

[Openautomation-svn] SF.net SVN: openautomation:[285] CometVisu/trunk/visu