Menu
▾
▴
openautomation-svn
|
From: <ma...@us...> - 2011-03-05 11:52:37
|
Revision: 312
http://openautomation.svn.sourceforge.net/openautomation/?rev=312&view=rev
Author: mayerch
Date: 2011-03-05 11:52:31 +0000 (Sat, 05 Mar 2011)
Log Message:
-----------
Added demo page to demonstrate the use of the format string
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-03-04 20:58:14 UTC (rev 311)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-03-05 11:52:31 UTC (rev 312)
@@ -169,6 +169,72 @@
</page>
</page>
</page>
+ <page name="Format Test" align="center">
+ <text>
+ Über das Format-Attribut kann die Anzeige von Werten variiert werden.
+ Dazu wird die Synatx des vom "printf" bekannten Formatstrings benutzt.
+ </text>
+ <break/>
+ <slide min="-100" max="101">
+ <label>Test-Slider</label>
+ <address transform="DPT:9">14/4/4</address>
+ </slide>
+ <info>
+ <label>Ohne Format</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <line/>
+ <info format="%.0f">
+ <label>Format "%.0f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%.1f">
+ <label>Format "%.1f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%.2f">
+ <label>Format "%.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%.3f">
+ <label>Format "%.3f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%.4f">
+ <label>Format "%.4f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <line/>
+ <info format="%01.2f">
+ <label>Format "%01.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%02.2f">
+ <label>Format "%02.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%03.2f">
+ <label>Format "%03.3f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%04.2f">
+ <label>Format "%04.3f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%05.2f">
+ <label>Format "%05.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <info format="%06.2f">
+ <label>Format "%06.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ <line/>
+ <info format="%+.2f">
+ <label>Format "%+.2f":</label>
+ <address transform="DPT:9">14/4/4</address>
+ </info>
+ </page>
<colorchooser>
A colorChooser
1/2/59
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-03-08 21:29:12
|
Revision: 317
http://openautomation.svn.sourceforge.net/openautomation/?rev=317&view=rev
Author: mayerch
Date: 2011-03-08 21:29:06 +0000 (Tue, 08 Mar 2011)
Log Message:
-----------
Fix the demo colorchooser call
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-03-08 21:13:18 UTC (rev 316)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-03-08 21:29:06 UTC (rev 317)
@@ -237,9 +237,9 @@
</page>
<colorchooser>
A colorChooser
- 1/2/59
- 1/2/60
- 1/2/61
+ <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>
<break/>
<info format="%.2f">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-06-05 18:55:19
|
Revision: 358
http://openautomation.svn.sourceforge.net/openautomation/?rev=358&view=rev
Author: mayerch
Date: 2011-06-05 18:55:13 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
Remove the obsolete pre and post attributes
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-06-05 18:53:17 UTC (rev 357)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-06-05 18:55:13 UTC (rev 358)
@@ -67,7 +67,7 @@
<address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
</switch>
<break/>
- <trigger pre="pre" post="post" value="0" mapping="OnOff">
+ <trigger value="0" mapping="OnOff">
<label>Trigger - Terrasse Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
</trigger>
@@ -87,7 +87,7 @@
<address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
</slide>
</group>
- <multitrigger pre="pre" post="post" button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
+ <multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
<label>Multitrigger - Szenenaufruf</label>
<address transform="DPT:5.010" readonly="false" type="">11/2/50</address>
</multitrigger>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-15 10:48:24
|
Revision: 446
http://openautomation.svn.sourceforge.net/openautomation/?rev=446&view=rev
Author: mayerch
Date: 2011-10-15 10:48:18 +0000 (Sat, 15 Oct 2011)
Log Message:
-----------
Whitespace clean up (DON'T USE TABS!)
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-10-15 10:26:28 UTC (rev 445)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-10-15 10:48:18 UTC (rev 446)
@@ -271,10 +271,10 @@
</slide>
<diagram_popup rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
<diagram_inline rrd="200_DALI_Linie_1_Strom" width="600" height="400"/>
- <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
- <label>Temperatur Sollwert</label>
- <address transform="DPT:1.001">4/1/3</address>
- <address transform="DPT:9" readonly="true">4/2/3</address>
- </infotrigger>
+ <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
+ <label>Temperatur Sollwert</label>
+ <address transform="DPT:1.001">4/1/3</address>
+ <address transform="DPT:9" readonly="true">4/2/3</address>
+ </infotrigger>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-06 15:19:24
|
Revision: 502
http://openautomation.svn.sourceforge.net/openautomation/?rev=502&view=rev
Author: mayerch
Date: 2011-11-06 15:19:17 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Change all GA to 12/7/... to avoid troubles in other set ups.
Also change RRD to one that every WireGate has so that everyone sees interesting data
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-11-06 12:08:17 UTC (rev 501)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-11-06 15:19:17 UTC (rev 502)
@@ -68,45 +68,43 @@
]]></status>
</statusbar>
</meta>
- <page name="Übersicht">
- <text align="center">CometVisu Widget Demo</text>
+ <page name="CometVisu Widget Demo">
+ <text align="center">Herzlich willkommen bei dem CometVisu Widget Demo!</text>
+ <text><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</text>
<switch mapping="On_Off" styling="Red_Green">
<label>Switch - Terrase Licht</label>
- <address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
- <address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
+ <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</switch>
<break/>
<trigger value="0" mapping="On_Off">
<label>Trigger - Terrasse Licht</label>
- <address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
+ <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<label>Trigger - Terrasse Licht</label>
- <address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
+ <address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</trigger>
<group name="Slide group" flavour="potassium" align="center">
<info styling="Blue_Purple_Red">
<label>Slide Info</label>
- <address transform="DPT:9" type="">12/4/250</address>
- <address transform="DPT:9.001" type="">12/4/251</address>
+ <address transform="DPT:9" type="">12/7/9</address>
</info>
<slide min="-18" max="26">
<label>Slide</label>
- <address transform="DPT:9" type="">12/4/250</address>
- <address transform="DPT:9.001" readonly="true" type="">12/4/253</address>
+ <address transform="DPT:9" type="">12/7/9</address>
</slide>
</group>
<multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
<label>Multitrigger - Szenenaufruf</label>
- <address transform="DPT:5.010" readonly="false" type="">11/2/50</address>
+ <address transform="DPT:5.010" readonly="false" type="">12/7/5</address>
</multitrigger>
<multitrigger button1label="Auto" button1value="auto" button2label="Komfort" button2value="comfort" button3label="Standy By" button3value="standby" button4label="Economy" button4value="economy">
<label>KONNEX Betriebsart</label>
- <address transform="DPT:20.102" readonly="false" type="">3/1/50</address>
+ <address transform="DPT:20.102" readonly="false" type="">12/7/20</address>
</multitrigger>
<info mapping="KonnexHVAC">
<label>Betriebsart</label>
- <address transform="DPT:20.102" type="">3/1/50</address>
+ <address transform="DPT:20.102" type="">12/7/20</address>
</info>
<line/>
<image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
@@ -188,101 +186,101 @@
<break/>
<slide min="-100" max="101">
<label>Test-Slider</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</slide>
<info>
<label>Ohne Format</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<line/>
<info format="%.0f">
<label>Format "%.0f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%.1f">
<label>Format "%.1f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%.2f">
<label>Format "%.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%.3f">
<label>Format "%.3f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%.4f">
<label>Format "%.4f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<line/>
<info format="%01.2f">
<label>Format "%01.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%02.2f">
<label>Format "%02.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%03.2f">
<label>Format "%03.3f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%04.2f">
<label>Format "%04.3f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%05.2f">
<label>Format "%05.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<info format="%06.2f">
<label>Format "%06.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
<line/>
<info format="%+.2f">
<label>Format "%+.2f":</label>
- <address transform="DPT:9">14/4/4</address>
+ <address transform="DPT:9">12/7/9</address>
</info>
</page>
<colorchooser>
<label>A colorChooser</label>
- <address transform="DPT:5.001" variant="r">1/2/59</address>
- <address transform="DPT:5.001" variant="g">1/2/60</address>
- <address transform="DPT:5.001" variant="b">1/2/61</address>
+ <address transform="DPT:5.001" variant="r">12/7/50</address>
+ <address transform="DPT:5.001" variant="g">12/7/51</address>
+ <address transform="DPT:5.001" variant="b">12/7/52</address>
</colorchooser>
<break/>
<info format="%.2f">
<label>R</label>
- <address transform="DPT:5.001" type="">1/2/59</address>
+ <address transform="DPT:5.001" type="">12/7/50</address>
</info>
<slide>
<label>R</label>
- <address transform="DPT:5.001" type="">1/2/59</address>
+ <address transform="DPT:5.001" type="">12/7/50</address>
</slide>
<info format="%.2f">
<label>G</label>
- <address transform="DPT:5.001" type="">1/2/60</address>
+ <address transform="DPT:5.001" type="">12/7/51</address>
</info>
<slide>
<label>G</label>
- <address transform="DPT:5.001" type="">1/2/60</address>
+ <address transform="DPT:5.001" type="">12/7/51</address>
</slide>
<info format="%.2f">
<label>B</label>
- <address transform="DPT:5.001" type="">1/2/61</address>
+ <address transform="DPT:5.001" type="">12/7/52</address>
</info>
<slide>
<label>B</label>
- <address transform="DPT:5.001" type="">1/2/61</address>
+ <address transform="DPT:5.001" type="">12/7/52</address>
</slide>
- <diagram_popup rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
- <diagram_inline rrd="200_DALI_Linie_1_Strom" width="600" height="400"/>
+ <diagram_popup rrd="eib_traffic" unit="tps" series="day" refresh="300">KNX traffic</diagram_popup>
+ <diagram_inline rrd="eib_traffic" width="600" height="400"/>
<infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
<label>Temperatur Sollwert</label>
- <address transform="DPT:1.001">4/1/3</address>
- <address transform="DPT:9" readonly="true">4/2/3</address>
+ <address transform="DPT:1.001">12/7/1</address>
+ <address transform="DPT:9" readonly="true">12/7/9</address>
</infotrigger>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-06 17:16:42
|
Revision: 505
http://openautomation.svn.sourceforge.net/openautomation/?rev=505&view=rev
Author: mayerch
Date: 2011-11-06 17:16:35 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
First attempt to clean the demo config up
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-11-06 16:37:43 UTC (rev 504)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-11-06 17:16:35 UTC (rev 505)
@@ -14,6 +14,11 @@
<entry value="0">offen</entry>
<entry value="1">zu</entry>
</mapping>
+ <mapping name="Close_Tilted_Open">
+ <entry value="0">offen</entry>
+ <entry value="1">gekippt</entry>
+ <entry value="2">zu</entry>
+ </mapping>
<mapping name="On_Off">
<entry value="0">Aus</entry>
<entry value="1">An</entry>
@@ -34,6 +39,14 @@
<entry value="economy">Economy</entry>
<entry value="building_protection">Haus-Schutz</entry>
</mapping>
+ <mapping name="AudioSource">
+ <entry value="0">UKW</entry>
+ <entry value="1">Squeeze</entry>
+ <entry value="2">Denon</entry>
+ <entry value="3">iPod</entry>
+ <entry value="4">Sat</entry>
+ <entry value="5">Kino</entry>
+ </mapping>
</mappings>
<stylings>
<styling name="Red_Green">
@@ -71,47 +84,67 @@
<page name="CometVisu Widget Demo">
<text align="center">Herzlich willkommen bei dem CometVisu Widget Demo!</text>
<text><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</text>
+ <line/>
+ <text>Für die CometVisu gibt es verschiedene Designs.</text>
+ <designtoggle>Wechsle Design</designtoggle>
+ <line/>
+ <text>Standard-Widgets</text>
+ <break/>
<switch mapping="On_Off" styling="Red_Green">
- <label>Switch - Terrase Licht</label>
+ <label>Switch</label>
<address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</switch>
<break/>
<trigger value="0" mapping="On_Off">
- <label>Trigger - Terrasse Licht</label>
+ <label>Trigger</label>
<address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
- <label>Trigger - Terrasse Licht</label>
+ <label>Trigger</label>
<address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</trigger>
- <group name="Slide group" flavour="potassium" align="center">
- <info styling="Blue_Purple_Red">
- <label>Slide Info</label>
- <address transform="DPT:9" type="">12/7/9</address>
- </info>
- <slide min="-18" max="26">
- <label>Slide</label>
- <address transform="DPT:9" type="">12/7/9</address>
- </slide>
- </group>
- <multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
- <label>Multitrigger - Szenenaufruf</label>
- <address transform="DPT:5.010" readonly="false" type="">12/7/5</address>
- </multitrigger>
<multitrigger button1label="Auto" button1value="auto" button2label="Komfort" button2value="comfort" button3label="Standy By" button3value="standby" button4label="Economy" button4value="economy">
- <label>KONNEX Betriebsart</label>
+ <label>Multitrigger: KONNEX Betriebsart</label>
<address transform="DPT:20.102" readonly="false" type="">12/7/20</address>
</multitrigger>
<info mapping="KonnexHVAC">
- <label>Betriebsart</label>
+ <label>Info: Betriebsart</label>
<address transform="DPT:20.102" type="">12/7/20</address>
</info>
+ <break/>
+ <multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
+ <label>Multitrigger: Szenenaufruf</label>
+ <address transform="DPT:5.010" readonly="false" type="">12/7/5</address>
+ </multitrigger>
+ <break/>
+ <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="0.1" downvalue="-0.1" align="center" format="%.1f °C" change="absolute" min="7" max="24">
+ <label>Infotrigger: Sollwert</label>
+ <address transform="DPT:9" variant="absolute">12/7/9</address>
+ </infotrigger>
+ <infotrigger uplabel=">" downlabel="<" upvalue="1" downvalue="-1" min="0" max="5" align="center" infoposition="1" change="absolute" mapping="AudioSource" >
+ <label>Infotrigger: Audioquelle</label>
+ <address transform="DPT:5.010" variant="absolute">12/7/105</address>
+ </infotrigger>
+ <slide min="-18" max="26">
+ <label>Slider</label>
+ <address transform="DPT:9" type="">12/7/9</address>
+ </slide>
+ <info styling="Blue_Purple_Red">
+ <label>Info: Slider</label>
+ <address transform="DPT:9" type="">12/7/9</address>
+ </info>
+ <image src="icon/comet_128_ff8000.png">
+ <label>Image</label>
+ </image>
+ <page name="Erweitert...">
+ <image src="http://www.e-zeeinternet.com/count.php?page=546016&style=default&nbdigits=9&reloads=1" refresh="10">
+ <label>Image: Update alle 10s</label>
+ </image>
+ <image src="icon/comet_128_ff8000.png" width="500px" height="46px">
+ <label>Image: mit Größenangabe</label>
+ </image>
+ </page>
<line/>
- <image src="icon/comet_128_ff8000.png" width="500px" height="46px"/>
- <image src="http://www.e-zeeinternet.com/count.php?page=546016&style=default&nbdigits=9&reloads=1" refresh="10">
- <label>Update every 10 sec</label>
- </image>
- <designtoggle>Change design</designtoggle>
<page name="iframe Test" align="center" >
<iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
</page>
@@ -244,6 +277,11 @@
<address transform="DPT:9">12/7/9</address>
</info>
</page>
+ <line/>
+ <text align="center">Plugins</text>
+ <text>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in
+ der Config-Datei aktiviert werden.
+ </text>
<colorchooser>
<label>A colorChooser</label>
<address transform="DPT:5.001" variant="r">12/7/50</address>
@@ -277,10 +315,29 @@
</slide>
<diagram_popup rrd="eib_traffic" unit="tps" series="day" refresh="300">KNX traffic</diagram_popup>
<diagram_inline rrd="eib_traffic" width="600" height="400"/>
- <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="1" downvalue="0" align="center" format="%.1f °C">
- <label>Temperatur Sollwert</label>
- <address transform="DPT:1.001">12/7/1</address>
- <address transform="DPT:9" readonly="true">12/7/9</address>
- </infotrigger>
+ <line/>
+ <page name="Erweiterte Widgets">
+ <text>Auf dieser Seite sind Widgets zu finden, die noch in Entwicklung
+ sind und daher im Allgemeinen noch nicht verwendet werden sollten.
+ </text>
+ <line/>
+ <group name="Gruppe" align="center">
+ <text align="center">Ohne Flavour</text>
+ <info styling="Blue_Purple_Red">
+ <label>Info</label>
+ <address transform="DPT:9" type="">12/7/9</address>
+ </info>
+ </group>
+ <group name="Slider Gruppe mit Flavour" flavour="lithium" align="center">
+ <info styling="Blue_Purple_Red">
+ <label>Info: Slider</label>
+ <address transform="DPT:9" type="">12/7/9</address>
+ </info>
+ <slide min="-18" max="26">
+ <label>Slider</label>
+ <address transform="DPT:9" type="">12/7/9</address>
+ </slide>
+ </group>
+ </page>
</page>
</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-13 21:49:46
|
Revision: 517
http://openautomation.svn.sourceforge.net/openautomation/?rev=517&view=rev
Author: mayerch
Date: 2011-11-13 21:49:40 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Clean ups, design optimisations and two extended infotrigger examples
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-11-13 14:45:30 UTC (rev 516)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-11-13 21:49:40 UTC (rev 517)
@@ -88,7 +88,7 @@
<text>Für die CometVisu gibt es verschiedene Designs.</text>
<designtoggle>Wechsle Design</designtoggle>
<line/>
- <text>Standard-Widgets</text>
+ <text align="center"><b>Standard-Widgets</b></text>
<break/>
<switch mapping="On_Off" styling="Red_Green">
<label>Switch</label>
@@ -103,6 +103,7 @@
<label>Trigger</label>
<address transform="DPT:1.001" readonly="false" type="">12/7/1</address>
</trigger>
+ <break/>
<multitrigger button1label="Auto" button1value="auto" button2label="Komfort" button2value="comfort" button3label="Standy By" button3value="standby" button4label="Economy" button4value="economy">
<label>Multitrigger: KONNEX Betriebsart</label>
<address transform="DPT:20.102" readonly="false" type="">12/7/20</address>
@@ -125,6 +126,38 @@
<label>Infotrigger: Audioquelle</label>
<address transform="DPT:5.010" variant="absolute">12/7/105</address>
</infotrigger>
+ <page name="Infotrigger: Erweitert..." align="center">
+ <text>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</text>
+ <line/>
+ <text>Relativ</text>
+ <break/>
+ <infotrigger uplabel="+" upvalue="1" downlabel="-" downvalue="0" align="center" infoposition="1" change="relative">
+ <label>Lautstärke</label>
+ <address transform="DPT:16.000" readonly="true" variant="absolute">12/7/16</address>
+ <address transform="DPT:1.001" readonly="false" variant="relative">12/7/1</address>
+ </infotrigger>
+ <break/>
+ <info>
+ <label>Absolute GA</label>
+ <address transform="DPT:16.000">12/7/16</address>
+ </info>
+ <info>
+ <label>Relative GA</label>
+ <address transform="DPT:1.001">12/7/1</address>
+ </info>
+ <multitrigger button1label="An" button1value="50%" button2label="Aus" button2value="0%" button3label="Leise" button3value="25%" button4label="Laut" button4value="100%">
+ <label>Lautstärke-Text</label>
+ <address transform="DPT:16.000" readonly="false" type="">12/7/16</address>
+ </multitrigger>
+ <line/>
+ <text>Absolut</text>
+ <break/>
+ <infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%">
+ <label>Lautstärke</label>
+ <address transform="DPT:5.001" readonly="false" variant="absolute">12/7/5</address>
+ </infotrigger>
+ </page>
+ <break/>
<slide min="-18" max="26">
<label>Slider</label>
<address transform="DPT:9" type="">12/7/9</address>
@@ -133,10 +166,11 @@
<label>Info: Slider</label>
<address transform="DPT:9" type="">12/7/9</address>
</info>
+ <break/>
<image src="icon/comet_128_ff8000.png">
<label>Image</label>
</image>
- <page name="Erweitert...">
+ <page name="Image: Erweitert..." align="center">
<image src="http://www.e-zeeinternet.com/count.php?page=546016&style=default&nbdigits=9&reloads=1" refresh="10">
<label>Image: Update alle 10s</label>
</image>
@@ -149,10 +183,17 @@
<iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
</page>
<page name="Flavour Test" align="center" >
- <text>The flavours define a page specific look for a choosen design.
- The CometVisu's pure design was inspired by the colors that a comet out of
- that material would shine in.
+ <text>
+ Die Flavour (englisch für Geschmacksrichtung) definieren eine, vom
+ Design abhängige, Variation des Aussehens einzelner Sub-Seiten.
</text>
+ <line/>
+ <text align="center">Design: <b>Pure</b></text>
+ <text>
+ Das Design "Pure" ist inspiriert von den Farben, in denen ein Komet
+ scheinen würde, wenn er aus dem jeweiligen Element bestehen würde.
+ </text>
+ <break/>
<page name="Flavour: Antimony" align="center" flavour="antimony">
<text align="center">CometVisu Antimony flavour</text>
<line/>
@@ -278,12 +319,13 @@
</info>
</page>
<line/>
- <text align="center">Plugins</text>
+ <text align="center"><b>Plugins</b></text>
<text>Diese Widgets sind Plugins und stehen dann zur Verfügung, wenn sie in
der Config-Datei aktiviert werden.
</text>
+ <break/>
<colorchooser>
- <label>A colorChooser</label>
+ <label>ColorChooser</label>
<address transform="DPT:5.001" variant="r">12/7/50</address>
<address transform="DPT:5.001" variant="g">12/7/51</address>
<address transform="DPT:5.001" variant="b">12/7/52</address>
@@ -297,6 +339,7 @@
<label>R</label>
<address transform="DPT:5.001" type="">12/7/50</address>
</slide>
+ <break/>
<info format="%.2f">
<label>G</label>
<address transform="DPT:5.001" type="">12/7/51</address>
@@ -305,6 +348,7 @@
<label>G</label>
<address transform="DPT:5.001" type="">12/7/51</address>
</slide>
+ <break/>
<info format="%.2f">
<label>B</label>
<address transform="DPT:5.001" type="">12/7/52</address>
@@ -313,6 +357,7 @@
<label>B</label>
<address transform="DPT:5.001" type="">12/7/52</address>
</slide>
+ <break/>
<diagram_popup rrd="eib_traffic" unit="tps" series="day" refresh="300">KNX traffic</diagram_popup>
<diagram_inline rrd="eib_traffic" width="600" height="400"/>
<line/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-13 21:58:44
|
Revision: 518
http://openautomation.svn.sourceforge.net/openautomation/?rev=518&view=rev
Author: mayerch
Date: 2011-11-13 21:58:38 +0000 (Sun, 13 Nov 2011)
Log Message:
-----------
Bugfix: avoid overflow in infotrigger
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-11-13 21:49:40 UTC (rev 517)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-11-13 21:58:38 UTC (rev 518)
@@ -152,7 +152,7 @@
<line/>
<text>Absolut</text>
<break/>
- <infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%">
+ <infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%" max="100">
<label>Lautstärke</label>
<address transform="DPT:5.001" readonly="false" variant="absolute">12/7/5</address>
</infotrigger>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-02-12 21:23:08
|
Revision: 701
http://openautomation.svn.sourceforge.net/openautomation/?rev=701&view=rev
Author: mayerch
Date: 2012-02-12 21:23:02 +0000 (Sun, 12 Feb 2012)
Log Message:
-----------
Change local entry to universal one...
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-02-12 14:36:55 UTC (rev 700)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-02-12 21:23:02 UTC (rev 701)
@@ -370,9 +370,9 @@
<label>KNX traffic</label>
</diagram_popup>
<diagram_inline rrd="eib_traffic" width="600" height="400"/>
- <diagram_info rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">
- <label>DALI Strom L1</label>
- <address transform="DPT:9.021">14/2/7</address>
+ <diagram_info rrd="eib_traffic" unit="tps" series="day" refresh="300">
+ <label>KNX traffic</label>
+ <address transform="DPT:9.021">12/7/9</address>
</diagram_info>
<line/>
<page name="Erweiterte Widgets">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-05-13 10:36:22
|
Revision: 817
http://openautomation.svn.sourceforge.net/openautomation/?rev=817&view=rev
Author: mayerch
Date: 2012-05-13 10:36:15 +0000 (Sun, 13 May 2012)
Log Message:
-----------
Make obvious in the demo config that units etc. can be easily added to the format string
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-05-12 22:02:23 UTC (rev 816)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-05-13 10:36:15 UTC (rev 817)
@@ -377,6 +377,15 @@
<address transform="DPT:9">12/7/9</address>
</info>
<line/>
+ <info format="%.2f°C">
+ <label>Format "%.2f°C":</label>
+ <address transform="DPT:9">12/7/9</address>
+ </info>
+ <info format="%.2f%%">
+ <label>Format "%.2f%%":</label>
+ <address transform="DPT:9">12/7/9</address>
+ </info>
+ <line/>
<info format="%.4f" mapping="One1000th">
<label>Format "%.4f + Formel":</label>
<address transform="DPT:9">12/7/9</address>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-06-06 20:53:50
|
Revision: 863
http://openautomation.svn.sourceforge.net/openautomation/?rev=863&view=rev
Author: mayerch
Date: 2012-06-06 20:53:44 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Added colspan/rowspan example page
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-06-06 20:29:49 UTC (rev 862)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-06-06 20:53:44 UTC (rev 863)
@@ -447,6 +447,54 @@
</page>
</page>
</page>
+ <page name="colspan/rowspan Test" align="center">
+ <text><layout colspan="12" />Colspan 12, no Rowspan</text>
+ <text><layout colspan="6" />Colspan 6, no Rowspan</text><text><layout colspan="6" />Colspan 6, no Rowspan</text>
+ <text><layout colspan="4" />Colspan 4, no Rowspan</text><text><layout colspan="4" />Colspan 4, no Rowspan</text><text><layout colspan="4" />Colspan 4, no Rowspan</text>
+ <text><layout colspan="3" />Colspan 3, no Rowspan</text><text><layout colspan="3" />Colspan 3, no Rowspan</text>
+ <text><layout colspan="3" />Colspan 3, no Rowspan</text><text><layout colspan="3" />Colspan 3, no Rowspan</text>
+ <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
+ <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
+ <text><layout colspan="2" />Colspan 2, no Rowspan</text><text><layout colspan="2" />Colspan 2, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" />Colspan 1, no Rowspan</text><text><layout colspan="1" />Colspan 1, no Rowspan</text>
+ <text><layout colspan="1" rowspan="12" />Colspan 1, Rowspan 12</text>
+ <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
+ <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="6" rowspan="1" />Colspan 6, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+ <text><layout colspan="1" rowspan="4" />Colspan 1, Rowspan 4</text>
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ <text><layout colspan="1" rowspan="3" />Colspan 1, Rowspan 3</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="2" />Colspan 1, Rowspan 2</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="6" />Colspan 1, Rowspan 6</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ <text><layout colspan="1" rowspan="1" />Colspan 1, Rowspan 1</text>
+ </page>
<break/>
<page name="2D fixed Bitmap" type="2d" backdrop="media/demo_2d_backdrop_nikolaushaus.png" align="center">
<switch mapping="On_Off" styling="Red_Green">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-02-09 12:47:22
|
Revision: 1446
http://openautomation.svn.sourceforge.net/openautomation/?rev=1446&view=rev
Author: mayerch
Date: 2013-02-09 12:47:12 +0000 (Sat, 09 Feb 2013)
Log Message:
-----------
Added link to editor - and moved that filre though the update script as well.
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2013-02-09 12:29:03 UTC (rev 1445)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2013-02-09 12:47:12 UTC (rev 1446)
@@ -1,5 +1,5 @@
<?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" max_mobile_screen_width="480">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" design="pure" xsi:noNamespaceSchemaLocation="./visu_config.xsd" max_mobile_screen_width="480" lib_version="1">
<meta>
<plugins>
<plugin name="colorchooser"/>
@@ -53,7 +53,9 @@
</mapping>
<mapping name="audio_mute">
<entry value="0"><icon name="audio_mute"/> Aus</entry>
- <entry value="1"><icon name="audio_audio"/></entry>
+ <entry value="1">
+ <icon name="audio_audio"/>
+ </entry>
</mapping>
</mappings>
<stylings>
@@ -120,6 +122,7 @@
- <a href=".?config=demo&forceReload=true">Reload</a>
- <a href=".">Default Config</a>
]]></status>
+ <status type="html" condition="!edit" hrefextend="config"> - <a href="editor/">Edit</a></status>
<status type="html" hrefextend="config"><![CDATA[
- <a href="check_config.php">Check Config</a>
<div style="float:right;padding-right:0.5em">Version: SVN</div>
@@ -128,7 +131,9 @@
</meta>
<page name="CometVisu Widget Demo">
<navbar position="left" dynamic="true" width="200px">
- <text><label>Test 1</label></text>
+ <text>
+ <label>Test 1</label>
+ </text>
<line/>
<pagejump target="id_0_34_7" name="Lithium">
<label>Flavour</label>
@@ -140,120 +145,137 @@
<label>2D</label>
</pagejump>
</navbar>
- <text align="center"><label>Herzlich willkommen bei dem CometVisu Widget Demo!</label></text>
- <text><label><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</label></text>
+ <text align="center">
+ <label>Herzlich willkommen bei dem CometVisu Widget Demo!</label>
+ </text>
+ <text>
+ <label><b>Hinweis:</b><br/>Alle Widgets verwenden KNX-Addressen mit der Haupt- und Mittelgruppe 12/7, da diese meist unbenutzt sind und so beim Testen oft keine Nebenwirkungen auftreten können. Sollten diese Gruppe bei Ihnen verwendet werden, so sollten Sie diese Widgets hier nicht betätigen!</label>
+ </text>
<line/>
- <text><label>Für die CometVisu gibt es verschiedene Designs.</label></text>
+ <text>
+ <label>Für die CometVisu gibt es verschiedene Designs.</label>
+ </text>
<designtoggle>Wechsle Design</designtoggle>
<line/>
- <text align="center"><label><b>Standard-Widgets</b></label></text>
+ <text align="center">
+ <label><b>Standard-Widgets</b></label>
+ </text>
<break/>
<switch mapping="On_Off" styling="Red_Green">
<label>Switch</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</switch>
<break/>
<trigger value="0" mapping="On_Off">
<label>Trigger</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</trigger>
<trigger value="1" mapping="On_Off">
<label>Trigger</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</trigger>
<break/>
<multitrigger button1label="Auto" button1value="auto" button2label="Komfort" button2value="comfort" button3label="Standy By" button3value="standby" button4label="Economy" button4value="economy">
<label>Multitrigger: KONNEX Betriebsart</label>
- <address transform="DPT:20.102" type="">12/7/20</address>
+ <address transform="DPT:20.102" mode="readwrite">12/7/20</address>
</multitrigger>
<info mapping="KonnexHVAC">
<label>Info: Betriebsart</label>
- <address transform="DPT:20.102" type="">12/7/20</address>
+ <address transform="DPT:20.102" mode="readwrite">12/7/20</address>
</info>
<break/>
<multitrigger button1label="An" button1value="0" button2label="Aus" button2value="1" button3label="Essen" button3value="2" button4label="Fernsehen" button4value="3">
<label>Multitrigger: Szenenaufruf</label>
- <address transform="DPT:5.010" type="">12/7/5</address>
+ <address transform="DPT:5.010" mode="readwrite">12/7/5</address>
</multitrigger>
<switch mapping="audio_mute">
- <label><icon name="audio_sound" /> Switch Icon</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
+ <label><icon name="audio_sound"/> Switch Icon</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</switch>
<break/>
- <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="0.1" downvalue="-0.1" align="center" format="%.1f °C" change="absolute" min="7" max="24">
+ <infotrigger uplabel="wärmer" downlabel="kälter" upvalue="0.1" downvalue="-0.1" align="center" format="%.1f °C" change="absolute" min="7" max="24">
<label>Infotrigger: Sollwert</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</infotrigger>
- <infotrigger uplabel=">" downlabel="<" upvalue="1" downvalue="-1" min="0" max="5" align="center" infoposition="1" change="absolute" mapping="AudioSource" >
+ <infotrigger uplabel=">" downlabel="<" upvalue="1" downvalue="-1" min="0" max="5" align="center" infoposition="1" change="absolute" mapping="AudioSource">
<label>Infotrigger: Audioquelle</label>
- <address transform="DPT:5.010">12/7/105</address>
+ <address transform="DPT:5.010" mode="readwrite">12/7/105</address>
</infotrigger>
<page name="Trigger und Infotrigger: Erweitert..." align="center">
- <text><label>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</label></text>
+ <text>
+ <label>Ein Infotrigger lässt sich in zwei verschiedenen Betriebsarten betreiben: relativ und absolut</label>
+ </text>
<line/>
- <text><label>Relativ</label></text>
+ <text>
+ <label>Relativ</label>
+ </text>
<break/>
<infotrigger uplabel="+" upvalue="1" downlabel="-" downvalue="0" align="center" infoposition="1" change="relative">
<label>Lautstärke</label>
- <address transform="DPT:16.000" mode="read" variant="display">12/7/16</address>
- <address transform="DPT:1.001" variant="button">12/7/1</address>
+ <address transform="DPT:16.000" mode="readwrite" variant="display">12/7/16</address>
+ <address transform="DPT:1.001" variant="button" mode="readwrite">12/7/1</address>
</infotrigger>
<break/>
<info>
<label>Absolute GA</label>
- <address transform="DPT:16.000">12/7/16</address>
+ <address transform="DPT:16.000" mode="readwrite">12/7/16</address>
</info>
<info>
<label>Relative GA</label>
- <address transform="DPT:1.001">12/7/1</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</info>
<multitrigger button1label="An" button1value="50%" button2label="Aus" button2value="0%" button3label="Leise" button3value="25%" button4label="Laut" button4value="100%">
<label>Lautstärke-Text</label>
- <address transform="DPT:16.000" type="">12/7/16</address>
+ <address transform="DPT:16.000" mode="readwrite">12/7/16</address>
</multitrigger>
<line/>
- <text><label>Absolut</label></text>
+ <text>
+ <label>Absolut</label>
+ </text>
<break/>
<infotrigger uplabel="+" upvalue="5" downlabel="-" downvalue="-5" align="center" infoposition="1" change="absolute" format="%.1f%%" max="100">
<label>Lautstärke</label>
- <address transform="DPT:5.001">12/7/5</address>
+ <address transform="DPT:5.001" mode="readwrite">12/7/5</address>
</infotrigger>
<line/>
- <text><layout colspan="12"/><label>Ein Trigger kann auch für Kurz- und Langzeit unterschiedliche Werte an unterschiedlich Adressen senden</label></text>
+ <text>
+ <layout colspan="12"/>
+ <label>Ein Trigger kann auch für Kurz- und Langzeit unterschiedliche Werte an unterschiedlich Adressen senden</label>
+ </text>
<break/>
<trigger value="1" shorttime="300" shortvalue="0">
<label>Trigger auf 300ms, sende Kurzzeit "0" und Langzeit "1"</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- <address transform="DPT:1.001" type="" variant="short">12/7/10</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ <address transform="DPT:1.001" variant="short" mode="readwrite">12/7/10</address>
</trigger>
<trigger value="0" shorttime="1000" shortvalue="1">
<label>Trigger auf 1000ms, sende Kurzzeit "1" und Langzeit "0"</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- <address transform="DPT:1.001" type="" variant="short">12/7/10</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ <address transform="DPT:1.001" variant="short" mode="readwrite">12/7/10</address>
</trigger>
<info>
<label>Info: Kurzzeit</label>
- <address transform="DPT:1.001" type="">12/7/10</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/10</address>
</info>
<info>
<label>Info: Langzeit</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
</info>
<infotrigger uplabel="Sende 1" upvalue="1" shortupvalue="1" downlabel="Sende 0" downvalue="0" shortdownvalue="0" shorttime="300" align="center" infoposition="1" change="relative" format="%.1f%%">
<label>Infotrigger mit 300ms Kurzzeit</label>
- <address transform="DPT:16.000" mode="read" variant="display">12/7/16</address>
- <address transform="DPT:1.001" variant="button">12/7/1</address>
- <address transform="DPT:1.001" variant="short">12/7/10</address>
+ <address transform="DPT:16.000" mode="readwrite" variant="display">12/7/16</address>
+ <address transform="DPT:1.001" variant="button" mode="readwrite">12/7/1</address>
+ <address transform="DPT:1.001" variant="short" mode="readwrite">12/7/10</address>
</infotrigger>
</page>
<break/>
<slide min="-18" max="26">
<label>Slider</label>
- <address transform="DPT:9" type="">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</slide>
<info styling="Blue_Purple_Red">
<label>Info: Slider</label>
- <address transform="DPT:9" type="">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<break/>
<image src="icon/comet_128_ff8000.png">
@@ -269,7 +291,9 @@
</page>
<break/>
<page name="Video..." align="center">
- <text><label>In dem Video-Element lassen sich Videos nach dem HTML5 Standard einbinden</label></text>
+ <text>
+ <label>In dem Video-Element lassen sich Videos nach dem HTML5 Standard einbinden</label>
+ </text>
<break/>
<video src="https://upload.wikimedia.org/wikipedia/commons/b/b5/I-15bis.ogg" autoplay="false">
<label>Polikarpov I-15bis - Ogg Theora</label>
@@ -277,348 +301,678 @@
</page>
<trigger value="1">
<label>Seitenwechsel per GA</label>
- <address transform="DPT:1.001" type="">12/7/100</address>
+ <address transform="DPT:1.001" mode="readwrite">12/7/100</address>
</trigger>
<line/>
- <page name="web Test" align="center" >
- <web src="http://www.cometvisu.org" width="500px" height="500px"/>
+ <page name="web Test" align="center">
+ <web src="http://www.cometvisu.org/" width="500px" height="500px"/>
</page>
- <page name="Flavour Test" align="center" >
- <text><label>
+ <page name="Flavour Test" align="center">
+ <text>
+ <label>
Die Flavour (englisch für Geschmacksrichtung) definieren eine, vom
Design abhängige, Variation des Aussehens einzelner Sub-Seiten.
- </label></text>
+ </label>
+ </text>
<line/>
- <text align="center"><label>Design: <b>Pure</b></label></text>
- <text><label>
+ <text align="center">
+ <label>Design: <b>Pure</b></label>
+ </text>
+ <text>
+ <label>
Das Design "Pure" ist inspiriert von den Farben, in denen ein Komet
scheinen würde, wenn er aus dem jeweiligen Element bestehen würde.
- </label></text>
+ </label>
+ </text>
<break/>
<page name="Flavour: Antimony" align="center" flavour="antimony">
- <text align="center"><label>CometVisu Antimony flavour</label></text>
+ <text align="center">
+ <label>CometVisu Antimony flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
<page name="Flavour: Boron" align="center" flavour="boron">
- <text align="center"><label>CometVisu Boron flavour</label></text>
+ <text align="center">
+ <label>CometVisu Boron flavour</label>
+ </text>
<line/>
<page name="Subpage" ga="12/7/100">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
<page name="Flavour: Lithium" align="center" flavour="lithium">
- <text align="center"><label>CometVisu Lithium flavour</label></text>
+ <text align="center">
+ <label>CometVisu Lithium flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
<page name="Flavour: Potassium" align="center" flavour="potassium">
- <text align="center"><label>CometVisu Potassium flavour</label></text>
+ <text align="center">
+ <label>CometVisu Potassium flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
<page name="Flavour: Sodium" align="center" flavour="sodium">
- <text align="center"><label>CometVisu Sodium flavour</label></text>
+ <text align="center">
+ <label>CometVisu Sodium flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
- <line />
+ <line/>
<page name="Flavour: black" align="center" flavour="black">
- <text align="center"><label>CometVisu black flavour</label></text>
+ <text align="center">
+ <label>CometVisu black flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
<page name="Flavour: white" align="center" flavour="white">
- <text align="center"><label>CometVisu white flavour</label></text>
+ <text align="center">
+ <label>CometVisu white flavour</label>
+ </text>
<line/>
<page name="Subpage">
- <text><label>An empty page</label></text>
+ <text>
+ <label>An empty page</label>
+ </text>
<line/>
</page>
- <text><label><icon name="CometVisu" type="64" />Text with Icon</label></text>
+ <text>
+ <label><icon name="CometVisu" type="64"/>Text with Icon</label>
+ </text>
</page>
</page>
<page name="Format Test" align="center">
- <text><label>
+ <text>
+ <label>
Über das Format-Attribut kann die Anzeige von Werten variiert werden.
Dazu wird die Synatx des vom "printf" bekannten Formatstrings benutzt.
- </label></text>
+ </label>
+ </text>
<break/>
<slide min="-100" max="101">
<label>Test-Slider</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</slide>
<info>
<label>Ohne Format</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<line/>
<info format="%.0f">
<label>Format "%.0f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%.1f">
<label>Format "%.1f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%.2f">
<label>Format "%.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%.3f">
<label>Format "%.3f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%.4f">
<label>Format "%.4f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<line/>
<info format="%01.2f">
<label>Format "%01.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%02.2f">
<label>Format "%02.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%03.2f">
<label>Format "%03.3f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%04.2f">
<label>Format "%04.3f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%05.2f">
<label>Format "%05.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%06.2f">
<label>Format "%06.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<line/>
<info format="%+.2f">
<label>Format "%+.2f":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<line/>
<info format="%.2f°C">
<label>Format "%.2f°C":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<info format="%.2f%%">
<label>Format "%.2f%%":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
<line/>
<info format="%.4f" mapping="One1000th">
<label>Format "%.4f + Formel":</label>
- <address transform="DPT:9">12/7/9</address>
+ <address transform="DPT:9" mode="readwrite">12/7/9</address>
</info>
</page>
<page name="Stylings Test" align="center">
- <switch mapping="On_Off" styling="Green_Red">
- <label>Switch green/red</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- </switch>
- <switch mapping="On_Off" styling="Grey_Green">
- <label>Switch grey/green</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- </switch>
- <switch mapping="On_Off" styling="Grey_Red">
- <label>Switch grey/red</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- </switch>
- <switch mapping="On_Off" styling="Grey_Blue">
- <label>Switch grey/blue</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- </switch>
- <switch mapping="On_Off" styling="Brown_Purple">
- <label>Switch brown/purple</label>
- <address transform="DPT:1.001" type="">12/7/1</address>
- </switch>
- <line/>
- <info styling="Blue_Lightblue_Green_Purple_Red" format="%.1f °C">
- <label>Info: with Styling/Ranges</label>
- <address transform="DPT:9" type="">12/7/10</address>
- </info>
- <slide min="-10" max="32">
- <label>Slider to show ranges in styling</label>
- <address transform="DPT:9" type="">12/7/10</address>
- </slide>
- <line/>
- <text><label>All predefined colors:</label></text>
- <break/>
- <trigger value="0" styling="All_Colors">
- <label>red</label>
- </trigger>
- <trigger value="1" styling="All_Colors">
- <label>white</label>
- </trigger>
- <trigger value="2" styling="All_Colors">
- <label>cyan</label>
- </trigger>
- <trigger value="3" styling="All_Colors">
- <label>silver</label>
- </trigger>
- <trigger value="4" styling="All_Colors">
- <label>blue</label>
- </trigger>
- <trigger value="5" styling="All_Colors">
- <label>grey</label>
- </trigger>
- <trigger value="6" styling="All_Colors">
- <label>darkblue</label>
- </trigger>
- <trigger value="7" styling="All_Colors">
- <label>black</label>
- </trigger>
- <trigger value="8" styling="All_Colors">
- <label>lightblue</label>
- </trigger>
- <trigger value="9" styling="All_Colors">
- <label>orange</label>
- </trigger>
- <trigger value="10" styling="All_Colors">
- <label>purple</label>
- </trigger>
- <trigger value="11" styling="All_Colors">
- <label>brown</label>
- </trigger>
- <trigger value="12" styling="All_Colors">
- <label>yellow</label>
- </trigger>
- <trigger value="13" styling="All_Colors">
- <label>maroon</label>
- </trigger>
- <trigger value="14" styling="All_Colors">
- <label>lime</label>
- </trigger>
- <trigger value="15" styling="All_Colors">
- <label>green</label>
- </trigger>
- <trigger value="16" styling="All_Colors">
- <label>fuchsia</label>
- </trigger>
- <trigger value="17" styling="All_Colors">
- <label>olive</label>
- </trigger>
+ <switch mapping="On_Off" styling="Green_Red">
+ <label>Switch green/red</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ </switch>
+ <switch mapping="On_Off" styling="Grey_Green">
+ <label>Switch grey/green</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ </switch>
+ <switch mapping="On_Off" styling="Grey_Red">
+ <label>Switch grey/red</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ </switch>
+ <switch mapping="On_Off" styling="Grey_Blue">
+ <label>Switch grey/blue</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ </switch>
+ <switch mapping="On_Off" styling="Brown_Purple">
+ <label>Switch brown/purple</label>
+ <address transform="DPT:1.001" mode="readwrite">12/7/1</address>
+ </switch>
+ <line/>
+ <info styling="Blue_Lightblue_Green_Purple_Red" format="%.1f °C">
+ <label>Info: with Styling/Ranges</label>
+ <address transform="DPT:9" mode="readwrite">12/7/10</address>
+ </info>
+ <slide min="-10" max="32">
+ <label>Slider to show ranges in styling</label>
+ <address transform="DPT:9" mode="readwrite">12/7/10</address>
+ </slide>
+ <line/>
+ <text>
+ <label>All predefined colors:</label>
+ </text>
+ <break/>
+ <trigger value="0" styling="All_Colors">
+ <label>red</label>
+ </trigger>
+ <trigger value="1" styling="All_Colors">
+ <label>white</label>
+ </trigger>
+ <trigger value="2" styling="All_Colors">
+ <label>cyan</label>
+ </trigger>
+ <trigger value="3" styling="All_Colors">
+ <label>silver</label>
+ </trigger>
+ <trigger value="4" styling="All_Colors">
+ <label>blue</label>
+ </trigger>
+ <trigger value="5" styling="All_Colors">
+ <label>grey</label>
+ </trigger>
+ <trigger value="6" styling="All_Colors">
+ <label>darkblue</label>
+ </trigger>
+ <trigger value="7" styling="All_Colors">
+ <label>black</label>
+ </trigger>
+ <trigger value="8" styling="All_Colors">
+ <label>lightblue</label>
+ </trigger>
+ <trigger value="9" styling="All_Colors">
+ <label>orange</label>
+ </trigger>
+ <trigger value="10" styling="All_Colors">
+ <label>purple</label>
+ </trigger>
+ <trigger value="11" styling="All_Colors">
+ <label>brown</label>
+ </trigger>
+ <trigger value="12" styling="All_Colors">
+ <label>yellow</label>
+ </trigger>
+ <trigger value="13" styling="All_Colors">
+ <label>maroon</label>
+ </trigger>
+ <trigger value="14" styling="All_Colors">
+ <label>lime</label>
+ </trigger>
+ <trigger value="15" styling="All_Colors">
+ <label>green</label>
+ </trigger>
+ <trigger value="16" styling="All_Colors">
+ <label>fuchsia</label>
+ </trigger>
+ <trigger value="17" styling="All_Colors">
+ <label>olive</label>
+ </trigger>
</page>
<page name="Icon Test" align="center">
- <text><label><icon name="CometVisu" type="64" /> Icon links vom Text</label></text>
- <text><label>Icon <icon name="CometVisu" type="64" /> mitten im Text</label></text>
- <text><label>Icon rechts vom Text <icon name="CometVisu" type="64" /></label></text>
- <text><label><icon name="CometVisu" type="64" /> Mehrere Icons <icon name="CometVisu" type="64" /></label></text>
- <line />
- <text><label><icon name="CometVisu" type="16" /> Icon mit type="16"</label></text>
- <text><label><icon name="CometVisu" type="32" /> Icon mit type="32"</label></text>
- <text><label><icon name="CometVisu" type="64" /> Icon mit type="64"</label></text>
- <text><label><icon name="CometVisu" type="128" /> Icon mit type="128"</label></text>
- <line />
- <page name="Subpage mit Flavour" flavour="lithium" align="center" >
- <text><label><icon name="CometVisu" type="64" /> Icon links vom Text</label></text>
- <text><label><icon name="CometVisu" type="64" flavour="antimony" /> Icon mit flavour links vom Text</label></text>
- <page name="Subpage mit anderem Flavour" flavour="antimony" align="center" >
- <text><label><icon na...
[truncated message content] |
|
From: <vl...@us...> - 2012-08-23 09:49:37
|
Revision: 983
http://openautomation.svn.sourceforge.net/openautomation/?rev=983&view=rev
Author: vlamers
Date: 2012-08-23 09:49:31 +0000 (Thu, 23 Aug 2012)
Log Message:
-----------
added max_mobile_screen_width to visu_config_demo.xml
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2012-08-22 19:15:58 UTC (rev 982)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2012-08-23 09:49:31 UTC (rev 983)
@@ -1,5 +1,5 @@
<?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">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" design="pure" xsi:noNamespaceSchemaLocation="visu_config.xsd" max_mobile_screen_width="480">
<meta>
<plugins>
<plugin name="colorchooser"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X