Menu
▾
▴
openautomation-svn — Mailinglist that shows all subversion commits
You can subscribe to this list here.
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
(121) |
Dec
(58) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2011 |
Jan
(38) |
Feb
(36) |
Mar
(7) |
Apr
(2) |
May
(32) |
Jun
(24) |
Jul
(16) |
Aug
(21) |
Sep
(17) |
Oct
(62) |
Nov
(60) |
Dec
(70) |
| 2012 |
Jan
(54) |
Feb
(41) |
Mar
(21) |
Apr
(38) |
May
(76) |
Jun
(47) |
Jul
(25) |
Aug
(72) |
Sep
(29) |
Oct
(64) |
Nov
(93) |
Dec
(97) |
| 2013 |
Jan
(100) |
Feb
(168) |
Mar
(115) |
Apr
(59) |
May
(37) |
Jun
(32) |
Jul
(45) |
Aug
(42) |
Sep
(24) |
Oct
(73) |
Nov
(64) |
Dec
(4) |
| 2014 |
Jan
(14) |
Feb
(57) |
Mar
(58) |
Apr
(10) |
May
(18) |
Jun
(12) |
Jul
(7) |
Aug
(12) |
Sep
(15) |
Oct
(6) |
Nov
(32) |
Dec
(17) |
| 2015 |
Jan
(50) |
Feb
(5) |
Mar
(1) |
Apr
(26) |
May
(10) |
Jun
(3) |
Jul
(3) |
Aug
(2) |
Sep
(3) |
Oct
(18) |
Nov
(18) |
Dec
(8) |
| 2016 |
Jan
(33) |
Feb
(35) |
Mar
(50) |
Apr
(20) |
May
(25) |
Jun
(17) |
Jul
(8) |
Aug
(73) |
Sep
(64) |
Oct
(51) |
Nov
(20) |
Dec
(14) |
| 2017 |
Jan
(41) |
Feb
(57) |
Mar
(44) |
Apr
(136) |
May
(32) |
Jun
(39) |
Jul
(2) |
Aug
(12) |
Sep
(32) |
Oct
(103) |
Nov
(12) |
Dec
(4) |
| 2018 |
Jan
(9) |
Feb
(1) |
Mar
(60) |
Apr
(24) |
May
(15) |
Jun
(1) |
Jul
(2) |
Aug
(23) |
Sep
(15) |
Oct
(57) |
Nov
(21) |
Dec
(77) |
| 2019 |
Jan
(62) |
Feb
(99) |
Mar
(98) |
Apr
(49) |
May
(6) |
Jun
(3) |
Jul
(6) |
Aug
(18) |
Sep
(9) |
Oct
(15) |
Nov
(30) |
Dec
(6) |
| 2020 |
Jan
(14) |
Feb
(2) |
Mar
(22) |
Apr
(33) |
May
(47) |
Jun
(12) |
Jul
|
Aug
|
Sep
(4) |
Oct
(2) |
Nov
(5) |
Dec
(5) |
| 2021 |
Jan
(4) |
Feb
(101) |
Mar
(13) |
Apr
(32) |
May
(40) |
Jun
|
Jul
(3) |
Aug
|
Sep
|
Oct
(25) |
Nov
(12) |
Dec
|
| 2022 |
Jan
(154) |
Feb
(82) |
Mar
(63) |
Apr
(27) |
May
(26) |
Jun
(5) |
Jul
(12) |
Aug
(23) |
Sep
(17) |
Oct
(37) |
Nov
(13) |
Dec
(21) |
| 2023 |
Jan
(43) |
Feb
(43) |
Mar
(15) |
Apr
(8) |
May
(3) |
Jun
(25) |
Jul
(6) |
Aug
(38) |
Sep
(5) |
Oct
(20) |
Nov
(9) |
Dec
(28) |
| 2024 |
Jan
(15) |
Feb
(2) |
Mar
(12) |
Apr
(2) |
May
(8) |
Jun
(10) |
Jul
(10) |
Aug
(2) |
Sep
(3) |
Oct
(15) |
Nov
(6) |
Dec
(20) |
| 2025 |
Jan
|
Feb
(2) |
Mar
(6) |
Apr
(2) |
May
(2) |
Jun
|
Jul
|
Aug
(1) |
Sep
(1) |
Oct
(11) |
Nov
(2) |
Dec
|
|
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-06 16:37:50
|
Revision: 504
http://openautomation.svn.sourceforge.net/openautomation/?rev=504&view=rev
Author: mayerch
Date: 2011-11-06 16:37:43 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Change to German compatible name so that users who are only using the internal editor won't need to change it.
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xml
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2011-11-06 16:06:44 UTC (rev 503)
+++ CometVisu/trunk/visu/visu_config.xml 2011-11-06 16:37:43 UTC (rev 504)
@@ -63,7 +63,7 @@
]]></status>
</statusbar>
</meta>
- <page name="Overview">
+ <page name="Start">
<line/>
<text align="center">Welcome to the CometVisu!</text>
<line/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-06 16:06:50
|
Revision: 503
http://openautomation.svn.sourceforge.net/openautomation/?rev=503&view=rev
Author: mayerch
Date: 2011-11-06 16:06:44 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Bug fix: clip to min/max if old+delta is out of range (old and wrong behaviour was to do nothing, i.e. the value stays out of range)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-11-06 15:19:17 UTC (rev 502)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-11-06 16:06:44 UTC (rev 503)
@@ -830,7 +830,8 @@
{
value = parseFloat($(this).parent().find('.switchInvisible').data('basicvalue'));
value = value + parseFloat(data.value);
- if (value < data.min || data.max < value) return; // check min/max
+ if (value < data.min ) value = data.min;
+ if( value > data.max ) value = data.max;
}
for( var addr in data.address )
{
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 12:08:23
|
Revision: 501
http://openautomation.svn.sourceforge.net/openautomation/?rev=501&view=rev
Author: mayerch
Date: 2011-11-06 12:08:17 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Preparation for 0.6.0: give usefull defaults in the empty default config and make widget demo config consistent
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xml
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2011-11-05 20:03:42 UTC (rev 500)
+++ CometVisu/trunk/visu/visu_config.xml 2011-11-06 12:08:17 UTC (rev 501)
@@ -2,10 +2,48 @@
<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="Open_Close">
+ <entry value="0">zu</entry>
+ <entry value="1">offen</entry>
+ </mapping>
+ <mapping name="Close_Open">
+ <entry value="0">offen</entry>
+ <entry value="1">zu</entry>
+ </mapping>
+ <mapping name="On_Off">
+ <entry value="0">Aus</entry>
+ <entry value="1">An</entry>
+ </mapping>
+ <mapping name="Off_On">
+ <entry value="0">An</entry>
+ <entry value="1">Aus</entry>
+ </mapping>
+ <mapping name="KonnexHVAC">
+ <entry value="auto">Auto</entry>
+ <entry value="comfort">Komfort</entry>
+ <entry value="standby">Stand By</entry>
+ <entry value="economy">Economy</entry>
+ <entry value="building_protection">Haus-Schutz</entry>
+ </mapping>
</mappings>
<stylings>
+ <styling name="Red_Green">
+ <entry value="0">red</entry>
+ <entry value="1">green</entry>
+ </styling>
+ <styling name="Green_Red">
+ <entry value="0">green</entry>
+ <entry value="1">red</entry>
+ </styling>
+ <styling name="Blue_Green_Red">
+ <entry range_min="-100" range_max="20">blue</entry>
+ <entry range_min="20" range_max="22">green</entry>
+ <entry range_min="22" range_max="100">red</entry>
+ </styling>
</stylings>
<statusbar>
<status type="html"><![CDATA[
Modified: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml 2011-11-05 20:03:42 UTC (rev 500)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2011-11-06 12:08:17 UTC (rev 501)
@@ -6,14 +6,22 @@
<plugin name="diagram"/>
</plugins>
<mappings>
- <mapping name="OpenClose">
+ <mapping name="Open_Close">
<entry value="0">zu</entry>
<entry value="1">offen</entry>
</mapping>
- <mapping name="OnOff">
+ <mapping name="Close_Open">
+ <entry value="0">offen</entry>
+ <entry value="1">zu</entry>
+ </mapping>
+ <mapping name="On_Off">
<entry value="0">Aus</entry>
<entry value="1">An</entry>
</mapping>
+ <mapping name="Off_On">
+ <entry value="0">An</entry>
+ <entry value="1">Aus</entry>
+ </mapping>
<mapping name="Sign">
<entry range_min="-1e99" range_max="0">Negativ</entry>
<entry value="0">Null</entry>
@@ -28,15 +36,15 @@
</mapping>
</mappings>
<stylings>
- <styling name="RedGreen">
+ <styling name="Red_Green">
<entry value="0">red</entry>
<entry value="1">green</entry>
</styling>
- <styling name="GreenRed">
+ <styling name="Green_Red">
<entry value="0">green</entry>
<entry value="1">red</entry>
</styling>
- <styling name="BluePurpleRed">
+ <styling name="Blue_Purple_Red">
<entry range_min="-100" range_max="0">blue</entry>
<entry value="0">purple</entry>
<entry range_min="0" range_max="100">red</entry>
@@ -62,22 +70,22 @@
</meta>
<page name="Übersicht">
<text align="center">CometVisu Widget Demo</text>
- <switch mapping="OnOff" styling="RedGreen">
+ <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>
</switch>
<break/>
- <trigger value="0" mapping="OnOff">
+ <trigger value="0" mapping="On_Off">
<label>Trigger - Terrasse Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
</trigger>
- <trigger value="1" mapping="OnOff">
+ <trigger value="1" mapping="On_Off">
<label>Trigger - Terrasse Licht</label>
<address transform="DPT:1.001" readonly="false" type="">1/0/2</address>
</trigger>
<group name="Slide group" flavour="potassium" align="center">
- <info styling="BluePurpleRed">
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-11-05 20:03:48
|
Revision: 500
http://openautomation.svn.sourceforge.net/openautomation/?rev=500&view=rev
Author: mayerch
Date: 2011-11-05 20:03:42 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Compatability improvement for iPad
Modified Paths:
--------------
CometVisu/trunk/visu/index.html
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2011-11-04 17:22:40 UTC (rev 499)
+++ CometVisu/trunk/visu/index.html 2011-11-05 20:03:42 UTC (rev 500)
@@ -4,7 +4,9 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CometVisu-Client</title>
- <meta name="viewport" content="width=device-width, initial-scale=1" />
+ <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0; webkit-user-select: none;" />
+ <meta name="apple-mobile-web-app-capable" content="yes" />
+ <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<script src="lib/compatibility.js" type="text/javascript"></script>
<script src="lib/jquery.js" type="text/javascript"></script>
<script src="lib/jquery-ui.js" type="text/javascript"></script>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-04 17:22:47
|
Revision: 499
http://openautomation.svn.sourceforge.net/openautomation/?rev=499&view=rev
Author: j-n-k
Date: 2011-11-04 17:22:40 +0000 (Fri, 04 Nov 2011)
Log Message:
-----------
Solving FR 3362154 (refresh for iframe-widget)
Fixed refresh for video-widget
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
CometVisu/tags/post_0.6.0/visu/lib/templateengine.js
CometVisu/tags/post_0.6.0/visu/visu_config.xsd
Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-04 17:22:40 UTC (rev 499)
@@ -715,8 +715,12 @@
if( $p.attr('frameborder') == "false" ) style += 'border: 0px ;';
if( $p.attr('background') ) style += 'background-color:' + $p.attr('background') + ';';
if( style != '' ) style = 'style="' + style + '"';
+
var actor = '<div class="actor"><iframe src="' +$p.attr('src') + '" ' + style + '></iframe></div>';
- ret_val.append( $(actor) );
+ var refresh = $p.attr('refresh') ? $p.attr('refresh')*1000 : 0;
+ ret_val.append( $(actor).data( {
+ 'refresh': refresh
+ } ).each(setupRefreshAction) ); // abuse "each" to call in context...
return ret_val;
},
attributes: {
@@ -724,7 +728,8 @@
width: { type: 'string', required: false },
height: { type: 'string', required: false },
frameborder: { type: 'list' , required: false, list: {'true': "yes", 'false': "no"} },
- background: { type: 'string', required: false }
+ background: { type: 'string', required: false },
+ refresh: { type: 'numeric', required: false }
},
elements: {
label: { type: 'string', required: false, multi: false }
Modified: CometVisu/tags/post_0.6.0/visu/lib/templateengine.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/lib/templateengine.js 2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/lib/templateengine.js 2011-11-04 17:22:40 UTC (rev 499)
@@ -397,7 +397,7 @@
var refresh = $(this).data('refresh');
if( refresh && refresh > 0 )
{
- var target = $('img', $(this) )[0];
+ var target = $('img', $(this) )[0] || $('video', $(this) )[0] || $('iframe', $(this) )[0];
var src = target.src;
if( src.indexOf('?') < 0 ) src += '?';
$(this).data('interval', setInterval( function(){refreshAction(target, src);}, refresh ) );
Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-03 20:25:14 UTC (rev 498)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-04 17:22:40 UTC (rev 499)
@@ -323,7 +323,7 @@
<xsd:complexType name="image">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="label" type="xsd:string" />
+ <xsd:element name="label" type="xsd:string" />
</xsd:choice>
<xsd:attribute name="src" type="uri" use="required" />
<xsd:attribute name="width" type="dimension" />
@@ -333,22 +333,24 @@
<xsd:complexType name="video">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
</xsd:choice>
<xsd:attribute name="src" type="uri" use="required" />
<xsd:attribute name="width" type="dimension" />
<xsd:attribute name="height" type="dimension" />
+ <xsd:attribute name="refresh" type="xsd:decimal" />
</xsd:complexType>
<xsd:complexType name="iframe">
<xsd:choice maxOccurs="unbounded" minOccurs="0">
- <xsd:element name="label" type="xsd:string" maxOccurs="1" />
+ <xsd:element name="label" type="xsd:string" maxOccurs="1" />
</xsd:choice>
<xsd:attribute name="src" type="uri" use="required" />
<xsd:attribute name="width" type="dimension" />
<xsd:attribute name="height" type="dimension" />
<xsd:attribute name="frameborder" type="xsd:string" />
<xsd:attribute name="background" type="xsd:string" />
+ <xsd:attribute name="refresh" type="xsd:decimal" />
</xsd:complexType>
<xsd:complexType name="colorchooser" >
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-03 20:25:20
|
Revision: 498
http://openautomation.svn.sourceforge.net/openautomation/?rev=498&view=rev
Author: j-n-k
Date: 2011-11-03 20:25:14 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Rendering problem as fixed by Rev. 496 in discreet
Changed AUTHORS
Modified Paths:
--------------
CometVisu/trunk/AUTHORS
CometVisu/trunk/visu/designs/discreet/basic.css
Modified: CometVisu/trunk/AUTHORS
===================================================================
--- CometVisu/trunk/AUTHORS 2011-11-03 20:02:14 UTC (rev 497)
+++ CometVisu/trunk/AUTHORS 2011-11-03 20:25:14 UTC (rev 498)
@@ -5,3 +5,4 @@
Julian Hartmann - julian.hartmann (at) gmail (dot) com
Michael Markstaller - mm (at) elabnet (dot) de
Christian Mayer - CometVisu (at) ChristianMayer (dot) de
+Jan N. Klug - jan.n.klug (at) rub (dot) de
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2011-11-03 20:02:14 UTC (rev 497)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2011-11-03 20:25:14 UTC (rev 498)
@@ -173,8 +173,10 @@
.link a
{
+ line-height: 2em;
color: #81664b;
width: 49%;
+ padding-left: 1em;
}
.page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-03 20:02:20
|
Revision: 497
http://openautomation.svn.sourceforge.net/openautomation/?rev=497&view=rev
Author: j-n-k
Date: 2011-11-03 20:02:14 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Fix bug 3175343 part 1 (default width 100% of widget space)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-11-02 19:44:15 UTC (rev 496)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-11-03 20:02:14 UTC (rev 497)
@@ -685,7 +685,11 @@
ret_val.addClass( 'iframe' );
ret_val.append( '<div class="label">' + page.textContent + '</div>' );
var style = '';
- if( $p.attr('width' ) ) style += 'width:' + $p.attr('width' ) + ';';
+ if( $p.attr('width' ) ) {
+ style += 'width:' + $p.attr('width' ) + ';';
+ } else { // default width is 100% of widget space (fix bug #3175343 part 1)
+ style += 'width: 100%;';
+ }
if( $p.attr('height') ) style += 'height:' + $p.attr('height') + ';';
if( $p.attr('frameborder') == "false" ) style += 'border: 0px ;';
if( $p.attr('background') ) style += 'background-color:' + $p.attr('background') + ';';
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-02 19:44:21
|
Revision: 496
http://openautomation.svn.sourceforge.net/openautomation/?rev=496&view=rev
Author: j-n-k
Date: 2011-11-02 19:44:15 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
Fix not reported rendering problem in discreet_slim design
(pagelinks not vertically centered, missing indentation)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/discreet_slim/basic.css
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2011-11-01 19:33:50 UTC (rev 495)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2011-11-02 19:44:15 UTC (rev 496)
@@ -163,7 +163,9 @@
.link a
{
+ line-height: 2em;
color: #81664b;
+ padding-left: 1em;
width: 49%;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-01 19:33:56
|
Revision: 495
http://openautomation.svn.sourceforge.net/openautomation/?rev=495&view=rev
Author: j-n-k
Date: 2011-11-01 19:33:50 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Added invisible pages (attribute 'visible="false"' in xml-config). FR #3432015
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
CometVisu/tags/post_0.6.0/visu/visu_config.xsd
Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 19:02:27 UTC (rev 494)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 19:33:50 UTC (rev 495)
@@ -60,6 +60,7 @@
this.addCreator('page', {
create: function( page, path, flavour ) {
var $p = $(page);
+
var address = {};
if ($p.attr('ga')) {
src = $p.attr('ga');
@@ -67,9 +68,6 @@
address[ '_' + $p.attr('ga') ] = [ 'DPT:1.001', 0 ];
}
- var $header = $('<div class="widget" path="'+path+'"/>');
- for( var addr in address ) $header.bind( addr, this.update );
- var ret_val = $header;
var pstyle = ( '0' != path ) ? 'display:none;' : ''; // subPage style
var name = $p.attr('name');
var type = $p.attr('type'); //text, 2d or 3d
@@ -77,10 +75,23 @@
var wstyle = ''; // widget style
if( $p.attr('align') ) wstyle += 'text-align:' + $p.attr('align') + ';';
if( wstyle != '' ) wstyle = 'style="' + wstyle + '"';
- ret_val.addClass( 'link' ).addClass('pagelink');
- ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
+
+ var ret_val;
+
+ if ($p.attr('visible')=='false') {
+ ret_val=$('');
+ } else { // default is visible
+ ret_val = $('<div class="widget"/>');
+ ret_val.addClass( 'link' ).addClass('pagelink');
+ ret_val.append( '<div ' + wstyle + '><a href="javascript:scrollToPage(\''+path+'\')">' + name + '</a></div>' );
+ }
+
var childs = $p.children();
- var container = $( '<div class="clearfix"/>' );
+
+ var $container = $( '<div class="clearfix" path="'+path+'"/>');
+ for( var addr in address ) $container.bind( addr, this.update );
+ var container=$container;
+
container.append( '<h1>' + name + '</h1>' );
$( childs ).each( function(i){
container.append( create_pages( childs[i], path + '_' + i, flavour ) );
@@ -89,12 +100,15 @@
subpage.append(container);
if( flavour ) subpage.addClass( 'flavour_' + flavour );
$('#pages').prepend( subpage );
+
return ret_val;
},
attributes: {
align: { type: 'string', required: false },
flavour:{ type: 'string', required: false },
- name: { type: 'string', required: true }
+ name: { type: 'string', required: true },
+ ga: { type: 'addr', required: false },
+ visible:{ type: 'string', required: false }
},
elements: {
},
Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-01 19:02:27 UTC (rev 494)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-01 19:33:50 UTC (rev 495)
@@ -180,6 +180,7 @@
<xsd:attribute name="flavour" type="xsd:string" use="optional" />
<xsd:attribute ref="align" use="optional" />
<xsd:attribute name="ga" type="addr" use="optional" />
+ <xsd:attribute name="visible" type="xsd:boolean" />
</xsd:complexType>
</xsd:element>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-01 19:02:33
|
Revision: 494
http://openautomation.svn.sourceforge.net/openautomation/?rev=494&view=rev
Author: j-n-k
Date: 2011-11-01 19:02:27 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Fix to use animation for scrolling pages via GA
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 17:00:32 UTC (rev 493)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 19:02:27 UTC (rev 494)
@@ -100,7 +100,7 @@
},
update: function(e, data) {
if (data==01) {
- scrollToPage(this.attributes.path.nodeValue, 1);
+ scrollToPage(this.attributes.path.nodeValue);
visu.write(e.type.substr(1), transformEncode("DPT:1.001", 0));
}
},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-01 17:00:43
|
Revision: 493
http://openautomation.svn.sourceforge.net/openautomation/?rev=493&view=rev
Author: j-n-k
Date: 2011-11-01 17:00:32 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Added Pageswitching via GA (FR #3383206):
Added "ga" attribute to page widget (DPT:1.001 hardcoded)
Page is called when address receives 1
0 is returned on same address after switching
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
CometVisu/tags/post_0.6.0/visu/visu_config.xsd
Modified: CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 13:49:37 UTC (rev 492)
+++ CometVisu/tags/post_0.6.0/visu/designs/structure_pure.js 2011-11-01 17:00:32 UTC (rev 493)
@@ -60,7 +60,16 @@
this.addCreator('page', {
create: function( page, path, flavour ) {
var $p = $(page);
- var ret_val = $('<div class="widget" />');
+ var address = {};
+ if ($p.attr('ga')) {
+ src = $p.attr('ga');
+ ga_list.push($p.attr('ga'));
+ address[ '_' + $p.attr('ga') ] = [ 'DPT:1.001', 0 ];
+ }
+
+ var $header = $('<div class="widget" path="'+path+'"/>');
+ for( var addr in address ) $header.bind( addr, this.update );
+ var ret_val = $header;
var pstyle = ( '0' != path ) ? 'display:none;' : ''; // subPage style
var name = $p.attr('name');
var type = $p.attr('type'); //text, 2d or 3d
@@ -89,6 +98,12 @@
},
elements: {
},
+ update: function(e, data) {
+ if (data==01) {
+ scrollToPage(this.attributes.path.nodeValue, 1);
+ visu.write(e.type.substr(1), transformEncode("DPT:1.001", 0));
+ }
+ },
content: true
});
Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-01 13:49:37 UTC (rev 492)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-11-01 17:00:32 UTC (rev 493)
@@ -152,17 +152,17 @@
<xsd:element name="page">
<xsd:complexType>
<xsd:choice minOccurs="0" maxOccurs="unbounded">
- <!-- visual effects -->
+ <!-- visual effects -->
<xsd:element name="line" type="line" />
- <xsd:element name="break" type="break" />
- <xsd:element name="group" type="group" />
+ <xsd:element name="break" type="break" />
+ <xsd:element name="group" type="group" />
<!-- list all possbile widgets here -->
<xsd:element name="text" type="text" />
<xsd:element name="switch" type="switch" />
<xsd:element name="toggle" type="switch" />
<xsd:element name="trigger" type="trigger" />
<xsd:element name="multitrigger" type="multitrigger" />
- <xsd:element name="infotrigger" type="infotrigger" />
+ <xsd:element name="infotrigger" type="infotrigger" />
<xsd:element name="designtoggle" type="designtoggle" />
<xsd:element name="slide" type="slide" />
<xsd:element name="info" type="info" />
@@ -179,6 +179,7 @@
<xsd:attribute name="name" type="xsd:string" use="required" />
<xsd:attribute name="flavour" type="xsd:string" use="optional" />
<xsd:attribute ref="align" use="optional" />
+ <xsd:attribute name="ga" type="addr" use="optional" />
</xsd:complexType>
</xsd:element>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-11-01 13:49:43
|
Revision: 492
http://openautomation.svn.sourceforge.net/openautomation/?rev=492&view=rev
Author: j-n-k
Date: 2011-11-01 13:49:37 +0000 (Tue, 01 Nov 2011)
Log Message:
-----------
Minor code-cleanups for diagram-plugin
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js 2011-10-31 17:43:56 UTC (rev 491)
+++ CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js 2011-11-01 13:49:37 UTC (rev 492)
@@ -55,7 +55,7 @@
diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
diagram.data("label", page.textContent);
diagram.data("refresh", $p.attr("refresh"));
- diagram.data("linecolor", $p.attr("linecolor") || "");
+ diagram.data("linecolor", $p.attr("linecolor") || "");
diagram.data("gridcolor", $p.attr("gridcolor") || "");
refreshDiagram(diagram, {});
@@ -71,7 +71,7 @@
period: {type: "numeric", required: false},
datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
refresh: {type: "numeric", required: false},
- linecolor: {type: "string", required: false},
+ linecolor: {type: "string", required: false},
gridcolor: {type: "string", required: false}
},
content: {type: "string", required: true}
@@ -111,7 +111,7 @@
diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
diagram.data("label", page.textContent);
diagram.data("refresh", $p.attr("refresh"));
- diagram.data("linecolor", $p.attr("linecolor") || "");
+ diagram.data("linecolor", $p.attr("linecolor") || "");
diagram.data("gridcolor", $p.attr("gridcolor") || "");
var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
@@ -179,7 +179,7 @@
datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
refresh: {type: "numeric", required: false},
tooltip: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
- linecolor: {type: "string", required: false},
+ linecolor: {type: "string", required: false},
gridcolor: {type: "string", required: false}
},
content: {type: "string", required: true}
@@ -198,7 +198,6 @@
}).appendTo("body").fadeIn(200);
}
-
function refreshDiagram(diagram, flotoptions, data) {
var diagram = $(diagram);
var config = jQuery.extend(true, {series: diagram.data("series")}, data || {});
@@ -210,8 +209,8 @@
var datasource = diagram.data("datasource") || "AVERAGE";
var period = diagram.data("period") || 1;
var linecolor = diagram.data("linecolor") || diagramColors.data;
- var gridcolor = diagram.data("gridcolor");
-
+ var gridcolor = diagram.data("gridcolor") || "#81664B";
+
var series = {
hour: {label: "hour", res: "60", start: "hour", end: "now"},
day: {label: "day", res: "300", start: "day", end: "now"},
@@ -238,10 +237,10 @@
grid: {
show: true,
aboveData: false,
- color: gridcolor || "#81664B",
+ color: gridcolor,
backgroundColor: "black",
- tickColor: gridcolor || "#81664B",
- borderColor: gridcolor || "#81664B"//,
+ tickColor: gridcolor ,
+ borderColor: gridcolor,
//axisMargin: 0,
//labelMargin: 0
}
@@ -277,10 +276,6 @@
}
}
-
-
-
return false;
-
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:44:02
|
Revision: 491
http://openautomation.svn.sourceforge.net/openautomation/?rev=491&view=rev
Author: mayerch
Date: 2011-10-31 17:43:56 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Alter ChangeLog to show release 0.6.0-RC2
Modified Paths:
--------------
CometVisu/branches/release_0.6.0-RC2/ChangeLog
CometVisu/trunk/ChangeLog
Modified: CometVisu/branches/release_0.6.0-RC2/ChangeLog
===================================================================
--- CometVisu/branches/release_0.6.0-RC2/ChangeLog 2011-10-31 17:40:03 UTC (rev 490)
+++ CometVisu/branches/release_0.6.0-RC2/ChangeLog 2011-10-31 17:43:56 UTC (rev 491)
@@ -1,5 +1,5 @@
-HEAD
-====
+0.6.0-RC2
+=========
- New Feature: Show version in status bar
- New Feature: toogle-widget (switch toggling multiple values based on mapping)
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-10-31 17:40:03 UTC (rev 490)
+++ CometVisu/trunk/ChangeLog 2011-10-31 17:43:56 UTC (rev 491)
@@ -1,6 +1,11 @@
HEAD
====
+-
+
+0.6.0-RC2
+=========
+
- New Feature: Show version in status bar
- New Feature: toogle-widget (switch toggling multiple values based on mapping)
- New Feature: jqclock - a clock widget with statusbar-support
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:40:09
|
Revision: 490
http://openautomation.svn.sourceforge.net/openautomation/?rev=490&view=rev
Author: mayerch
Date: 2011-10-31 17:40:03 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
New release: 0.6.0-RC2
Modified Paths:
--------------
CometVisu/branches/release_0.6.0-RC2/visu/visu_config.xml
CometVisu/branches/release_0.6.0-RC2/visu/visu_config_demo.xml
Modified: CometVisu/branches/release_0.6.0-RC2/visu/visu_config.xml
===================================================================
--- CometVisu/branches/release_0.6.0-RC2/visu/visu_config.xml 2011-10-31 17:39:03 UTC (rev 489)
+++ CometVisu/branches/release_0.6.0-RC2/visu/visu_config.xml 2011-10-31 17:40:03 UTC (rev 490)
@@ -21,7 +21,7 @@
]]></status>
<status type="html"><![CDATA[
- <a href="check_config.php">Check Config</a>
- <div style="float:right;padding-right:0.5em">Version: SVN</div>
+ <div style="float:right;padding-right:0.5em">Version: 0.6.0-RC2</div>
]]></status>
</statusbar>
</meta>
Modified: CometVisu/branches/release_0.6.0-RC2/visu/visu_config_demo.xml
===================================================================
--- CometVisu/branches/release_0.6.0-RC2/visu/visu_config_demo.xml 2011-10-31 17:39:03 UTC (rev 489)
+++ CometVisu/branches/release_0.6.0-RC2/visu/visu_config_demo.xml 2011-10-31 17:40:03 UTC (rev 490)
@@ -56,7 +56,7 @@
]]></status>
<status type="html"><![CDATA[
- <a href="check_config.php">Check Config</a>
- <div style="float:right;padding-right:0.5em">Version: SVN</div>
+ <div style="float:right;padding-right:0.5em">Version: 0.6.0-RC2</div>
]]></status>
</statusbar>
</meta>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:39:09
|
Revision: 489
http://openautomation.svn.sourceforge.net/openautomation/?rev=489&view=rev
Author: mayerch
Date: 2011-10-31 17:39:03 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Creating release branch 0.6.0-RC2
Added Paths:
-----------
CometVisu/branches/release_0.6.0-RC2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:27:59
|
Revision: 488
http://openautomation.svn.sourceforge.net/openautomation/?rev=488&view=rev
Author: mayerch
Date: 2011-10-31 17:27:53 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Update with the latest commit logs
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-10-31 17:07:05 UTC (rev 487)
+++ CometVisu/trunk/ChangeLog 2011-10-31 17:27:53 UTC (rev 488)
@@ -1,6 +1,29 @@
HEAD
====
+- New Feature: Show version in status bar
+- New Feature: toogle-widget (switch toggling multiple values based on mapping)
+- New Feature: jqclock - a clock widget with statusbar-support
+- infotrigger widget:
+ - Show infoposition and format attribute in the editor
+ - New Feature: also send absolute value change
+- Add some missing links for DPT sub-types (incomplete; see Artifact 3424149)
+- Feature Request #3113716: "Addresses should be shown"
+- Fix Bug #3423019 and rendering problem in discreet_slim design
+- Fix Bug #3424149
+- Fix Bug #3370929: "Missing text in top line"
+- Fix Bug #3204682: "Caching on web server"
+- Fix Bug #3427309: "GA list unsorted in editor (transform_knx, get_adreesses)"
+- Fix Usability: add a button movement "animation" to the triggers so that a
+ user has immediate feedback
+- Whitespace clean up (DON'T USE TABS IN THE CODE!)
+
+Config changes:
+- As the infotrigger can send absolute values now and the distinguishing of the
+ addesses for the relative mode based on the readonly attribute was unusual,
+ the new version is using the variant attribute of the address element now.
+ This will break backward compatability!
+
0.6.0-RC1
=========
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 17:07:12
|
Revision: 487
http://openautomation.svn.sourceforge.net/openautomation/?rev=487&view=rev
Author: mayerch
Date: 2011-10-31 17:07:05 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Useability fix: add a button movement "animation" to the triggers so that a user has immediate feedback
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-10-31 13:33:40 UTC (rev 486)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-10-31 17:07:05 UTC (rev 487)
@@ -591,7 +591,11 @@
'type' : 'trigger',
'align' : $p.attr('align'),
'sendValue': value
- } ).bind( 'click', this.action );
+ } ).bind( 'click', this.action ).bind( 'mousedown', function(){
+ $(this).removeClass('switchUnpressed').addClass('switchPressed');
+ } ).bind( 'mouseup mouseout', function(){ // not perfect but simple
+ $(this).removeClass('switchPressed').addClass('switchUnpressed');
+ } );
ret_val.append( label ).append( $actor );
return ret_val;
},
@@ -746,7 +750,11 @@
'min' : parseFloat($p.attr('min')) || 0,
'max' : parseFloat($p.attr('max')) || 255,
'type' : 'switch'
- } ).bind( 'click', this.action );
+ } ).bind( 'click', this.action ).bind( 'mousedown', function(){
+ $(this).removeClass('switchUnpressed').addClass('switchPressed');
+ } ).bind( 'mouseup mouseout', function(){ // not perfect but simple
+ $(this).removeClass('switchPressed').addClass('switchUnpressed');
+ } );
var actorup = '<div class="actor switchUnpressed '
if ( $p.attr( 'align' ) )
@@ -764,7 +772,11 @@
'min' : parseFloat($p.attr('min')) || 0,
'max' : parseFloat($p.attr('max')) || 255,
'type' : 'switch'
- } ).bind( 'click', this.action );
+ } ).bind( 'click', this.action ).bind( 'mousedown', function(){
+ $(this).removeClass('switchUnpressed').addClass('switchPressed');
+ } ).bind( 'mouseup mouseout', function(){ // not perfect but simple
+ $(this).removeClass('switchPressed').addClass('switchUnpressed');
+ } );
var actorinfo = '<div class="actor switchInvisible" ';
if ( $p.attr( 'align' ) )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 13:33:46
|
Revision: 486
http://openautomation.svn.sourceforge.net/openautomation/?rev=486&view=rev
Author: mayerch
Date: 2011-10-31 13:33:40 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Fix for bug tracker ID: 3427309 "GA list unsorted in editor (transform_knx, get_adreesses)"
At least for the GA addresses. The KNX-Transforms are already sortet on my system...
Modified Paths:
--------------
CometVisu/trunk/visu/edit/cometeditor.js
Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js 2011-10-31 13:01:06 UTC (rev 485)
+++ CometVisu/trunk/visu/edit/cometeditor.js 2011-10-31 13:33:40 UTC (rev 486)
@@ -11,6 +11,21 @@
dataType: "json",
success: function(data) {
Editor.cache[variable] = data;
+ switch( variable )
+ {
+ case 'addresses':
+ // Sort list of addresses in each HG/MG
+ for( var hg in Editor.cache.addresses )
+ {
+ for( var mg in Editor.cache.addresses[hg] )
+ {
+ Editor.cache.addresses[hg][mg].sort( function(a,b){
+ return a.address.split('/')[2] - b.address.split('/')[2];
+ });
+ }
+ }
+ break;
+ }
},
error: function(xhr, textStatus, e) {
Editor.cache[variable] = false;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 13:01:15
|
Revision: 485
http://openautomation.svn.sourceforge.net/openautomation/?rev=485&view=rev
Author: mayerch
Date: 2011-10-31 13:01:06 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Freature request ID: 3113716 "Addresses should be shown"
Modified Paths:
--------------
CometVisu/trunk/visu/edit/cometeditor.js
Modified: CometVisu/trunk/visu/edit/cometeditor.js
===================================================================
--- CometVisu/trunk/visu/edit/cometeditor.js 2011-10-31 12:37:33 UTC (rev 484)
+++ CometVisu/trunk/visu/edit/cometeditor.js 2011-10-31 13:01:06 UTC (rev 485)
@@ -553,7 +553,7 @@
element.find("optgroup:last")
.append($("<option />").attr("value", address.address)
.addClass("dpt_DPT:" + address.dpt)
- .html(address.name)
+ .html(address.address + ': ' + address.name)
)
});
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 12:37:39
|
Revision: 484
http://openautomation.svn.sourceforge.net/openautomation/?rev=484&view=rev
Author: mayerch
Date: 2011-10-31 12:37:33 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
"Bug"-Fix for ID: 3204682 "Caching on web server"
This isn't a real fix for the problem as that's part of the web browser, but it helps to avoid the problems on the client, e.g. when the config file has changed but the browser doesn't even ask the server about it...
Modified Paths:
--------------
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2011-10-31 11:13:23 UTC (rev 483)
+++ CometVisu/trunk/visu/lib/templateengine.js 2011-10-31 12:37:33 UTC (rev 484)
@@ -64,6 +64,12 @@
forceReload = $.getUrlVar('forceReload') != 'false'; // true unless set to false
}
+// "Bug"-Fix for ID: 3204682 "Caching on web server"
+// This isn't a real fix for the problem as that's part of the web browser, but
+// it helps to avoid the problems on the client, e.g. when the config file
+// has changed but the browser doesn't even ask the server about it...
+forceReload = true;
+
// Disable features that aren't ready yet
// This can be overwritten in the URL with the parameter "maturity"
var use_maturity;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-31 11:13:29
|
Revision: 483
http://openautomation.svn.sourceforge.net/openautomation/?rev=483&view=rev
Author: mayerch
Date: 2011-10-31 11:13:23 +0000 (Mon, 31 Oct 2011)
Log Message:
-----------
Fix for Bug ID: 3370929 "Missing text in top line"
Modified Paths:
--------------
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2011-10-30 21:22:54 UTC (rev 482)
+++ CometVisu/trunk/visu/lib/templateengine.js 2011-10-31 11:13:23 UTC (rev 483)
@@ -282,6 +282,8 @@
if ($.getUrlVar('startpage')) {
scrollToPage( $.getUrlVar('startpage'), 0 );
+ } else {
+ scrollToPage( '0', 0 ); // simple solution to show page name on top at start
}
$('.fast').bind('click', function(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <j-...@us...> - 2011-10-30 21:23:01
|
Revision: 482
http://openautomation.svn.sourceforge.net/openautomation/?rev=482&view=rev
Author: j-n-k
Date: 2011-10-30 21:22:54 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Add color-attributes for diagram grid and line. Color is #RRGGBB (FR #3353575)
Modified Paths:
--------------
CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
CometVisu/tags/post_0.6.0/visu/visu_config.xsd
Modified: CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js 2011-10-30 14:10:53 UTC (rev 481)
+++ CometVisu/tags/post_0.6.0/visu/plugins/diagram/structure_plugin.js 2011-10-30 21:22:54 UTC (rev 482)
@@ -55,6 +55,8 @@
diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
diagram.data("label", page.textContent);
diagram.data("refresh", $p.attr("refresh"));
+ diagram.data("linecolor", $p.attr("linecolor") || "");
+ diagram.data("gridcolor", $p.attr("gridcolor") || "");
refreshDiagram(diagram, {});
@@ -68,7 +70,9 @@
series: {type: "list", required: false, list: {hour: "hours", day: "days", week: "weeks", month: "months", year: "years"}},
period: {type: "numeric", required: false},
datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
- refresh: {type: "numeric", required: false}
+ refresh: {type: "numeric", required: false},
+ linecolor: {type: "string", required: false},
+ gridcolor: {type: "string", required: false}
},
content: {type: "string", required: true}
});
@@ -107,6 +111,8 @@
diagram.data("datasource", $p.attr("datasource") || "AVERAGE");
diagram.data("label", page.textContent);
diagram.data("refresh", $p.attr("refresh"));
+ diagram.data("linecolor", $p.attr("linecolor") || "");
+ diagram.data("gridcolor", $p.attr("gridcolor") || "");
var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
@@ -173,6 +179,8 @@
datasource: {type: "list", required: false, list: {'MIN': "Min", 'AVERAGE': "Avg", 'MAX': "Max"}},
refresh: {type: "numeric", required: false},
tooltip: {type: "list", required: false, list: {'true': "yes", 'false': "no"}},
+ linecolor: {type: "string", required: false},
+ gridcolor: {type: "string", required: false}
},
content: {type: "string", required: true}
});
@@ -201,7 +209,9 @@
var refresh = diagram.data("refresh");
var datasource = diagram.data("datasource") || "AVERAGE";
var period = diagram.data("period") || 1;
-
+ var linecolor = diagram.data("linecolor") || diagramColors.data;
+ var gridcolor = diagram.data("gridcolor");
+
var series = {
hour: {label: "hour", res: "60", start: "hour", end: "now"},
day: {label: "day", res: "300", start: "day", end: "now"},
@@ -228,10 +238,10 @@
grid: {
show: true,
aboveData: false,
- color: "#81664B",
+ color: gridcolor || "#81664B",
backgroundColor: "black",
- tickColor: "#81664B",
- borderColor: "#81664B"//,
+ tickColor: gridcolor || "#81664B",
+ borderColor: gridcolor || "#81664B"//,
//axisMargin: 0,
//labelMargin: 0
}
@@ -247,7 +257,7 @@
dataType: "json",
type: "GET",
success: function(data) {
- var color = diagramColors.data || options.grid.color;
+ var color = linecolor || options.grid.color;
var offset = new Date().getTimezoneOffset() * 60 * 1000;
//TODO: find a better way
for (var j = 0; j < data.length; j++) {
Modified: CometVisu/tags/post_0.6.0/visu/visu_config.xsd
===================================================================
--- CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-10-30 14:10:53 UTC (rev 481)
+++ CometVisu/tags/post_0.6.0/visu/visu_config.xsd 2011-10-30 21:22:54 UTC (rev 482)
@@ -367,6 +367,8 @@
<xsd:attribute name="refresh" type="xsd:integer" use="optional" />
<xsd:attribute name="period" type="xsd:string" use="optional" />
<xsd:attribute name="datasource" type="xsd:string" use="optional" />
+ <xsd:attribute name="linecolor" type="xsd:string" use="optional" />
+ <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
@@ -381,6 +383,8 @@
<xsd:attribute name="period" type="xsd:string" use="optional" />
<xsd:attribute name="datasource" type="xsd:string" use="optional" />
<xsd:attribute name="tooltip" type="xsd:string" use="optional" />
+ <xsd:attribute name="linecolor" type="xsd:string" use="optional" />
+ <xsd:attribute name="gridcolor" type="xsd:string" use="optional" />
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2011-10-30 14:10:59
|
Revision: 481
http://openautomation.svn.sourceforge.net/openautomation/?rev=481&view=rev
Author: mayerch
Date: 2011-10-30 14:10:53 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
Change infotrigger to use variant=absolute or relative in the addresses to determine where a delta value should be sent to and which is the info address when used in the relative mode.
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2011-10-30 11:50:17 UTC (rev 480)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2011-10-30 14:10:53 UTC (rev 481)
@@ -715,16 +715,14 @@
// handle addresses
var address = {};
- var addrread = {};
$p.find('address').each( function(){
var src = this.textContent;
var transform = this.getAttribute('transform');
- var readonly = this.getAttribute('readonly');
- ga_list.push( src )
- if (readonly=='true') {
- addrread[ '_' + src ] = [ transform, readonly=='true' ];
- } else {
- address[ '_' + src ] = [ transform, readonly=='true' ];
+ var readonly = this.getAttribute('readonly' ) == 'true' ;
+ var relative = this.getAttribute('variant' ) == 'relative';
+ address[ '_' + src ] = [ transform, readonly, relative ];
+ if( !relative ) { // no need to listen to relative address
+ ga_list.push( src );
};
});
@@ -773,13 +771,17 @@
actorinfo += 'style="text-align: '+$p.attr( 'align' )+'" ';
actorinfo += '" ><div class="value">-</div></div>';
var $actorinfo = $(actorinfo).data({
- 'address' : addrread,
+ 'address' : address,
'format' : $p.attr('format'),
'mapping' : $p.attr('mapping'),
'styling' : $p.attr('styling'),
'align' : $p.attr('align'),
});
- for( var addr in addrread ) $actorinfo.bind( addr, this.update );
+ for( var addr in address )
+ {
+ if( !address[addr][2] ) // if NOT relative
+ $actorinfo.bind( addr, this.update );
+ }
if ( $p.attr('infoposition' )==1 ) {
buttons.append( $actordown );
@@ -806,18 +808,19 @@
},
action: function() {
var data = $(this).data();
- var value = parseFloat($(this).parent().find('.switchInvisible').data('basicvalue'));
- var absoluteValue = value + parseFloat(data.value);
+ var value = data.value;
+ var relative = ( data.change != 'absolute' );
+ if( !relative )
+ {
+ value = parseFloat($(this).parent().find('.switchInvisible').data('basicvalue'));
+ value = value + parseFloat(data.value);
+ if (value < data.min || data.max < value) return; // check min/max
+ }
for( var addr in data.address )
{
if( data.address[addr][1] == true ) continue; // skip read only
- if( data.change == 'absolute' )
- {
- if (absoluteValue < data.min || data.max < absoluteValue) continue; // check min/max
- visu.write( addr.substr(1), transformEncode( data.address[addr][0], absoluteValue ) );
- } else {
- visu.write( addr.substr(1), transformEncode( data.address[addr][0], data.value ) );
- }
+ if( data.address[addr][2] != relative ) continue; // skip when address mode doesn't fit action mode
+ visu.write( addr.substr(1), transformEncode( data.address[addr][0], value ) );
}
},
attributes: {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
2 messages has been excluded from this view by a project administrator.
