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...> - 2010-12-12 13:09:35
|
Revision: 205
http://openautomation.svn.sourceforge.net/openautomation/?rev=205&view=rev
Author: mayerch
Date: 2010-12-12 13:09:28 +0000 (Sun, 12 Dec 2010)
Log Message:
-----------
Changed defaul config to (nearly) empty file, so that the user can easily create his own.
But also create a new demo config (based on the existing one) to show the user all available widgets and give an example of how to use them.
Also use the recently introduced status bar feature to link them together.
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xml
Added Paths:
-----------
CometVisu/trunk/visu/visu_config_demo.xml
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2010-12-12 12:00:34 UTC (rev 204)
+++ CometVisu/trunk/visu/visu_config.xml 2010-12-12 13:09:28 UTC (rev 205)
@@ -1,156 +1,31 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<pages design="pure"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="visu_config.xsd">
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" design="pure" xsi:noNamespaceSchemaLocation="visu_config.xsd">
<meta>
<plugins>
- <plugin name="colorchooser" />
</plugins>
<mappings>
- <mapping name="OpenClose">
- <entry value="0">zu</entry>
- <entry value="1">offen</entry>
- </mapping>
- <mapping name="OnOff">
- <entry value="0">Aus</entry>
- <entry value="1">An</entry>
- </mapping>
- <mapping name="Sign">
- <entry range_min="-1e99" range_max="0">Negativ</entry>
- <entry value="0">Null</entry>
- <entry range_min="0" range_max="1e99">Positiv</entry>
- </mapping>
</mappings>
<stylings>
- <styling name="RedGreen">
- <entry value="0">red</entry>
- <entry value="1">green</entry>
- </styling>
- <styling name="GreenRed">
- <entry value="0">green</entry>
- <entry value="1">red</entry>
- </styling>
- <styling name="BluePurpleRed">
- <entry range_min="-100" range_max="0" >blue</entry>
- <entry value="0" >purple</entry>
- <entry range_min="0" range_max="100">red</entry>
- </styling>
</stylings>
<statusbar>
- <status type="html">
- <![CDATA[
+ <status type="html"><![CDATA[
<img src="icon/comet_64_ff8000.png" alt="CometVisu" /> by <a href="http://www.cometvisu.org/">CometVisu.org</a>
- <a href=".">Reload</a>
- ]]>
- </status>
- <status type="html" condition="!edit">
- <![CDATA[
+ - <a href="?config=demo">Widget Demo</a>
+ ]]></status>
+ <status type="html" condition="!edit"><![CDATA[
- <a href="edit_config.html">Edit</a>
- ]]>
- </status>
- <status type="html" condition="edit">
- <![CDATA[
+ ]]></status>
+ <status type="html" condition="edit"><![CDATA[
- <a href=".">normal Mode</a>
- ]]>
- </status>
- <status type="html">
- <![CDATA[
+ ]]></status>
+ <status type="html"><![CDATA[
- <a href="check_config.php">Check Config</a>
- ]]>
- </status>
+ ]]></status>
</statusbar>
</meta>
- <page name="Übersicht" flavour="orange">
- <text align="center">Willkommen bei der CometVisu!</text>
- <toggle address="1/0/2" datatype="1.001" response_address="1/0/2" mapping="OnOff" styling="RedGreen" >Terrase Licht</toggle>
- <trigger address="1/0/2" datatype="1.001" value="0" mapping="OnOff">Terrase Licht 0</trigger>
- <trigger address="1/0/2" datatype="1.001" value="1" mapping="OnOff">Terrase Licht 1</trigger>
- <trigger address="2/2/5" datatype="5.001" value="0" >Rolladen Licht 0</trigger>
- <trigger address="2/2/5" datatype="5.001" value="100" >Rolladen Licht 100</trigger>
- <switch address="1/0/50" datatype="1.001" response_address="1/4/50" mapping="OnOff">Schalt Schiebetüre Licht</switch>
- <break />
- <dim address="1/2/51" datatype="5.010" response_address="1/3/51" response_datatype="5.010">Dim Esstisch</dim>
- <shade address="2/4/5" datatype="5.001">Rollladen links</shade>
- <slide address="12/4/250" datatype="9" min="-18" max="26">Slide</slide>
- <info address="12/4/250" datatype="9" styling="BluePurpleRed">Slide Info</info>
- <info address="12/4/250" datatype="9" styling="BluePurpleRed" mapping="Sign">Slide Info</info>
- <designtoggle>Change design</designtoggle>
- <colorchooser address_r="1/2/59" address_g="1/2/60" address_b="1/2/61" datatype="5.001">A colorChooser</colorchooser>
- <info address="1/2/59" datatype="5.001" >R</info>
- <info address="1/2/60" datatype="5.001" >G</info>
- <info address="1/2/61" datatype="5.001" >B</info>
+ <page name="Overview">
<line />
- <image src="icon/comet_128_ff8000.png" >Ein Bild</image>
- <image src="icon/comet_128_ff8000.png" />
- <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" >Update every 10 sec</image>
- <break />
- <image src="http://www.yr.no/place/Germany/Bavaria/Holzkirchen~2899676/meteogram.png" refresh="1800" />
- <line />
- <page name="iframe Test">
- <iframe src="http://www.cometvisu.org" width="500px" height="500px"></iframe>
- </page>
- <info address="1/0/41" datatype="1.000" mapping="OnOff">Treppenlicht</info>
- <page name="Fenster Kontakte" flavour="blue">
- <info address="4/3/10" datatype="1" mapping="OpenClose" styling="GreenRed">Bad EG Reed Fenster</info>
- <info address="4/3/20" datatype="1.001" mapping="OpenClose" styling="GreenRed">WC Reed Fenster</info>
- <info address="4/3/30" datatype="1" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster links</info>
- <info address="4/3/31" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster rechts</info>
- <info address="4/3/32" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Tuere</info>
- <info address="4/3/40" datatype="1.001" mapping="OpenClose" styling="GreenRed">Kueche Reed Fenster</info>
- <info address="4/3/50" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Essen</info>
- <info address="4/3/51" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Schiebetuere</info>
- <info address="4/3/52" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Mitte</info>
- <info address="4/3/53" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere links</info>
- <info address="4/3/54" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere rechts</info>
- <info address="4/3/70" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele EG Reed Tuere</info>
- <info address="4/3/71" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele EG Reed Riegel</info>
- <info address="4/3/110" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele UG Reed Tuere</info>
- <info address="4/3/111" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele UG Reed Riegel</info>
- <info address="4/3/120" datatype="1.001" mapping="OpenClose" styling="GreenRed">Bad UG Reed Fenster</info>
- <info address="4/3/130" datatype="1.001" mapping="OpenClose" styling="GreenRed">Hobby1 Reed Fenster</info>
- <info address="4/3/140" datatype="1.001" mapping="OpenClose">Hobby2 Reed Fenster</info>
- <info address="4/3/200" datatype="1.001" mapping="OnOff">Klingel</info>
- <info address="4/3/210" datatype="1.001">Lueftung Filter</info>
- <info address="4/3/250" datatype="1.001" mapping="OnOff">Rauchmelder</info>
- </page>
- <page name="Temperaturen" flavour="red">
- <info address="4/0/10" datatype="9.001" pre="ca. " post=" °C">Bad EG Boden Temperatur</info>
- <info address="4/0/11" datatype="9.001" pre="ca. " post=" °C">Bad EG Luft Temperatur</info>
- <info address="4/0/15" datatype="9.001" pre="ca. " post=" °C">Bad EG Dusche Temperatur</info>
- <info address="4/2/10" datatype="5.001" post=" %">Bad EG Luftfeuchte</info>
- <info address="4/0/20" datatype="9.001" pre="ca. " post=" °C">WC Temperatur</info>
- <info address="4/0/30" datatype="9.001" pre="ca. " post=" °C">Schlafzimmer Temperatur</info>
- <info address="4/0/50" datatype="9.001" pre="ca. " post=" °C">Wohnzimmer Temperatur</info>
- <info address="4/0/60" datatype="9.001" pre="ca. " post=" °C">Diele EG Temperatur</info>
- <info address="4/0/110" datatype="9.001" pre="ca. " post=" °C">Diele UG Temperatur</info>
- <info address="4/0/120" datatype="9.001" pre="ca. " post=" °C">Bad UG Boden Temperatur</info>
- <info address="4/0/121" datatype="9.001" pre="ca. " post=" °C">Bad UG Luft Temperatur</info>
- <info address="4/2/120" datatype="5.001" post=" %">Bad UG Luftfeuchte</info>
- <info address="4/0/130" datatype="9.001" pre="ca. " post=" °C">Hobby 1 Temperatur</info>
- <info address="4/0/140" datatype="9.001" pre="ca. " post=" °C">Hobby 2 Temperatur</info>
- <line />
- <info address="4/0/0" datatype="9.001" pre="ca. " post=" °C">Außen Temperatur</info>
- <info address="4/2/0" datatype="5.001" post=" %">Außen Luftfeuchte</info>
- <info address="4/0/200" datatype="9.001" pre="ca. " post=" °C">HK Vorlauf Temperatur</info>
- <info address="4/0/201" datatype="9.001" pre="ca. " post=" °C">HK Rücklauf Temperatur</info>
- <info address="4/0/204" datatype="9.001" pre="ca. " post=" °C">Zirkulation Temperatur</info>
- <info address="4/0/202" datatype="9.001" pre="ca. " post=" °C">Warmwasser Temperatur</info>
- <info address="4/0/203" datatype="9.001" pre="ca. " post=" °C">Kaltwasser Temperatur</info>
- <info address="4/0/205" datatype="9.001" pre="ca. " post=" °C">Warmwasser UG Temperatur</info>
- </page>
- <page name="Rollläden" flavour="green">
- <shade address="2/4/0" datatype="5.001">Rollladen Bad</shade>
- <shade address="2/4/1" datatype="5.001">Rollladen Schlafen Fenster</shade>
- <shade address="2/4/2" datatype="5.001">Rollladen Schlafen Türe</shade>
- <shade address="2/4/3" datatype="5.001">Rollladen Küche</shade>
- <shade address="2/4/4" datatype="5.001">Rollladen Seitentüre</shade>
- <shade address="2/4/5" datatype="5.001">Rollladen PSK Türe</shade>
- <shade address="2/4/6" datatype="5.001">Rollladen Zwischentüre</shade>
- <shade address="2/4/7" datatype="5.001">Rollladen Doppeltüre</shade>
- <line />
- <shade address="2/4/8" datatype="5.001">Rollladen Hobby 1</shade>
- <shade address="2/4/9" datatype="5.001">Rollladen Hobby 2</shade>
- </page>
+ <text align="center">Welcome to the CometVisu!</text>
</page>
</pages>
Added: CometVisu/trunk/visu/visu_config_demo.xml
===================================================================
--- CometVisu/trunk/visu/visu_config_demo.xml (rev 0)
+++ CometVisu/trunk/visu/visu_config_demo.xml 2010-12-12 13:09:28 UTC (rev 205)
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" design="pure" xsi:noNamespaceSchemaLocation="visu_config.xsd">
+ <meta>
+ <plugins>
+ <plugin name="colorchooser"/>
+ <plugin name="diagram"/>
+ </plugins>
+ <mappings>
+ <mapping name="OpenClose">
+ <entry value="0">zu</entry>
+ <entry value="1">offen</entry>
+ </mapping>
+ <mapping name="OnOff">
+ <entry value="0">Aus</entry>
+ <entry value="1">An</entry>
+ </mapping>
+ <mapping name="Sign">
+ <entry range_min="-1e99" range_max="0">Negativ</entry>
+ <entry value="0">Null</entry>
+ <entry range_min="0" range_max="1e99">Positiv</entry>
+ </mapping>
+ </mappings>
+ <stylings>
+ <styling name="RedGreen">
+ <entry value="0">red</entry>
+ <entry value="1">green</entry>
+ </styling>
+ <styling name="GreenRed">
+ <entry value="0">green</entry>
+ <entry value="1">red</entry>
+ </styling>
+ <styling name="BluePurpleRed">
+ <entry range_min="-100" range_max="0">blue</entry>
+ <entry value="0">purple</entry>
+ <entry range_min="0" range_max="100">red</entry>
+ </styling>
+ </stylings>
+ <statusbar>
+ <status type="html"><![CDATA[
+ <img src="icon/comet_64_ff8000.png" alt="CometVisu" /> by <a href="http://www.cometvisu.org/">CometVisu.org</a>
+ - <a href=".">Reload</a>
+ ]]></status>
+ <status type="html" condition="!edit"><![CDATA[
+ - <a href="edit_config.html">Edit</a>
+ ]]></status>
+ <status type="html" condition="edit"><![CDATA[
+ - <a href=".">normal Mode</a>
+ ]]></status>
+ <status type="html"><![CDATA[
+ - <a href="check_config.php">Check Config</a>
+ ]]></status>
+ </statusbar>
+ </meta>
+ <page name="Übersicht">
+ <text align="center">Willkommen bei der CometVisu!</text>
+ <toggle address="1/0/2" datatype="1.001" response_address="1/0/2" mapping="OnOff" styling="RedGreen">Terrase Licht</toggle>
+ <trigger address="1/0/2" datatype="1.001" value="0" mapping="OnOff">Terrase Licht 0</trigger>
+ <trigger address="1/0/2" datatype="1.001" value="1" mapping="OnOff">Terrase Licht 1</trigger>
+ <trigger address="2/2/5" datatype="5.001" value="0">Rolladen Licht 0</trigger>
+ <trigger address="2/2/5" datatype="5.001" value="100">Rolladen Licht 100</trigger>
+ <switch address="1/0/50" datatype="1.001" response_address="1/4/50" mapping="OnOff">Schalt Schiebetüre Licht</switch>
+ <break/>
+ <dim address="1/2/51" datatype="5.010" response_address="1/3/51" response_datatype="5.010">Dim Esstisch</dim>
+ <shade address="2/4/5" datatype="5.001">Rollladen links</shade>
+ <slide address="12/4/250" datatype="9" min="-18" max="26">Slide</slide>
+ <info address="12/4/250" datatype="9" styling="BluePurpleRed">Slide Info</info>
+ <info address="12/4/250" datatype="9" styling="BluePurpleRed" mapping="Sign">Slide Info</info>
+ <designtoggle>Change design</designtoggle>
+ <colorchooser address_r="1/2/59" address_g="1/2/60" address_b="1/2/61" datatype="5.001">A colorChooser</colorchooser>
+ <info address="1/2/59" datatype="5.001">R</info>
+ <info address="1/2/60" datatype="5.001">G</info>
+ <info address="1/2/61" datatype="5.001">B</info>
+ <slide address="1/2/59" datatype="5.001">R</slide>
+ <line/>
+ <image src="icon/comet_128_ff8000.png">Ein Bild</image>
+ <image src="icon/comet_128_ff8000.png"/>
+ <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">Update every 10 sec</image>
+ <break/>
+ <image src="http://www.yr.no/place/Germany/Bavaria/Holzkirchen~2899676/meteogram.png" refresh="1800"/>
+ <line/>
+ <page name="iframe Test">
+ <iframe src="http://www.cometvisu.org" width="500px" height="500px"/>
+ </page>
+ <info address="1/0/41" datatype="1.000" mapping="OnOff">Treppenlicht</info>
+ <page name="Fenster Kontakte">
+ <info address="4/3/10" datatype="1" mapping="OpenClose" styling="GreenRed">Bad EG Reed Fenster</info>
+ <info address="4/3/20" datatype="1.001" mapping="OpenClose" styling="GreenRed">WC Reed Fenster</info>
+ <info address="4/3/30" datatype="1" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster links</info>
+ <info address="4/3/31" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Fenster rechts</info>
+ <info address="4/3/32" datatype="1.001" mapping="OpenClose" styling="GreenRed">Schlafen Reed Tuere</info>
+ <info address="4/3/40" datatype="1.001" mapping="OpenClose" styling="GreenRed">Kueche Reed Fenster</info>
+ <info address="4/3/50" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Essen</info>
+ <info address="4/3/51" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Schiebetuere</info>
+ <info address="4/3/52" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Tuere Mitte</info>
+ <info address="4/3/53" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere links</info>
+ <info address="4/3/54" datatype="1.001" mapping="OpenClose" styling="GreenRed">Wohnzimmer Reed Doppeltuere rechts</info>
+ <info address="4/3/70" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele EG Reed Tuere</info>
+ <info address="4/3/71" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele EG Reed Riegel</info>
+ <info address="4/3/110" datatype="1.001" mapping="OpenClose" styling="GreenRed">Diele UG Reed Tuere</info>
+ <info address="4/3/111" datatype="1.001" pre="!" mapping="OpenClose" styling="GreenRed">Diele UG Reed Riegel</info>
+ <info address="4/3/120" datatype="1.001" mapping="OpenClose" styling="GreenRed">Bad UG Reed Fenster</info>
+ <info address="4/3/130" datatype="1.001" mapping="OpenClose" styling="GreenRed">Hobby1 Reed Fenster</info>
+ <info address="4/3/140" datatype="1.001" mapping="OpenClose">Hobby2 Reed Fenster</info>
+ <info address="4/3/200" datatype="1.001" mapping="OnOff">Klingel</info>
+ <info address="4/3/210" datatype="1.001">Lueftung Filter</info>
+ <info address="4/3/250" datatype="1.001" mapping="OnOff">Rauchmelder</info>
+ </page>
+ <page name="Temperaturen">
+ <info address="4/0/10" datatype="9.001" pre="ca. " post=" °C">Bad EG Boden Temperatur</info>
+ <info address="4/0/11" datatype="9.001" pre="ca. " post=" °C">Bad EG Luft Temperatur</info>
+ <info address="4/0/15" datatype="9.001" pre="ca. " post=" °C">Bad EG Dusche Temperatur</info>
+ <info address="4/2/10" datatype="5.001" post=" %">Bad EG Luftfeuchte</info>
+ <info address="4/0/20" datatype="9.001" pre="ca. " post=" °C">WC Temperatur</info>
+ <info address="4/0/30" datatype="9.001" pre="ca. " post=" °C">Schlafzimmer Temperatur</info>
+ <info address="4/0/50" datatype="9.001" pre="ca. " post=" °C">Wohnzimmer Temperatur</info>
+ <info address="4/0/60" datatype="9.001" pre="ca. " post=" °C">Diele EG Temperatur</info>
+ <info address="4/0/110" datatype="9.001" pre="ca. " post=" °C">Diele UG Temperatur</info>
+ <info address="4/0/120" datatype="9.001" pre="ca. " post=" °C">Bad UG Boden Temperatur</info>
+ <info address="4/0/121" datatype="9.001" pre="ca. " post=" °C">Bad UG Luft Temperatur</info>
+ <info address="4/2/120" datatype="5.001" post=" %">Bad UG Luftfeuchte</info>
+ <info address="4/0/130" datatype="9.001" pre="ca. " post=" °C">Hobby 1 Temperatur</info>
+ <info address="4/0/140" datatype="9.001" pre="ca. " post=" °C">Hobby 2 Temperatur</info>
+ <line/>
+ <info address="4/0/0" datatype="9.001" pre="ca. " post=" °C">Außen Temperatur</info>
+ <info address="4/2/0" datatype="5.001" post=" %">Außen Luftfeuchte</info>
+ <info address="4/0/200" datatype="9.001" pre="ca. " post=" °C">HK Vorlauf Temperatur</info>
+ <info address="4/0/201" datatype="9.001" pre="ca. " post=" °C">HK Rücklauf Temperatur</info>
+ <info address="4/0/204" datatype="9.001" pre="ca. " post=" °C">Zirkulation Temperatur</info>
+ <info address="4/0/202" datatype="9.001" pre="ca. " post=" °C">Warmwasser Temperatur</info>
+ <info address="4/0/203" datatype="9.001" pre="ca. " post=" °C">Kaltwasser Temperatur</info>
+ <info address="4/0/205" datatype="9.001" pre="ca. " post=" °C">Warmwasser UG Temperatur</info>
+ </page>
+ <page name="Rollläden">
+ <shade address="2/4/0" datatype="5.001">Rollladen Bad</shade>
+ <shade address="2/4/1" datatype="5.001">Rollladen Schlafen Fenster</shade>
+ <shade address="2/4/2" datatype="5.001">Rollladen Schlafen Türe</shade>
+ <shade address="2/4/3" datatype="5.001">Rollladen Küche</shade>
+ <shade address="2/4/4" datatype="5.001">Rollladen Seitentüre</shade>
+ <shade address="2/4/5" datatype="5.001">Rollladen PSK Türe</shade>
+ <shade address="2/4/6" datatype="5.001">Rollladen Zwischentüre</shade>
+ <shade address="2/4/7" datatype="5.001">Rollladen Doppeltüre</shade>
+ <line/>
+ <shade address="2/4/8" datatype="5.001">Rollladen Hobby 1</shade>
+ <shade address="2/4/9" datatype="5.001">Rollladen Hobby 2</shade>
+ </page>
+ <diagram_popup undefined="DALI Strom L1" rrd="200_DALI_Linie_1_Strom" unit="mA" series="day" refresh="300">DALI Strom L1</diagram_popup>
+ </page>
+</pages>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-12 12:00:40
|
Revision: 204
http://openautomation.svn.sourceforge.net/openautomation/?rev=204&view=rev
Author: mayerch
Date: 2010-12-12 12:00:34 +0000 (Sun, 12 Dec 2010)
Log Message:
-----------
Clean up a bit after the change to message passing updates - no need for "GA..." in the element classes any more
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-12 11:31:28 UTC (rev 203)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-12 12:00:34 UTC (rev 204)
@@ -115,7 +115,7 @@
ret_val.addClass( 'info' );
var label = '<div class="label">' + page.textContent + '</div>';
ga_list.push( $(page).attr('address') );
- var actor = '<div class="actor GA' + $(page).attr('address').split('/').join('_') + '">';
+ var actor = '<div class="actor">';
if( $(page).attr('pre') ) actor += '<div>' + $(page).attr('pre') + '</div>';
actor += '<div class="value">-</div>';
if( $(page).attr('post') ) actor += '<div>' + $(page).attr('post') + '</div>';
@@ -149,7 +149,7 @@
ret_val.addClass( 'dim' );
var label = '<div class="label">' + page.textContent + '</div>';
ga_list.push( $(page).attr('address') );
- var actor = $('<div class="actor GA' + $(page).attr('address').split('/').join('_') + '" />');
+ var actor = $('<div class="actor">');
ret_val.append( label ).append( actor );
var min = parseFloat( $(page).attr('min') || 0 );
var max = parseFloat( $(page).attr('max') || 100 );
@@ -197,7 +197,7 @@
var label = '<div class="label">' + page.textContent + '</div>';
var response_address = $(page).attr('response_address');
ga_list.push( response_address );
- var actor = '<div class="actor GA' + response_address.split('/').join('_') + ' switchUnpressed">';
+ var actor = '<div class="actor switchUnpressed">';
if( $(page).attr('pre') ) actor += $(page).attr('pre');
actor += '<div class="value">-</div>';
if( $(page).attr('post') ) actor += $(page).attr('post');
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-12 11:31:28 UTC (rev 203)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-12 12:00:34 UTC (rev 204)
@@ -27,9 +27,9 @@
var label = '<div class="label">' + page.textContent + '</div>';
var actor = '<div class="actor">';
actor += '</div>';
- var a_r = $(page).attr('address_r');
- var a_g = $(page).attr('address_g');
- var a_b = $(page).attr('address_b');
+ var a_r = $(page).attr('address_r'); ga_list.push( a_r );
+ var a_g = $(page).attr('address_g'); ga_list.push( a_g );
+ var a_b = $(page).attr('address_b'); ga_list.push( a_b );
var datatype = $(page).attr('datatype');
ret_val.append(label)
.append($(actor)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-12 11:31:34
|
Revision: 203
http://openautomation.svn.sourceforge.net/openautomation/?rev=203&view=rev
Author: mayerch
Date: 2010-12-12 11:31:28 +0000 (Sun, 12 Dec 2010)
Log Message:
-----------
Fixed a bug that resulted in an error and no diagram beeing shown when
$("<span class='link'><a href='#' /></a>").find("a").css("color")
didn't return a color. Just fall back to the grid color then...
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-11 23:58:22 UTC (rev 202)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-12 11:31:28 UTC (rev 203)
@@ -184,7 +184,8 @@
dataType: "json",
type: "GET",
success: function(data) {
- $.plot(diagram, [{color: diagramColors.data, data: data}], options);
+ var color = diagramColors.data || options.grid.color;
+ $.plot(diagram, [{color: color, data: data}], options);
}
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 23:58:28
|
Revision: 202
http://openautomation.svn.sourceforge.net/openautomation/?rev=202&view=rev
Author: mayerch
Date: 2010-12-11 23:58:22 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Updated to the new message passing / event infrastructure. This allows the colorChooser to be remote controlled - and correctly initialized.
Note: do to rounding problems the colors might drift to a stable value.
This is a known problem and will be fixed by the move to transfer functions instad of datatypes.
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
Modified: CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-11 23:03:44 UTC (rev 201)
+++ CometVisu/trunk/visu/plugins/colorchooser/structure_plugin.js 2010-12-11 23:58:22 UTC (rev 202)
@@ -27,27 +27,64 @@
var label = '<div class="label">' + page.textContent + '</div>';
var actor = '<div class="actor">';
actor += '</div>';
+ var a_r = $(page).attr('address_r');
+ var a_g = $(page).attr('address_g');
+ var a_b = $(page).attr('address_b');
+ var datatype = $(page).attr('datatype');
ret_val.append(label)
.append($(actor)
.data({
- 'mapping' : $(page).attr('mapping'),
- 'styling' : $(page).attr('styling'),
- 'type' : 'toggle'
+ //'mapping' : $(page).attr('mapping'),
+ //'styling' : $(page).attr('styling'),
+ 'datatype': datatype, //jQuery(page).attr('datatype'), // use jQuery as '$' dosn't work here?!?
+ 'value_r' : 0,
+ 'value_g' : 0,
+ 'value_b' : 0,
+ 'type' : 'colorChooser'
})
.farbtastic( function(color){
var r = parseInt(color.substring(1, 3), 16) * 100 / 255;
var g = parseInt(color.substring(3, 5), 16) * 100 / 255;
var b = parseInt(color.substring(5, 7), 16) * 100 / 255;
- var a_r = $(page).attr('address_r');
- var a_g = $(page).attr('address_g');
- var a_b = $(page).attr('address_b');
- var datatype = $(page).attr('datatype');
visu.write( a_r, r, datatype );
visu.write( a_g, g, datatype );
visu.write( a_b, b, datatype );
- })) ;
+ })
+ .bind('_'+$(page).attr('address_r'), this.update_r )
+ .bind('_'+$(page).attr('address_g'), this.update_g )
+ .bind('_'+$(page).attr('address_b'), this.update_b ) );
return ret_val;
},
+ update_r: function(e,d) {
+ var element = $(this);
+ var value = decodeDPT( d, element.data('datatype') );
+ element.data( 'value_r', value );
+ function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
+ var color = toHex( element.data( 'value_r' )*255/100 )
+ + toHex( element.data( 'value_g' )*255/100 )
+ + toHex( element.data( 'value_b' )*255/100 );
+ jQuery.farbtastic( element ).setColor( '#' + color );
+ },
+ update_g: function(e,d) {
+ var element = $(this);
+ var value = decodeDPT( d, element.data('datatype') );
+ element.data( 'value_g', value );
+ function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
+ var color = toHex( element.data( 'value_r' )*255/100 )
+ + toHex( element.data( 'value_g' )*255/100 )
+ + toHex( element.data( 'value_b' )*255/100 );
+ jQuery.farbtastic( element ).setColor( '#' + color );
+ },
+ update_b: function(e,d) {
+ var element = $(this);
+ var value = decodeDPT( d, element.data('datatype') );
+ element.data( 'value_b', value );
+ function toHex( x ) { var r = parseInt( x ).toString(16); return r.length == 1 ? '0'+r : r; }
+ var color = toHex( element.data( 'value_r' )*255/100 )
+ + toHex( element.data( 'value_g' )*255/100 )
+ + toHex( element.data( 'value_b' )*255/100 );
+ jQuery.farbtastic( element ).setColor( '#' + color );
+ },
attributes: {
address_r: {type: "address", required: true},
address_g: {type: "address", required: true},
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-11 23:03:50
|
Revision: 201
http://openautomation.svn.sourceforge.net/openautomation/?rev=201&view=rev
Author: netzkind
Date: 2010-12-11 23:03:44 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
fixed bug with inline-diagrams
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-11 21:09:36 UTC (rev 200)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-11 23:03:44 UTC (rev 201)
@@ -45,10 +45,6 @@
diagram.css("height", $p.attr("height"));
}
- $("#" + id, actor).css({width: w, height: h});
-
- //$("#" + id, actor).css({paddingBottom: "1em"});
-
ret_val.append(label).append(actor);
diagram.data("id", id);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 21:09:42
|
Revision: 200
http://openautomation.svn.sourceforge.net/openautomation/?rev=200&view=rev
Author: mayerch
Date: 2010-12-11 21:09:36 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Fix a few broken parts (copyed from the discreet designs)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2010-12-11 20:50:29 UTC (rev 199)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2010-12-11 21:09:36 UTC (rev 200)
@@ -12,6 +12,7 @@
h1
{
font-size: 2em;
+ margin-left: 15px;
}
body hr
@@ -33,6 +34,7 @@
.nav_path
{
color: #ff8000;
+ margin-left: 15px;
}
.nav_path a
{
@@ -62,6 +64,13 @@
min-height: 2em;
}
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+ line-height: 2em;
+}
+
.widget .label
{
float:left;
@@ -207,7 +216,7 @@
float: left;
margin-left: 10px;
margin-left: 1em;
- margin-top: 0.2em;
+ margin-top: 0.5em;
border-color: #666 #fff #fff #666;
}
@@ -298,14 +307,4 @@
.clickable {
cursor: pointer;
-}
-
-.diagram_inline {
- width: 320px;
- height: 180px;
-}
-
-.diagram_preview {
- width: 320px;
- height: 2em;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 20:50:39
|
Revision: 199
http://openautomation.svn.sourceforge.net/openautomation/?rev=199&view=rev
Author: mayerch
Date: 2010-12-11 20:50:29 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Add the two new designs (discreet_sand and discreet_slim) to the custom design toggle
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_custom.js
Modified: CometVisu/trunk/visu/designs/structure_custom.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_custom.js 2010-12-11 15:41:08 UTC (rev 198)
+++ CometVisu/trunk/visu/designs/structure_custom.js 2010-12-11 20:50:29 UTC (rev 199)
@@ -57,7 +57,7 @@
'type' : 'toggle'
})
.bind('click', function() {
- var designs = [ 'pure', 'discreet' ];
+ var designs = [ 'pure', 'discreet', 'discreet_sand', 'discreet_slim' ];
var oldDesign = $('.value',this).text();
var newDesign = designs[ (designs.indexOf(oldDesign) + 1) % designs.length ];
$('.value',this).text(newDesign);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 15:41:14
|
Revision: 198
http://openautomation.svn.sourceforge.net/openautomation/?rev=198&view=rev
Author: mayerch
Date: 2010-12-11 15:41:08 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Change value update from class parsing to subscriber modell
(Tracker ID 3134594)
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-11 13:38:03 UTC (rev 197)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-11 15:41:08 UTC (rev 198)
@@ -125,9 +125,10 @@
'datatype': $(page).attr('datatype'),
'mapping' : $(page).attr('mapping'),
'styling' : $(page).attr('styling')
- } ) );
+ } ).bind('_'+$(page).attr('address'), this.update ) );
return ret_val;
},
+ update: defaultUpdate,
attributes: {
address: {type: "address", required: true},
datatype: {type: "datatype", required: true},
@@ -163,10 +164,16 @@
'max' : max,
'step' : step,
'type' : 'dim'
- }).slider({step:step,min:min,max:max, animate: true,start:slideStart,change:slideChange});//slide:slideAction});
-
+ }).bind('_'+$(page).attr('address'), this.update )
+ .slider({step:step,min:min,max:max, animate: true,start:slideStart,change:slideChange}/*slide:slideAction}*/);
return ret_val;
- },
+ },
+ update: function(e,d) {
+ var element = $(this);
+ var value = decodeDPT( d, element.data('datatype') );
+ element.data( 'value', value );
+ element.slider('value', value);
+ },
attributes: {
address: {type: "address", required: true},
datatype: {type: "datatype", required: true},
@@ -201,9 +208,16 @@
'mapping' : $(page).attr('mapping'),
'styling' : $(page).attr('styling'),
'type' : 'toggle'
- } ).bind('click',switchAction) );
+ } ).bind('click',switchAction)
+ .bind('_'+$(page).attr('address'), this.update ) );
return ret_val;
},
+ update: function(e,d) {
+ var element = $(this);
+ var value = defaultUpdate( e, d, element );
+ element.removeClass( value == '0' ? 'switchPressed' : 'switchUnpressed' );
+ element.addClass( value == '0' ? 'switchUnpressed' : 'switchPressed' );
+ },
attributes: {
address: {type: "address", required: true},
datatype: {type: "datatype", required: true},
@@ -513,4 +527,37 @@
}
return { x: 0, y: 0 }; // sanity return
+}
+
+
+function defaultUpdate( e, data, passedElement )
+{
+ var element = passedElement || $(this);
+ var value = decodeDPT( data, element.data('datatype') );
+ element.data( 'value', value );
+ element.find('.value').text( map( value, element ) );
+
+ var styling = element.data('styling');
+ if( styling && stylings[styling] && (stylings[styling][value] || stylings[styling]['range']) )
+ {
+ if( stylings[styling]['range'] ) value = parseFloat( value );
+ element.removeClass();
+ if( stylings[styling][value] )
+ {
+ element.addClass( 'actor ' + stylings[styling][value] );
+ } else {
+ var range = stylings[styling]['range'];
+ var not_found = true;
+ for( var min in range )
+ {
+ if( min > value ) continue;
+ if( range[min][0] < value ) continue; // check max
+ element.addClass( 'actor ' + range[min][1] );
+ not_found = false;
+ break;
+ }
+ if( not_found ) element.addClass( 'actor' );
+ }
+ }
+ return value;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-11 13:38:03 UTC (rev 197)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-11 15:41:08 UTC (rev 198)
@@ -30,48 +30,7 @@
{
for( key in json )
{
- var GA = 'GA' + key.split('/').join('_');
- var elements = $( '.' + GA );
- for( i = 0; i < elements.length; i++ )
- {
- var element = $( elements[i] );
- var value = decodeDPT( json[key], element.data('datatype') );
- element.data( 'value', value );
- $('.value', element).text( map( value, element ) );
-
- var styling = element.data('styling');
- if( styling && stylings[styling] && (stylings[styling][value] || stylings[styling]['range']) )
- {
- if( stylings[styling]['range'] ) value = parseFloat( value );
- element.removeClass();
- if( stylings[styling][value] )
- {
- element.addClass( 'actor ' + GA + ' ' + stylings[styling][value] );
- } else {
- var range = stylings[styling]['range'];
- var not_found = true;
- for( var min in range )
- {
- if( min > value ) continue;
- if( range[min][0] < value ) continue; // check max
- element.addClass( 'actor ' + GA + ' ' + range[min][1] );
- not_found = false;
- break;
- }
- if( not_found ) element.addClass( 'actor ' + GA );
- }
- }
- switch( element.data( 'type' ) )
- {
- case 'toggle':
- element.removeClass( value == '0' ? 'switchPressed' : 'switchUnpressed' );
- element.addClass( value == '0' ? 'switchUnpressed' : 'switchPressed' );
- break;
- case 'slide':
- case 'dim':
- element.slider( 'value', value ); // only update when necessary
- }
- }
+ $.event.trigger( '_' + key, json[key] );
}
}
visu.user = 'demo_user'; // example for setting a user
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-11 13:38:13
|
Revision: 197
http://openautomation.svn.sourceforge.net/openautomation/?rev=197&view=rev
Author: netzkind
Date: 2010-12-11 13:38:03 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
two new designs (discreet_sand, discreet_slim), diagrams now read some colors from CSS
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/edit/style_edit.css
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Added Paths:
-----------
CometVisu/trunk/visu/designs/discreet/images/head_bg.png
CometVisu/trunk/visu/designs/discreet_sand/
CometVisu/trunk/visu/designs/discreet_sand/basic.css
CometVisu/trunk/visu/designs/discreet_sand/fonts/
CometVisu/trunk/visu/designs/discreet_sand/fonts/AUTHORS
CometVisu/trunk/visu/designs/discreet_sand/fonts/COPYING
CometVisu/trunk/visu/designs/discreet_sand/fonts/ChangeLog
CometVisu/trunk/visu/designs/discreet_sand/fonts/License.txt
CometVisu/trunk/visu/designs/discreet_sand/fonts/README
CometVisu/trunk/visu/designs/discreet_sand/fonts/TODO
CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-bold.ttf
CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-regular.ttf
CometVisu/trunk/visu/designs/discreet_sand/images/
CometVisu/trunk/visu/designs/discreet_sand/images/button_bg.png
CometVisu/trunk/visu/designs/discreet_sand/images/dot_green.png
CometVisu/trunk/visu/designs/discreet_sand/images/dot_red.png
CometVisu/trunk/visu/designs/discreet_sand/images/gradient.png
CometVisu/trunk/visu/designs/discreet_sand/images/hr_bg.png
CometVisu/trunk/visu/designs/discreet_sand/images/nav_bg.png
CometVisu/trunk/visu/designs/discreet_sand/mobile.css
CometVisu/trunk/visu/designs/discreet_slim/
CometVisu/trunk/visu/designs/discreet_slim/basic.css
CometVisu/trunk/visu/designs/discreet_slim/fonts/
CometVisu/trunk/visu/designs/discreet_slim/fonts/AUTHORS
CometVisu/trunk/visu/designs/discreet_slim/fonts/COPYING
CometVisu/trunk/visu/designs/discreet_slim/fonts/ChangeLog
CometVisu/trunk/visu/designs/discreet_slim/fonts/License.txt
CometVisu/trunk/visu/designs/discreet_slim/fonts/README
CometVisu/trunk/visu/designs/discreet_slim/fonts/TODO
CometVisu/trunk/visu/designs/discreet_slim/fonts/liberationsans-bold.ttf
CometVisu/trunk/visu/designs/discreet_slim/fonts/liberationsans-regular.ttf
CometVisu/trunk/visu/designs/discreet_slim/images/
CometVisu/trunk/visu/designs/discreet_slim/images/button_bg.png
CometVisu/trunk/visu/designs/discreet_slim/images/dot_green.png
CometVisu/trunk/visu/designs/discreet_slim/images/dot_red.png
CometVisu/trunk/visu/designs/discreet_slim/images/gradient.png
CometVisu/trunk/visu/designs/discreet_slim/images/head_bg.png
CometVisu/trunk/visu/designs/discreet_slim/images/hr_bg.png
CometVisu/trunk/visu/designs/discreet_slim/mobile.css
Removed Paths:
-------------
CometVisu/trunk/visu/designs/discreet/images/body_bg.png
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-12-11 10:47:33 UTC (rev 196)
+++ CometVisu/trunk/ChangeLog 2010-12-11 13:38:03 UTC (rev 197)
@@ -6,6 +6,8 @@
Config changes:
The format of the config file has changed. Please update the existing file to:
- ...
+- New Design: "discreet_sand": dark text, light background
+- New Design: "discreet_slim": more widgets per line for bigger screens
0.5.2
=====
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2010-12-11 10:47:33 UTC (rev 196)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2010-12-11 13:38:03 UTC (rev 197)
@@ -8,13 +8,13 @@
font-size: 5.5mm;
overflow: hidden;
margin:0;
- background: #1d1d1d url(images/body_bg.png) repeat-x;
+ background: #1d1d1d; /* url(images/body_bg.png) repeat-x; */
}
h1
{
font-size: 2em;
- margin-left: 15px;
+ padding-left: 15px;
}
body hr
@@ -41,9 +41,19 @@
}
div#top {
- margin-top: 8px;
+ padding-top: 8px;
+ border-top: 3px solid #1d1d1d;
+ border-bottom: 1px solid #0a0a0a;
+ background-color: #121212;
+ padding-bottom: 2px;
}
+.page h1 {
+ margin-top: 0;
+ padding-top: 1em;
+ background: #121212 url(images/head_bg.png) scroll repeat-x bottom;
+}
+
.nav_path
{
color: #81664b;
@@ -340,4 +350,14 @@
.clickable {
cursor: pointer;
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 240px;
+ height: 2em;
}
\ No newline at end of file
Deleted: CometVisu/trunk/visu/designs/discreet/images/body_bg.png
===================================================================
(Binary files differ)
Added: CometVisu/trunk/visu/designs/discreet/images/head_bg.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet/images/head_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,368 @@
+@font-face { font-family: Liberation; src:url(fonts/liberationsans.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
+
+body
+{
+ color: #453420; /*#2F2A20;*/
+ font-family: Arial, Liberation;
+ font-size: 5.5mm;
+ overflow: hidden;
+ margin:0;
+ background: #CFC8B5; /* url(images/body_bg.png) repeat-x; */
+}
+
+h1
+{
+ font-size: 2em;
+ padding-left: 15px;
+}
+
+body hr
+{
+ clear:both;
+ color: #7F735F;
+ background-color: #7F735F;
+ height: 1px;
+ border:none;
+ padding:0px;
+ margin:0.1em;
+}
+
+#pages hr {
+ border: 0; height: 30px; margin: 0 .5%;
+ background: transparent url(images/hr_bg.png) 50% repeat-x;
+ clear: both;
+}
+
+
+body br
+{
+ clear:both;
+}
+
+div#top {
+ padding-top: 8px;
+ border-top: 3px solid #BAAF98;
+ background: #165D7E url(images/nav_bg.png) bottom repeat-x;
+ padding-bottom: 8px;
+}
+
+.page h1 {
+ margin-top: 0;
+ padding-top: .1em;
+ background: #CFC8B5;
+ color: #2F2A20;
+ /*background: #7F735F url(images/head_bg.png) scroll repeat-x bottom;*/
+}
+
+.nav_path
+{
+ color: #EFEBE0; /*#81664b;*/
+ margin-left: 15px;
+}
+.nav_path a
+{
+ color: #EFEBE0; /*#3F3327;*/
+ text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+ color: #000000;
+ font-size: 0.9em;
+ vertical-align: middle;
+}
+
+.widget
+{
+ float:left;
+ width:48%;
+ margin: .2em;
+ padding: 0.3em;
+ /* border:yellow 1px solid; */
+ border-color: #7F735F;
+ border-style: solid;
+ border-width: 2px 0px 0px 2px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ min-height: 2em;
+ background-color: #BAAF98;
+}
+
+.text > div,
+.link > a {
+ float:left;
+ text-align:left;
+ padding-left: 1em;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+ line-height: 2em;
+}
+
+.widget .label
+{
+ float:left;
+ width:49%;
+/* color:red; */
+/* padding-right:0.25em; */
+ text-align:left;
+ padding-left: 1em;
+/* border:blue 1px solid; */
+}
+.widget .actor
+{
+ float:left;
+ margin-left:1em;
+ text-align:left;
+}
+.widget .actor div
+{
+ float:left;
+ white-space: pre-wrap;
+}
+
+
+.green.switchPressed div, .green.switchUnpressed div{
+ background: transparent url(images/dot_green.png) no-repeat center center;
+ color: #3F2F1F !important;
+}
+.red.switchPressed div, .red.switchUnpressed div{
+ background: transparent url(images/dot_red.png) no-repeat center center;
+ color: #3F2F1F !important;
+}
+
+
+.red
+{
+ color:#f44;
+ font-weight:bold;
+}
+
+.green
+{
+ color:#4f4;
+}
+
+.blue
+{
+ color:#44f;
+}
+
+.purple
+{
+ color:#f4f;
+}
+
+.link a
+{
+ color: #165d7e; /*#3F2F1F;*/
+ width: 49%;
+}
+
+.page
+{
+ float:left;
+ width: 900px;
+ overflow: auto;
+ position: relative;
+}
+
+.switchPressed, .switchUnpressed {
+ border-style: solid;
+ -moz-border-radius: 12px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
+ padding: 1px;
+ background: url(images/button_bg.png) #A79367 repeat-x;
+}
+
+.switchUnpressed
+{
+ border-width: 1px 2px 2px 1px;
+ border-color: #6C6251 #4F483B #4F483B #6C6251;
+ margin-top: 0px;
+ background-color: #EFE6D1;
+ background-position: center +2px;
+}
+.switchUnpressed div, .switchPressed div
+{
+ padding: 5px;
+ width: 5em;
+ float: left;
+ background: transparent;
+ text-align: center;
+ cursor: pointer;
+}
+
+.switchPressed
+{
+ border-width: 2px 1px 1px 2px;
+ border-color: #4F483B #6C6251 #6C6251 #4F483B;
+ margin-top: 1px;
+ background-position: center -2px;
+}
+
+.switchUnpressed div {
+ margin-left: -1px;
+}
+
+.switchPressed div {
+ margin-top: -1px;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+ width: 3em;
+}
+.widget .ui-slider
+{
+ width: 30%;
+ float: left;
+ margin-left: 10px;
+ margin-left: 1em;
+ margin-top: 0.5em;
+ border-color: #4F483B #6C6251 #6C6251 #4F483B;
+ background: url(images/gradient.png) #F8EFC6 repeat-y;
+}
+
+.widget .ui-slider-handle
+{
+ border-style: solid;
+ -moz-border-radius: 12px;
+ -webkit-border-radius: 12px;
+ border-radius: 12px;
+ padding: 1px;
+ background: url(images/button_bg.png) #A79367 repeat-x;
+ border-width: 1px 2px 2px 1px;
+ border-color: #6C6251 #4F483B #4F483B #6C6251;
+}
+/* Clearfix */
+.clearfix:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+
+.clearfix {
+ display: inline-block;
+}
+
+html[xmlns] .clearfix {
+ display: block;
+}
+
+*:first-child+html .clearfix {
+ min-height: 0;
+}
+
+* html .clearfix {
+ height: 1%;
+}
+
+* html>body .clearfix {
+ display: inline-block;
+ width: 100%;
+}
+
+* html .clearfix {
+ /* Hides from IE-mac \*/
+ height: 1%;
+ /* End hide from IE-mac */
+}
+
+.loading {
+ display: block !important;
+}
+
+div#loading {
+ display: none !important;
+}
+
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ border-color: #7F735F;
+ border-style: solid;
+ border-width: 2px 0px 0px 2px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ background: #BAAF98;
+ opacity: .98;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 320px;
+ height: 2em;
+}
+
+.tickLabel {
+ color: #453420;
+}
\ No newline at end of file
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/AUTHORS (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/AUTHORS 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,23 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+
+ - Caius 'kaio' Chance <caius.chance at gmail.com>
+ Project Owner
+ Red Hat, Inc.
+
+ - Denis Jacquerye <moyogo at gmail.com>
+ Project Contributor
+
+ - Herbert Duerr <duerr at sun.com>
+ Narrow Fonts Contributor
+ Oracle, Inc.
+
+Previous Contributors
+
+ - Steve Matteson
+ Original Designer (support period expired)
+ Ascender, Inc.
+
+ - Mark Webbink <mwebbink AT redhat.com>
+ Release coordinator, Red Hat Inc.
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/COPYING
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/COPYING (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/COPYING 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/ChangeLog
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/ChangeLog (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/ChangeLog 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,224 @@
+* Wed Jul 21 2010 Pravin Satpute <psa...@re...>
+- Update for New Release 1.06
+- Added New Family Narrow (Contribution from Herbert Duerr <her...@or...>)
+- updated version of fonts
+
+* Mon 10 May 2010 Caius 'kaio' Chance <me at kaio.net>
+- Fixed Romanian glyphs, U+021A, 021B, 0218, 0219, 0162, 0163, 015E, 015F,
+ 2010, 2011. (rhbz#440992)
+- Fixed height of arrows U+2190, 2192, 2194. (Issue #2)
+
+* Thu 06 May 2010 Caius 'kaio' Chance <me at kaio.net>
+- Cleaned up points and auto-instructed hinting of 'u', 'v', 'w', 'y'.
+(rhbz#463036)
+- Created the first project icon. (Issue #5)
+
+* Wed May 05 2010 Caius 'kaio' Chance <k at kaio.net>
+- Incorrect cent sign glyph (U+00A2) in Sans and Mono
+style in Liberation fonts. (rhbz#474522)
+
+* Wed 28 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
+- rhbz#510174: Corrected version number of all SFD files.
+- Corrected license exceptions to GPLv2.
+- Updated README file.
+
+* Tue 27 Apr 2010 Caius 'kaio' Chance <me at kaio.net>
+- Renamed Narrow Fonts.
+- Updated list of contributors.
+- Released version 1.05.3.
+
+* Thu 22 Apr 2010 Herbert Duerr <duerr at sun.com>
+- Contributed Liberation Sans Narrow Fonts.
+
+* Fri 12 Mar 2010 Caius 'kaio' Chance <me at kaio.me>
+- Migrated to Google Code.
+- Updated AUTHORS.
+- Upgraded license to GPLv3+exceptions.
+
+* Sun 27 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed ttf pack preparation error.
+
+* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed 'wrongly encoded glyphs after U+10000' (rhbz#525498),
+ provided by Denis Jacquerye <moyogo at gmail.com>.
+
+* Tue 21 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Fixed fontforge script sfd2ttf.pe.
+- Include traditional kern table for Sans and Serif.
+
+* Tue 14 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Generated TTFs with tradition kern table, with fontforge ver 20090408.
+- Added make target alias dist-src as dist-sfd.
+
+* Mon 13 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Updated for generation of traditional kern table via scripts.
+
+* Mon 06 Jul 2009 Caius 'kaio' Chance <me at kaio.me>
+- Reconverted SFDs from original TTFs with traditional kern table.
+- Updated "clean" target in Makefile.
+
+* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Reconverted SFDs from original TTFs with traditional kern table.
+- Updated "clean" target in Makefile.
+
+* Tue 30 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Generated cleaner SFD from original TTFs.
+- Include Makefile in sources tarball.
+
+* Wed 24 Jun 2009 Caius 'kaio' Chance <me at kaio.me>
+- Makefile: pack SFD files as source tarball.
+- Makefile: pack TTF files as ttf packs.
+- Tidy up repository.
+- Updated documents.
+
+* Mon 12 Jan 2009 Caius Chance <cchance at redhat.com>
+- Fixed copyright holder name typo for Sans Regular font (rhbz#479521).
+
+* Tue 09 Dec 2008 Caius Chance <cchance at redhat.com>
+- Changed cent sign glyph (U+00A2) to be coressed in Sans and Mono
+ (rhbz#474522).
+
+* Wed 03 Dec 2008 Caius Chance <cchance at redhat.com>
+- Started 1.04.93.devel.
+- Fixed blurriness of U+03BC for Sans Regular font (rhbz#473481).
+- Fixed src tarball mis-inclusion of dist files in Makefile.
+
+* Fri 28 Nov 2008 Caius Chance <cchance at redhat.com>
+- Corrected version number in Makefile.
+- Fixed make target of source tarball.
+- Uploaded 1.04.92 source tarball to release area.
+
+* Wed 15 Oct 2008 Caius Chance <cchance at redhat.com>
+- Fixed blurred 'u' and 'W' for Sans Bold font (rhbz#463036).
+- Released as version 1.04.92
+
+* Wed 17 Sep 2008 Caius Chance <cchance at redhat.com>
+- Fixed missing hinting instructions for all Mono fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Sans fonts (rhbz#460090).
+- Fixed missing hinting instructions for all Serif fonts (rhbz#460090).
+- Released as version 1.04.91
+
+* Tue 09 Sep 2008 Caius Chance <cchance at redhat.com>
+- Backed up all released files in ./dist directory.
+
+* Fri 05 Sep 2008 Caius Chance <cchance at redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+ Mono Bold Italic (up to U+2012) (rhbz#460090).
+
+* Mon 25 Aug 2008 Caius Chance <cchance at redhat.com>
+- Fixed incorrect glyph points and missing hinting instructions for:
+ U+0079, U+03BC, U+0431, U+2010..2012, U+1114117 (rhbz#458592).
+- Released as version 1.04.90.
+
+* Thu 13 Jul 2008 Caius Chance <cchance at redhat.com>
+- Released as version 1.04.
+
+* Thu 12 Jun 2008 Caius Chance <cchance at redhat.com>
+- Released as version 1.04.beta2 (1.03.99).
+- Added ZIP package building for non-tar users.
+- rhbz#440992:
+ - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on all fonts.
+ - Fixed "T/s with cedilla below" (U+0162/0163) on all fonts.
+ - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on all fonts.
+
+* Wed 11 Jun 2008 Caius Chance <cchance at redhat.com>
+- Added last Version 1.03 from original manufacturer.
+- Renamed directory 'archive' to 'sandbox'.
+- Added directory description in hosting home directory.
+- Created ZIP packages for Version 1.03 and 1.04.beta.
+
+* Tue 04 Jun 2008 Caius Chance <cchance at redhat.com>
+- rhbz#440992:
+ - Created "Hyphen" and "Non-Breaking Hyphen" (U+2010..2011) on Sans Regular.
+
+* Mon 03 Jun 2008 Caius Chance <cchance at redhat.com>
+- rhbz#440992:
+ - Created Romanian "T/t/S/s with comma below" (U+0218..021B) on Sans Regular.
+ - Fixed "T/s with cedilla below" (U+0162/0163) on Sans Regular.
+
+* Fri 30 May 2008 Caius Chance <cchance at redhat.com>
+- Release Version 1.04.beta (liberation-fonts-1_04_beta).
+
+* Thu 29 May 2008 Caius Chance <cchance at redhat.com>
+- Correct SFD version numbers in "TTF Info" categor for correct version
+ number during export to TTFs.
+
+* Wed 28 May 2008 Caius Chance <cchance at redhat.com>
+- Reencoded with "Glyph Order" by FontForge.
+- Corrected font name for all Regular fonts.
+- Generated TTFs (experimantal, in "archive") with old stle kern and dummy
+ DSIG table.
+- Updated README in 1.04b TTFs (experimental, in "archive").
+
+* Tue 27 May 2008 Caius Chance <cchance at redhat.com>
+- Fixed Unicode name mis-mapping of Sans and Serif TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Sans and Serif TTF
+ files.
+
+* Mon 26 May 2008 Caius Chance <cchance at redhat.com>
+- Fixed Unicode name mis-mapping of Mono TTF files.
+- Regenerate SFD files from Unicode name mis-mapping fixed Mono TTF files.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+ <nicolas_spalinger sil org>:
+ - We-need-versioned-tarballs.
+ - Add-ignore-file-so-the-VCS-does-not-track-the-folder.
+ - Adjust-path-for-various-Makefile-targets-subfolders.
+ - Fix-versionning-mismatch-in-the-binary-font-metadata.
+ - Add-some-description-and-extra-lines-to-the-build-ta.
+ - Reword-and-restructure-maintainers-recommendations.
+ - Some-rewording-of-the-readme-file.
+==========
+
+* Thu May 22 2008 Caius Chance <cchance at redhat.com>
+- Added latest (1.03) TTF files from Ascender. (in 'archive')
+
+* Fri May 16 2008 Caius Chance <cchance at redhat.com>
+- Change source tree as 'trunk', 'tags', 'branches'.
+==========
+- Applied following patches submitted by Nicolas Spalinger
+ <nicolas_spalinger sil org>:
+ - Add-more-information-about-the-upstream-designer.
+ - Minor-typo-and-layout-fixes.
+ - Adjust-fontforge-path-with-env-as-a-source-build.
+==========
+
+* Wed May 14 2008 Caius Chance <cchance at redhat.com>
+- Renamed target 'ttf' to 'build'.
+- Removed 'Re-Package' chapter from README and refine contents.
+- Changed AUTHORS contents.
+- Created maintainer documentation MAINTAINER.
+
+* Tue May 06 2008 Caius Chance <cchance at redhat.com>
+- Refined clean target.
+- Removed TTFs from git.
+
+* Fri May 02 2008 Caius Chance <cchance at redhat.com>
+- Imported into fedorahosted.org repository and be hosted.
+ https://fedorahosted.org/liberation-fonts/
+- Modified source root directory name definition in Makefile.
+- Created 'dist' target for binary TTF tarball and 'src' for source tarball.
+- Corrected Regular fonts filenames.
+- Added TTF -> SFD make target.
+
+* Thu May 01 2008 Caius Chance <cchance at redhat.com>
+- Converted previous TTF files into SFD files to be open source.
+- Created fontforge SFD -> TTF scripts.
+- Created Makefile.
+- Added documentations: AUTHORS, ChangeLog, README.
+
+* Thu Apr 10 2008 Caius Chance <cchance at redhat.com>
+- Fixed exchanged and incomplete glyphs (from Ascender).
+- Repacked source tarball.
+- Released version 1.03.
+
+* Tue Mar 25 2008 Caius Chance <cchance at redhat.com>
+- Fixed alignment mismatch of dot accents (from Ascender).
+- Released version 1.02.
+
+* Mon Jan 14 2008 Caius Chance <cchance at redhat.com>
+- Updated new source tarball from Ascender.
+- Released version 1.0.
+
+* Thu Jun 14 2007 Caius Chance <cchance at redhat.com>
+- Updated new source tarball from Ascender.
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/License.txt
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/License.txt (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/License.txt 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,19 @@
+LICENSE AGREEMENT AND LIMITED PRODUCT WARRANTY
+LIBERATION FONT SOFTWARE
+
+This agreement governs the use of the Software and any updates to the Software, regardless of the delivery mechanism. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to the user ("Client") a license to this work pursuant to the GNU General Public License v.2 with the exceptions set forth below and such other terms as are set forth in this End User License Agreement.
+
+ 1. The Software and License Exception. LIBERATION font software (the "Software") consists of TrueType-OpenType formatted font software for rendering LIBERATION typefaces in sans-serif, serif, and monospaced character styles. You are licensed to use, modify, copy, and distribute the Software pursuant to the GNU General Public License v.2 with the following exceptions:
+
+ (a) As a special exception, if you create a document which uses this font, and embed this font or unaltered portions of this font into the document, this font does not by itself cause the resulting document to be covered by the GNU General Public License. This exception does not however invalidate any other reasons why the document might be covered by the GNU General Public License. If you modify this font, you may extend this exception to your version of the font, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version.
+
+ (b) As a further exception, any distribution of the object code of the Software in a physical product must provide you the right to access and modify the source code for the Software and to reinstall that modified version of the Software in object code form on the same physical product on which you received it.
+
+ 2. Intellectual Property Rights. The Software and each of its components, including the source code, documentation, appearance, structure and organization are owned by Red Hat and others and are protected under copyright and other laws. Title to the Software and any component, or to any copy, modification, or merged portion shall remain with the aforementioned, subject to the applicable license. The "LIBERATION" trademark is a trademark of Red Hat, Inc. in the U.S. and other countries. This agreement does not permit Client to distribute modified versions of the Software using Red Hat's trademarks. If Client makes a redistribution of a modified version of the Software, then Client must modify the files names to remove any reference to the Red Hat trademarks and must not use the Red Hat trademarks in any way to reference or promote the modified Software.
+
+ 3. Limited Warranty. To the maximum extent permitted under applicable law, the Software is provided and licensed "as is" without warranty of any kind, expressed or implied, including the implied warranties of merchantability, non-infringement or fitness for a particular purpose. Red Hat does not warrant that the functions contained in the Software will meet Client's requirements or that the operation of the Software will be entirely error free or appear precisely as described in the accompanying documentation.
+
+ 4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential damages, including lost profits or lost savings arising out of the use or inability to use the Software, even if Red Hat or such dealer has been advised of the possibility of such damages.
+
+ 5. General. If any provision of this agreement is held to be unenforceable, that shall not affect the enforceability of the remaining provisions. This agreement shall be governed by the laws of the State of North Carolina and of the United States, without regard to any conflict of laws provisions, except that the United Nations Convention on the International Sale of Goods shall not apply.
+Copyright © 2007 Red Hat, Inc. All rights reserved. LIBERATION is a trademark of Red Hat, Inc.
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/README
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/README (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/README 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,82 @@
+ 1. What's this?
+ =================
+
+ The Liberation Fonts is font collection which aims to provide document
+ layout compatibility as usage of Times New Roman, Arial, Courier New.
+
+
+ 2. Requirements
+ =================
+
+ * fontforge is installed.
+ (http://fontforge.sourceforge.net)
+
+
+ 3. Install
+ ============
+
+ 3.1 Decompress tarball
+
+ You can extract the files by following command:
+
+ $ tar zxvf liberation-fonts-[VERSION].tar.gz
+
+ 3.2 Build from the source
+
+ Change into directory liberation-fonts-[VERSION]/ and build from sources by
+ following commands:
+
+ $ cd liberation-fonts-[VERSION]
+ $ make
+
+ The built font files will be available in 'build' directory.
+
+ 3.3 Install to system
+
+ For Fedora, you could manually install the fonts by copying the TTFs to
+ ~/.fonts for user wide usage, or to /usr/share/fonts/truetype/liberation
+ for system-wide availability. Then, run "fc-cache" to let that cached.
+
+ For other distributions, please check out corresponding documentation.
+
+
+ 4. Usage
+ ==========
+
+ Simply select preferred liberation font in applications and start using.
+
+
+ 5. License
+ ============
+
+ This font set had been released under GNU Public License version 2
+ ("GPLv2") with exceptions.
+
+ Please read file "COPYING" for GPLv2 license.
+
+ Please read file "License.txt" for details of exceptions.
+
+
+ 6. For Maintainers
+ ====================
+
+ Before packaging a new release based on a new source tarball, you have to
+ update the version suffix in the Makefile:
+
+ VER = [VERSION]
+
+ Make sure that the defined version corresponds to the font software metadata
+ which you can check with ftinfo/otfinfo or fontforge itself. It is highly
+ recommended that file 'ChangeLog' is updated to reflect changes.
+
+ Create a tarball with the following command:
+
+ $ make dist
+
+ The new versioned tarball will be available in the dist/ folder as
+ 'liberation-fonts-[NEW_VERSION].tar.gz'.
+
+ 7. Credits
+ ============
+
+ Please read file "AUTHORS" for list of contributors.
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/TODO
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/fonts/TODO (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/fonts/TODO 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,14 @@
+Here are todo for next release
+
+1) resolving bug related with hinting
+ - https://bugzilla.redhat.com/show_bug.cgi?id=606217
+ - https://bugzilla.redhat.com/show_bug.cgi?id=591556
+2) shape improvement
+ - https://bugzilla.redhat.com/show_bug.cgi?id=591559
+ - https://bugzilla.redhat.com/show_bug.cgi?id=487581
+3) Ascent Descent Values Improvement
+ - using absolute values instead of relative values in OS/2 table
+4) RFE: Add Greek Polytonic support to Liberation fonts
+ - need some volunteer to add these shapes
+ - https://bugzilla.redhat.com/show_bug.cgi?id=473842
+
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-bold.ttf
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-bold.ttf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-regular.ttf
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/fonts/liberationsans-regular.ttf
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/button_bg.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/button_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/dot_green.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/dot_green.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/dot_red.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/dot_red.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/gradient.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/gradient.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/hr_bg.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/hr_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/images/nav_bg.png
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/visu/designs/discreet_sand/images/nav_bg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/visu/designs/discreet_sand/mobile.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/mobile.css (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_sand/mobile.css 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,12 @@
+.widget
+{
+ width:98%;
+}
+
+#bottom {
+ display: none;
+}
+
+.page {
+ overflow: visible;
+}
Added: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,352 @@
+@font-face { font-family: Liberation; src:url(fonts/liberationsans-regular.ttf); }
+@font-face { font-family: Liberation; font-weight: bold; src:url(fonts/liberationsans-bold.ttf); }
+
+body
+{
+ color: white;
+ font-family: Liberation;
+ font-size: 5mm;
+ overflow: hidden;
+ margin:0;
+ background: #1d1d1d; /* url(images/body_bg.png) repeat-x; */
+}
+
+h1
+{
+ font-size: 2em;
+ padding-left: 15px;
+}
+
+body hr
+{
+ clear:both;
+ color: #81664b;
+ background-color: #81664b;
+ height: 1px;
+ border:none;
+ padding:0px;
+ margin:0.1em;
+}
+
+#pages hr {
+ border: 0; height: 4px; margin: 0px 1px 4px 1px;
+ background: transparent;
+ border-bottom: 1px solid #121212;
+ clear: both;
+}
+
+
+body br
+{
+ clear:both;
+}
+
+div#top {
+ padding-top: 8px;
+ border-top: 3px solid #1d1d1d;
+ border-bottom: 1px solid #0a0a0a;
+ background-color: #121212;
+ padding-bottom: 2px;
+}
+
+.page h1 {
+ margin-top: 0;
+ padding-top: 1em;
+ background: #121212 url(images/head_bg.png) scroll repeat-x bottom;
+}
+
+.nav_path
+{
+ color: #81664b;
+ margin-left: 15px;
+}
+.nav_path a
+{
+ color: white;
+ text-decoration:none;
+}
+
+.footer,
+.footer *
+{
+ color: #000000;
+ font-size: 0.9em;
+ vertical-align: middle;
+}
+
+.widget
+{
+ float:left;
+ width:32%;
+ margin: .1em;
+ padding: 0.15em;
+ /* border:yellow 1px solid; */
+ border-color: #020202;
+ border-style: solid;
+ border-width: 1px 0px 0px 1px;
+ min-height: 2em;
+ background-color: #101010;
+}
+
+.text > div,
+.link > a {
+ float:left;
+ text-align:left;
+ padding-left: 1em;
+}
+
+.widget .label,
+.widget.info .actor,
+.text > div,
+.link > a {
+ line-height: 2em;
+}
+
+.widget .label
+{
+ float:left;
+ width:49%;
+/* color:red; */
+/* padding-right:0.25em; */
+ text-align:left;
+ padding-left: 1em;
+/* border:blue 1px solid; */
+}
+.widget .actor
+{
+ float:left;
+ margin-left:1em;
+ text-align:left;
+}
+.widget .actor div
+{
+ float:left;
+ white-space: pre-wrap;
+}
+
+
+.green.switchPressed div, .green.switchUnpressed div{
+ background: transparent url(images/dot_green.png) no-repeat center center;
+ color: white !important;
+}
+.red.switchPressed div, .red.switchUnpressed div{
+ background: transparent url(images/dot_red.png) no-repeat center center;
+ color: white !important;
+}
+
+
+.red
+{
+ color:#f44;
+ font-weight:bold;
+}
+
+.green
+{
+ color:#4f4;
+}
+
+.blue
+{
+ color:#44f;
+}
+
+.purple
+{
+ color:#f4f;
+}
+
+.link a
+{
+ color: #81664b;
+ width: 49%;
+}
+
+.page
+{
+ float:left;
+ width: 900px;
+ overflow: auto;
+ position: relative;
+}
+
+.switchPressed, .switchUnpressed {
+ border-style: solid;
+ padding: 1px;
+ background: url(images/button_bg.png) #171717 repeat-x;
+}
+
+.switchUnpressed
+{
+ border-width: 1px 2px 2px 1px;
+ border-color: #282828 #010101 #010101 #282828;
+ margin-top: 0px;
+ background-color: #3A3A3A;
+ background-position: center +2px;
+}
+.switchUnpressed div, .switchPressed div
+{
+ padding: 5px;
+ width: 5em;
+ float: left;
+ background: transparent;
+ text-align: center;
+ cursor: pointer;
+}
+
+.switchPressed
+{
+ border-width: 2px 1px 1px 2px;
+ border-color: #010101 #282828 #282828 #010101;
+ margin-top: 1px;
+ background-position: center -2px;
+}
+
+.switchUnpressed div {
+ margin-left: -1px;
+}
+
+.switchPressed div {
+ margin-top: -1px;
+}
+
+.ui-slider { position: relative; text-align: left; }
+.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.6em; height: 1.6em; cursor: default; }
+.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
+
+.ui-slider-horizontal { height: .8em; }
+.ui-slider-horizontal .ui-slider-handle { top: -.5em; margin-left: -.8em; }
+.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; }
+.ui-slider-horizontal .ui-slider-range-min { left: 0; }
+.ui-slider-horizontal .ui-slider-range-max { right: 0; }
+
+.ui-slider-vertical { width: .8em; height: 100px; }
+.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
+.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
+.ui-slider-vertical .ui-slider-range-min { bottom: 0; }
+.ui-slider-vertical .ui-slider-range-max { top: 0; }
+.ui-widget-content { border: 1px solid #dddddd; background: #000 ; color: #000; }
+.ui-widget-content a { color: #333333; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #000 ; font-weight: bold; color: #1c94c4; }
+.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1c94c4; text-decoration: none; }
+.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; }
+
+.dim .actor
+{
+ width: 3em;
+}
+.widget .ui-slider
+{
+ width: 30%;
+ float: left;
+ margin-left: 10px;
+ margin-left: 1em;
+ margin-top: 0.5em;
+ border-color: #010101 #282828 #282828 #010101;
+ background: url(images/gradient.png) #a7a7a7 repeat-y;
+}
+
+.widget .ui-slider-handle
+{
+ border-style: solid;
+ padding: 1px;
+ background: url(images/button_bg.png) #171717 repeat-x;
+ border-width: 1px 2px 2px 1px;
+ border-color: #282828 #010101 #010101 #282828;
+}
+/* Clearfix */
+.clearfix:after {
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
+}
+
+.clearfix {
+ display: inline-block;
+}
+
+html[xmlns] .clearfix {
+ display: block;
+}
+
+*:first-child+html .clearfix {
+ min-height: 0;
+}
+
+* html .clearfix {
+ height: 1%;
+}
+
+* html>body .clearfix {
+ display: inline-block;
+ width: 100%;
+}
+
+* html .clearfix {
+ /* Hides from IE-mac \*/
+ height: 1%;
+ /* End hide from IE-mac */
+}
+
+.loading {
+ display: block !important;
+}
+
+div#loading {
+ display: none !important;
+}
+
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ border-color: #020202;
+ border-style: solid;
+ border-radius: 1px;
+ background: #101010;
+ opacity: .98;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
+}
+
+.diagram_inline {
+ width: 320px;
+ height: 180px;
+}
+
+.diagram_preview {
+ width: 100%;
+ height: 2em;
+}
\ No newline at end of file
Added: CometVisu/trunk/visu/designs/discreet_slim/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/fonts/AUTHORS (rev 0)
+++ CometVisu/trunk/visu/designs/discreet_slim/fonts/AUTHORS 2010-12-11 13:38:03 UTC (rev 197)
@@ -0,0 +1,23 @@
+AUTHORS
+
+Current Contributors (sorted alphabetically):
+
+ - Caius 'kaio' Chance <caius.chance at gmail.com>
+ Project Owner
+ Red Hat, Inc.
+
+ - Denis Jacquerye <moyogo at gmail.com>
+ Project Contributor
+
+ - Herbert Duerr <duerr at sun.com>
+ Narrow Fonts Contributor
+ Oracle, Inc.
+
+Previous Contributors
+
+ - Steve Matteson
+ Original Designer (support period expired)
+ Ascender, Inc.
+
+ - Mark Webbink <mwebbink AT redhat.com>
+ Release coordinator, Red Hat Inc.
Added: CometVisu/trunk/visu/designs/discreet_slim/fonts/COPYING
===...
[truncated message content] |
|
From: <ma...@us...> - 2010-12-11 10:47:39
|
Revision: 196
http://openautomation.svn.sourceforge.net/openautomation/?rev=196&view=rev
Author: mayerch
Date: 2010-12-11 10:47:33 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Start next development cycle
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-12-11 10:44:28 UTC (rev 195)
+++ CometVisu/trunk/ChangeLog 2010-12-11 10:47:33 UTC (rev 196)
@@ -1,3 +1,12 @@
+HEAD
+====
+
+- ...
+
+Config changes:
+The format of the config file has changed. Please update the existing file to:
+- ...
+
0.5.2
=====
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 10:44:34
|
Revision: 195
http://openautomation.svn.sourceforge.net/openautomation/?rev=195&view=rev
Author: mayerch
Date: 2010-12-11 10:44:28 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
CometVisu release 0.5.2
Added Paths:
-----------
CometVisu/branches/release_0.5.2/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 10:38:39
|
Revision: 194
http://openautomation.svn.sourceforge.net/openautomation/?rev=194&view=rev
Author: mayerch
Date: 2010-12-11 10:38:32 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Prepare release 0.5.2
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-12-11 09:26:44 UTC (rev 193)
+++ CometVisu/trunk/ChangeLog 2010-12-11 10:38:32 UTC (rev 194)
@@ -1,5 +1,5 @@
-HEAD
-====
+0.5.2
+=====
- New Feature: Plugins
- New Plugin: colorChooser (based on farbtastic)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-11 09:26:50
|
Revision: 193
http://openautomation.svn.sourceforge.net/openautomation/?rev=193&view=rev
Author: mayerch
Date: 2010-12-11 09:26:44 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
Fix bug that caused that only a single plugin could be loaded
Modified Paths:
--------------
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-10 21:33:36 UTC (rev 192)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-11 09:26:44 UTC (rev 193)
@@ -195,8 +195,6 @@
setup_page(xml);
}
}
- return false;
-
} );
// then the mappings
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-10 21:33:42
|
Revision: 192
http://openautomation.svn.sourceforge.net/openautomation/?rev=192&view=rev
Author: netzkind
Date: 2010-12-10 21:33:36 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
fixed https://sourceforge.net/tracker/?func=detail&aid=3128530&group_id=296426&atid=1251141
"Refresh in diagram doesn't work"
Modified Paths:
--------------
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-10 21:21:48 UTC (rev 191)
+++ CometVisu/trunk/visu/plugins/diagram/structure_plugin.js 2010-12-10 21:33:36 UTC (rev 192)
@@ -1,4 +1,4 @@
-/* structure_plugin.js (c) 2010 by Christian Mayer [CometVisu at ChristianMayer dot de]
+/* structure_plugin.js (c) 2010 by Julian Hartmann [julian dot hartmann at gmail dot com]
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -16,9 +16,8 @@
*/
/**
- * This is a custom function that extends the available widgets.
- * It's purpose is to change the design of the visu during runtime
- * to demonstrate all available
+ * This plugins integrates flot (diagrams in javascript) into the visualization.
+ * server-side data-storage is rrd
*/
$("body").append("<script type=\"text/javascript\" src=\"plugins/diagram/flot/jquery.flot.js\"></script>");
@@ -59,14 +58,8 @@
diagram.data("unit", $p.attr("unit") || "");
diagram.data("series", $p.attr("series") || "day");
diagram.data("label", page.textContent);
+ diagram.data("refresh", $p.attr("refresh"));
- if ($(page).attr("refresh")) {
- // reload regularly
- window.setInterval(function(actor) {
- $(diagram).triggerHandler("refresh.widget");
- }, $p.attr("refresh") * 1000, actor);
- }
-
refreshDiagram(diagram, {});
return ret_val;
@@ -117,14 +110,8 @@
diagram.data("unit", $p.attr("unit") || "");
diagram.data("series", $p.attr("series") || "day");
diagram.data("label", page.textContent);
+ diagram.data("refresh", $p.attr("refresh"));
- if ($(page).attr("refresh")) {
- // reload regularly
- window.setInterval(function(actor) {
- $(actor).triggerHandler("refresh.widget");
- }, $p.attr("refresh") * 1000, actor);
- }
-
var bDiagram = $("<div class=\"diagram\" id=\"" + id + "_big\"/>");
diagram.addClass("clickable");
@@ -154,11 +141,12 @@
function refreshDiagram(diagram, flotoptions, data) {
var diagram = $(diagram);
- var c = jQuery.extend(true, {series: diagram.data("series")}, data || {});
+ var config = jQuery.extend(true, {series: diagram.data("series")}, data || {});
var unit = diagram.data("unit");
var rrd = diagram.data("rrd");
var label = diagram.data("label");
+ var refresh = diagram.data("refresh");
var series = {
day: {label: "day", res: "300", start: "-1day", end: "now"},
@@ -194,18 +182,30 @@
},
flotoptions);
- var s = series[c.series];
+ var s = series[config.series];
- // init
- $.ajax({
- url: "/cgi-bin/rrdfetch?rrd=" + rrd + ".rrd&ds=AVERAGE&start=end" + s.start + "&end=" + s.end + "&res=" + s.res,
- dataType: "json",
- type: "GET",
- success: function(data) {
- $.plot(diagram, [{data: data}], options);
+ if (s) {
+ // init
+ $.ajax({
+ url: "/cgi-bin/rrdfetch?rrd=" + rrd + ".rrd&ds=AVERAGE&start=end" + s.start + "&end=" + s.end + "&res=" + s.res,
+ dataType: "json",
+ type: "GET",
+ success: function(data) {
+ $.plot(diagram, [{data: data}], options);
+ }
+ });
+
+ if (typeof (refresh) != "undefined" && refresh) {
+ // reload regularly
+ window.setTimeout(function(diagram, flotoptions, data) {
+ refreshDiagram(diagram, flotoptions, data)
+ }, refresh * 1000, diagram, flotoptions, data);
}
- });
+ }
+
+
+
return false;
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-10 21:21:54
|
Revision: 191
http://openautomation.svn.sourceforge.net/openautomation/?rev=191&view=rev
Author: mayerch
Date: 2010-12-10 21:21:48 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
sanity check
Modified Paths:
--------------
CometVisu/trunk/visu/lib/knx_decode.js
Modified: CometVisu/trunk/visu/lib/knx_decode.js
===================================================================
--- CometVisu/trunk/visu/lib/knx_decode.js 2010-12-10 20:44:49 UTC (rev 190)
+++ CometVisu/trunk/visu/lib/knx_decode.js 2010-12-10 21:21:48 UTC (rev 191)
@@ -32,6 +32,7 @@
function decodeDPT(hexstr,dpt)
{
if( null === dpt ) return hexstr;
+ if( undefined === dpt ) return hexstr;
var val;
var parts = dpt.split('.');
dpt = parseInt( parts[0] );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-10 20:44:55
|
Revision: 190
http://openautomation.svn.sourceforge.net/openautomation/?rev=190&view=rev
Author: netzkind
Date: 2010-12-10 20:44:49 +0000 (Fri, 10 Dec 2010)
Log Message:
-----------
- removed "unknown" from type-list in editor
- changed inclusion of plugins at runtime so they can be debugged with firebug et al.
Modified Paths:
--------------
CometVisu/trunk/visu/edit/visuconfig_edit.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js 2010-12-09 22:27:13 UTC (rev 189)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js 2010-12-10 20:44:49 UTC (rev 190)
@@ -100,6 +100,10 @@
var options = {};
$("#addMaster").find("select#add_type").empty();
jQuery.each(design.creators, function (index, e) {
+ if (index == "unknown") {
+ // "unknown" is not a good choice for a new widget :)
+ return;
+ }
$("#addMaster").find("select#add_type").append(
$("<option />").attr("value", index).html(index)
);
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-09 22:27:13 UTC (rev 189)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-10 20:44:49 UTC (rev 190)
@@ -101,7 +101,7 @@
$(document).ready(function() {
// get the data once the page was loaded
$.ajaxSetup({cache: false});
- window.setTimeout("$.get( 'visu_config" + configSuffix + ".xml', setup_page );", 200);
+ window.setTimeout("$.get( 'visu_config" + configSuffix + ".xml', parseXML );", 200);
// disable text selection - it's annoying on a touch screen!
if($.browser.mozilla)
@@ -161,8 +161,7 @@
}
$( window ).bind( 'resize', handleResize );
-function setup_page( xml )
-{
+function parseXML(xml) {
// erst mal den Cache für AJAX-Requests wieder aktivieren
$.ajaxSetup({cache: true});
@@ -171,9 +170,33 @@
$( 'head' ).append( '<link rel="stylesheet" type="text/css" href="designs/' + design + '/mobile.css" media="only screen and (max-device-width: 480px)" />' );
// start with the plugins
+ var pluginsToLoad = 0;
$( 'meta > plugins plugin', xml ).each( function(i){
+ pluginsToLoad += 1;
var name = $(this).attr('name');
- $( 'head' ).append( '<script src="plugins/' + name + '/structure_plugin.js" type="text/javascript"></script>' );
+ var html_doc = document.getElementsByTagName('body')[0];
+ js = document.createElement('script');
+ js.setAttribute('type', 'text/javascript');
+ js.setAttribute('src', 'plugins/' + name + '/structure_plugin.js');
+ html_doc.appendChild(js);
+
+ js.onreadystatechange = function () {
+ if (js.readyState == 'complete') {
+ pluginsToLoad -= 1;
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
+ }
+ }
+ }
+
+ js.onload = function () {
+ pluginsToLoad -= 1;
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
+ }
+ }
+ return false;
+
} );
// then the mappings
@@ -224,10 +247,19 @@
// adapt width for pages to show
handleResize();
+ if (pluginsToLoad <= 0) {
+ setup_page(xml);
+ }
+
+
+}
+
+function setup_page( xml )
+{
// and now setup the pages
var page = $( 'pages > page', xml )[0]; // only one page element allowed...
- create_pages( page, '0' );
+ create_pages(page, '0');
// setup the scrollable
main_scroll = $('#main').scrollable({keyboard: false, touch: false}).data('scrollable');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-09 22:27:19
|
Revision: 189
http://openautomation.svn.sourceforge.net/openautomation/?rev=189&view=rev
Author: makki1
Date: 2010-12-09 22:27:13 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
Fix DPT9/EIS5 encode-routine in pywiregate
Modified Paths:
--------------
PyWireGate/trunk/knx_connector/DPT_Types.py
Modified: PyWireGate/trunk/knx_connector/DPT_Types.py
===================================================================
--- PyWireGate/trunk/knx_connector/DPT_Types.py 2010-12-09 20:37:27 UTC (rev 188)
+++ PyWireGate/trunk/knx_connector/DPT_Types.py 2010-12-09 22:27:13 UTC (rev 189)
@@ -280,7 +280,7 @@
if val < 0:
sign = 0x8000
mant = val * 100
- while mant > 0x07ff:
+ while (mant > 2047) or (mant < -2048):
mant = mant >> 1
exp +=1
data = sign | (exp << 11) | (int(mant) & 0x07ff)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-09 20:37:33
|
Revision: 188
http://openautomation.svn.sourceforge.net/openautomation/?rev=188&view=rev
Author: mayerch
Date: 2010-12-09 20:37:27 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
Make Popup resizeable and allow it to be fixed to a position ({x:<>, y:<>[, w:<>, h:<>]} or an jQuery Object like $('.target')) with an optional alignment parameter
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-09 15:23:58 UTC (rev 187)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-09 20:37:27 UTC (rev 188)
@@ -342,7 +342,8 @@
this.addPopup('unknown', {
create: function( attributes ) {
- var ret_val = $('<div class="popup" /><div class=\"popup_background\" />');
+ var repositon = false;
+ var ret_val = $('<div class="popup" style="display:none"/><div class="popup_background" style="display:none" />').appendTo('body');
ret_val.addClass( this.type );
if (attributes.title) {
@@ -353,18 +354,59 @@
ret_val.filter(".popup").append( $('<div class="main" />').append(attributes.content));
}
+ if( attributes.width ) {
+ ret_val.width( attributes.width );
+ reposition = true;
+ }
+
+ if( attributes.height ) {
+ ret_val.height( attributes.height );
+ reposition = true;
+ }
+
+ var anchor = {x: -1, y: -1, w: 0, h: 0};
+ var align;
+ if( attributes.position )
+ {
+ if( attributes.position.offset )
+ {
+ var offset = attributes.position.offset();
+ anchor.x = offset.left;
+ anchor.y = offset.top;
+ anchor.w = attributes.position.width();
+ anchor.h = attributes.position.height();
+ } else {
+ if( attributes.position.hasOwnProperty('x') ) anchor.x = attributes.position.x;
+ if( attributes.position.hasOwnProperty('y') ) anchor.y = attributes.position.y;
+ if( attributes.position.hasOwnProperty('w') ) anchor.w = attributes.position.w;
+ if( attributes.position.hasOwnProperty('h') ) anchor.h = attributes.position.h;
+ if( anchor.w == 0 && anchor.h == 0 ) align = 5;
+ }
+ }
+ if( attributes.align !== undefined ) align = attributes.align;
+ var placement = placementStrategy(
+ anchor,
+ { w:ret_val.outerWidth(), h:ret_val.outerHeight() },
+ { w:$(window).width() , h:$(window).height() },
+ align
+ );
+ ret_val.css( 'left', placement.x );
+ ret_val.css( 'top' , placement.y );
+
ret_val.bind("click", function() {
ret_val.remove();
return false;
})
+ ret_val.css( 'display', 'block' );
return ret_val;
},
attributes: {
title: {type: 'string', required: false},
content: {type: 'string', required: false},
width: {type: 'string', required: false},
- height: {type: 'string', required: false}
+ height: {type: 'string', required: false},
+ position: {type: 'object', required: false} // either {x:,y:} or an jQuery object
}
});
@@ -399,3 +441,76 @@
alert('this.refreshAction');
}
};
+
+/**
+ * Figure out best placement of popup.
+ * A preference can optionally be passed. The position is that of the numbers
+ * on the numeric keypad. I.e. a value of "6" means centered above the anchor.
+ * A value of "0" means centered to the page
+ */
+function placementStrategy( anchor, popup, page, preference )
+{
+ var position_order = [ 8, 2, 6, 4, 9, 3, 7, 1, 5, 0 ];
+ if( preference !== undefined ) position_order.unshift( preference );
+
+ for( pos in position_order )
+ {
+ var xy = {};
+ switch(position_order[pos])
+ {
+ case 0: // page center - will allways work
+ return { x: (page.w-popup.w)/2, y: (page.h-popup.h)/2 };
+
+ case 1:
+ xy.x = anchor.x - popup.w;
+ xy.y = anchor.y + anchor.h;
+ break;
+
+ case 2:
+ xy.x = anchor.x + anchor.w/2 - popup.w/2;
+ xy.y = anchor.y + anchor.h;
+ break;
+
+ case 3:
+ xy.x = anchor.x + anchor.w;
+ xy.y = anchor.y + anchor.h;
+ break;
+
+ case 4:
+ xy.x = anchor.x - popup.w;
+ xy.y = anchor.y + anchor.h/2 - popup.h/2;
+ break;
+
+ case 5:
+ xy.x = anchor.x + anchor.w/2 - popup.w/2;
+ xy.y = anchor.y + anchor.h/2 - popup.h/2;
+ break;
+
+ case 6:
+ xy.x = anchor.x + anchor.w;
+ xy.y = anchor.y + anchor.h/2 - popup.h/2;
+ break;
+
+ case 7:
+ xy.x = anchor.x - popup.w;
+ xy.y = anchor.y - popup.h;
+ break;
+
+ case 8:
+ xy.x = anchor.x + anchor.w/2 - popup.w/2;
+ xy.y = anchor.y - popup.h;
+ break;
+
+ case 9:
+ xy.x = anchor.x + anchor.w;
+ xy.y = anchor.y - popup.h;
+ break;
+ }
+
+ // test if that solution is valid
+ if( xy.x >= 0 && xy.y >= 0 && xy.x+popup.w<=page.w && xy.y+popup.h<=page.h )
+ return xy;
+ }
+
+ return { x: 0, y: 0 }; // sanity return
+}
\ No newline at end of file
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-09 15:23:58 UTC (rev 187)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-09 20:37:27 UTC (rev 188)
@@ -308,7 +308,7 @@
//return retval;
if( !design.popups[ type ] ) type = 'unknown';
- return design.popups[ type ].create( attributes ).appendTo('body');
+ return design.popups[ type ].create( attributes );
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-09 15:24:05
|
Revision: 187
http://openautomation.svn.sourceforge.net/openautomation/?rev=187&view=rev
Author: mayerch
Date: 2010-12-09 15:23:58 +0000 (Thu, 09 Dec 2010)
Log Message:
-----------
- remove debug code
- remove popup from DOM on close
- default to unknown popup type
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-05 16:43:23 UTC (rev 186)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-09 15:23:58 UTC (rev 187)
@@ -37,8 +37,6 @@
this.addPopup = function (name, object) {
this.popups[name] = object;
this.popups[name].type = name;
-console.log( name );
-console.log( this.popups[name] );
}
this.getPopup = function(name) {
@@ -356,7 +354,7 @@
}
ret_val.bind("click", function() {
- ret_val.hide();
+ ret_val.remove();
return false;
})
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-05 16:43:23 UTC (rev 186)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-09 15:23:58 UTC (rev 187)
@@ -306,6 +306,8 @@
{
//var retval = design.popups[ type ].create( attributes ); //page, path );
//return retval;
+ if( !design.popups[ type ] ) type = 'unknown';
+
return design.popups[ type ].create( attributes ).appendTo('body');
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-05 16:43:29
|
Revision: 186
http://openautomation.svn.sourceforge.net/openautomation/?rev=186&view=rev
Author: makki1
Date: 2010-12-05 16:43:23 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
Export existing rrds for editor/diagram-widget
Added Paths:
-----------
CometVisu/trunk/visu/edit/get_widget_diagram.php
Added: CometVisu/trunk/visu/edit/get_widget_diagram.php
===================================================================
--- CometVisu/trunk/visu/edit/get_widget_diagram.php (rev 0)
+++ CometVisu/trunk/visu/edit/get_widget_diagram.php 2010-12-05 16:43:23 UTC (rev 186)
@@ -0,0 +1,26 @@
+<?php
+define('FILE_GA', "/etc/wiregate/eibga.conf");
+define('FILE_OW', "/etc/wiregate/owsensors.conf");
+define('DIR_RRD', "/var/www/rrd/*.rrd");
+
+$arrOW = parse_ini_file(FILE_OW, true);
+$arrGA = parse_ini_file(FILE_GA, true);
+
+$arrAdresses = array();
+
+foreach (glob(DIR_RRD) as $filename) {
+ $filebase = basename($filename);
+ $arrRRDParts = explode("_", $filebase, 2);
+ $arrRRDtype = explode(".", $arrRRDParts[1], 2);
+ $arrAdresses[$filebase] = array(
+ "adddress" => $arrOW[$arrRRDParts[0]]['eib_ga_'.$arrRRDtype[0]],
+ "name" => utf8_encode($arrOW[$arrRRDParts[0]]['name']),
+ "dpt" => $arrGA[$arrOW[$arrRRDParts[0]]['eib_ga_'.$arrRRDtype[0]]]['DPTSubId']
+ );
+
+}
+
+print json_encode($arrAdresses);
+exit;
+
+?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-05 12:19:37
|
Revision: 185
http://openautomation.svn.sourceforge.net/openautomation/?rev=185&view=rev
Author: netzkind
Date: 2010-12-05 12:19:31 +0000 (Sun, 05 Dec 2010)
Log Message:
-----------
added lib/compatibility.js to allow non-firebugged browsers to work with svn-state and "console.log" et al
Modified Paths:
--------------
CometVisu/trunk/visu/edit_config.html
CometVisu/trunk/visu/index.html
Added Paths:
-----------
CometVisu/trunk/visu/lib/compatibility.js
Modified: CometVisu/trunk/visu/edit_config.html
===================================================================
--- CometVisu/trunk/visu/edit_config.html 2010-12-04 22:43:47 UTC (rev 184)
+++ CometVisu/trunk/visu/edit_config.html 2010-12-05 12:19:31 UTC (rev 185)
@@ -6,6 +6,7 @@
<title>Visu - Editor-Modus</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
<link rel="stylesheet" type="text/css" href="edit/style_edit.css" />
+ <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>
<script src="lib/scrollable.js" type="text/javascript"></script>
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2010-12-04 22:43:47 UTC (rev 184)
+++ CometVisu/trunk/visu/index.html 2010-12-05 12:19:31 UTC (rev 185)
@@ -5,6 +5,7 @@
<head>
<title>CometVisu-Client</title>
<meta name="viewport" content="width=device-width, initial-scale=1" />
+ <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>
<script src="lib/scrollable.js" type="text/javascript"></script>
Added: CometVisu/trunk/visu/lib/compatibility.js
===================================================================
--- CometVisu/trunk/visu/lib/compatibility.js (rev 0)
+++ CometVisu/trunk/visu/lib/compatibility.js 2010-12-05 12:19:31 UTC (rev 185)
@@ -0,0 +1,5 @@
+
+if (typeof (console) == "undefined") {
+ console = {};
+ console.log = console.debug = console.info = console.warn = console.error = function() {}
+}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2010-12-04 22:43:56
|
Revision: 184
http://openautomation.svn.sourceforge.net/openautomation/?rev=184&view=rev
Author: netzkind
Date: 2010-12-04 22:43:47 +0000 (Sat, 04 Dec 2010)
Log Message:
-----------
new experimental plugin: diagrams (via flot)
added popups for discreet, changed handling of popups a little (these changes need to be reviewed, some kind of close-button might be needed)
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/edit/style_edit.css
Added Paths:
-----------
CometVisu/trunk/visu/plugins/diagram/
CometVisu/trunk/visu/plugins/diagram/flot/
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.crosshair.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.image.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.navigate.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.selection.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.stack.min.js
CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.threshold.min.js
CometVisu/trunk/visu/plugins/diagram/structure_plugin.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-12-03 23:44:20 UTC (rev 183)
+++ CometVisu/trunk/ChangeLog 2010-12-04 22:43:47 UTC (rev 184)
@@ -5,6 +5,7 @@
- New Plugin: colorChooser (based on farbtastic)
- New Feature: user settable status bar (i.e. footer)
- New Feature: iframe widget
+- New Plugin: diagrams
0.5.1
=====
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2010-12-03 23:44:20 UTC (rev 183)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2010-12-04 22:43:47 UTC (rev 184)
@@ -295,4 +295,49 @@
div#loading {
display: none !important;
+}
+
+
+.popup,
+.popup_background {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
+ z-index: 100;
+ border-color: #020202;
+ border-style: solid;
+ border-width: 2px 0px 0px 2px;
+ -moz-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ background: #101010;
+ opacity: .98;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup_background.error {
+ background: #800000;
+ border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2010-12-03 23:44:20 UTC (rev 183)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2010-12-04 22:43:47 UTC (rev 184)
@@ -260,12 +260,22 @@
display: none !important;
}
-.popup {
+.popup,
+.popup_background {
position: absolute;
width: 90%;
height: 90%;
top: 5%;
left: 5%;
+}
+
+.popup {
+ z-index: 101;
+ background: transparent;
+}
+
+
+.popup_background {
z-index: 100;
-moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;
background: #000;
@@ -281,7 +291,11 @@
border-bottom: 1px solid;
}
-.popup.error {
+.popup_background.error {
background: #800000;
border: #f00;
+}
+
+.clickable {
+ cursor: pointer;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-03 23:44:20 UTC (rev 183)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-04 22:43:47 UTC (rev 184)
@@ -326,7 +326,7 @@
attributes: {
src: {type: "uri", required: true},
width: {type: "string", required: false},
- height: {type: "string", required: false},
+ height: {type: "string", required: false}
},
content: {type: "string", required: false}
});
@@ -344,12 +344,22 @@
this.addPopup('unknown', {
create: function( attributes ) {
- var ret_val = $('<div class="popup" />');
+ var ret_val = $('<div class="popup" /><div class=\"popup_background\" />');
ret_val.addClass( this.type );
- if( attributes['title'] ) ret_val.append( $('<div class="head">' + attributes['title'] + '</div>') );
- var content = '';
- if( attributes['content'] ) content = attributes['content'];
- ret_val.append( '<div class="main">' + content + '</div>' );
+
+ if (attributes.title) {
+ ret_val.filter(".popup").append( $('<div class="head" />').append(attributes.title));
+ }
+
+ if( attributes.content) {
+ ret_val.filter(".popup").append( $('<div class="main" />').append(attributes.content));
+ }
+
+ ret_val.bind("click", function() {
+ ret_val.hide();
+ return false;
+ })
+
return ret_val;
},
attributes: {
@@ -360,9 +370,9 @@
}
});
- this.addPopup('info' , this.getPopup('unknown') );
- this.addPopup('warning', this.getPopup('unknown') );
- this.addPopup('error' , this.getPopup('unknown') ) ;
+ this.addPopup('info' , $.extend(true, {}, this.getPopup('unknown')) );
+ this.addPopup('warning', $.extend(true, {}, this.getPopup('unknown')) );
+ this.addPopup('error' , $.extend(true, {}, this.getPopup('unknown')) ) ;
this.switchAction = function() {
var data = $(this).data();
Modified: CometVisu/trunk/visu/edit/style_edit.css
===================================================================
--- CometVisu/trunk/visu/edit/style_edit.css 2010-12-03 23:44:20 UTC (rev 183)
+++ CometVisu/trunk/visu/edit/style_edit.css 2010-12-04 22:43:47 UTC (rev 184)
@@ -11,6 +11,7 @@
text-align: center;
float: none !important;
padding: 0 !important;
+ z-index: 5;
}
.editcontrol {
Added: CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.crosshair.min.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.crosshair.min.js (rev 0)
+++ CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.crosshair.min.js 2010-12-04 22:43:47 UTC (rev 184)
@@ -0,0 +1 @@
+(function(B){var A={crosshair:{mode:null,color:"rgba(170, 0, 0, 0.80)",lineWidth:1}};function C(G){var H={x:-1,y:-1,locked:false};G.setCrosshair=function D(J){if(!J){H.x=-1}else{var I=G.getAxes();H.x=Math.max(0,Math.min(J.x!=null?I.xaxis.p2c(J.x):I.x2axis.p2c(J.x2),G.width()));H.y=Math.max(0,Math.min(J.y!=null?I.yaxis.p2c(J.y):I.y2axis.p2c(J.y2),G.height()))}G.triggerRedrawOverlay()};G.clearCrosshair=G.setCrosshair;G.lockCrosshair=function E(I){if(I){G.setCrosshair(I)}H.locked=true};G.unlockCrosshair=function F(){H.locked=false};G.hooks.bindEvents.push(function(J,I){if(!J.getOptions().crosshair.mode){return }I.mouseout(function(){if(H.x!=-1){H.x=-1;J.triggerRedrawOverlay()}});I.mousemove(function(K){if(J.getSelection&&J.getSelection()){H.x=-1;return }if(H.locked){return }var L=J.offset();H.x=Math.max(0,Math.min(K.pageX-L.left,J.width()));H.y=Math.max(0,Math.min(K.pageY-L.top,J.height()));J.triggerRedrawOverlay()})});G.hooks.drawOverlay.push(function(K,I){var L=K.getOptions().crosshair;if(!L.mode){return }var J=K.getPlotOffset();I.save();I.translate(J.left,J.top);if(H.x!=-1){I.strokeStyle=L.color;I.lineWidth=L.lineWidth;I.lineJoin="round";I.beginPath();if(L.mode.indexOf("x")!=-1){I.moveTo(H.x,0);I.lineTo(H.x,K.height())}if(L.mode.indexOf("y")!=-1){I.moveTo(0,H.y);I.lineTo(K.width(),H.y)}I.stroke()}I.restore()})}B.plot.plugins.push({init:C,options:A,name:"crosshair",version:"1.0"})})(jQuery);
\ No newline at end of file
Added: CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.image.min.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.image.min.js (rev 0)
+++ CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.image.min.js 2010-12-04 22:43:47 UTC (rev 184)
@@ -0,0 +1 @@
+(function(D){var B={series:{images:{show:false,alpha:1,anchor:"corner"}}};D.plot.image={};D.plot.image.loadDataImages=function(G,F,K){var J=[],H=[];var I=F.series.images.show;D.each(G,function(L,M){if(!(I||M.images.show)){return }if(M.data){M=M.data}D.each(M,function(N,O){if(typeof O[0]=="string"){J.push(O[0]);H.push(O)}})});D.plot.image.load(J,function(L){D.each(H,function(N,O){var M=O[0];if(L[M]){O[0]=L[M]}});K()})};D.plot.image.load=function(H,I){var G=H.length,F={};if(G==0){I({})}D.each(H,function(K,J){var L=function(){--G;F[J]=this;if(G==0){I(F)}};D("<img />").load(L).error(L).attr("src",J)})};function A(H,F){var G=H.getPlotOffset();D.each(H.getData(),function(O,P){var X=P.datapoints.points,I=P.datapoints.pointsize;for(var O=0;O<X.length;O+=I){var Q=X[O],M=X[O+1],V=X[O+2],K=X[O+3],T=X[O+4],W=P.xaxis,S=P.yaxis,N;if(!Q||Q.width<=0||Q.height<=0){continue}if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}if(P.images.anchor=="center"){N=0.5*(K-M)/(Q.width-1);M-=N;K+=N;N=0.5*(T-V)/(Q.height-1);V-=N;T+=N}if(M==K||V==T||M>=W.max||K<=W.min||V>=S.max||T<=S.min){continue}var L=0,U=0,J=Q.width,R=Q.height;if(M<W.min){L+=(J-L)*(W.min-M)/(K-M);M=W.min}if(K>W.max){J+=(J-L)*(W.max-K)/(K-M);K=W.max}if(V<S.min){R+=(U-R)*(S.min-V)/(T-V);V=S.min}if(T>S.max){U+=(U-R)*(S.max-T)/(T-V);T=S.max}M=W.p2c(M);K=W.p2c(K);V=S.p2c(V);T=S.p2c(T);if(M>K){N=K;K=M;M=N}if(V>T){N=T;T=V;V=N}N=F.globalAlpha;F.globalAlpha*=P.images.alpha;F.drawImage(Q,L,U,J-L,R-U,M+G.left,V+G.top,K-M,T-V);F.globalAlpha=N}})}function C(I,F,G,H){if(!F.images.show){return }H.format=[{required:true},{x:true,number:true,required:true},{y:true,number:true,required:true},{x:true,number:true,required:true},{y:true,number:true,required:true}]}function E(F){F.hooks.processRawData.push(C);F.hooks.draw.push(A)}D.plot.plugins.push({init:E,options:B,name:"image",version:"1.1"})})(jQuery);
\ No newline at end of file
Added: CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.js
===================================================================
--- CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.js (rev 0)
+++ CometVisu/trunk/visu/plugins/diagram/flot/jquery.flot.js 2010-12-04 22:43:47 UTC (rev 184)
@@ -0,0 +1,2119 @@
+/* Javascript plotting library for jQuery, v. 0.6.
+ *
+ * Released under the MIT license by IOLA, December 2007.
+ *
+ */
+
+// first an inline dependency, jquery.colorhelpers.js, we inline it here
+// for convenience
+
+/* Plugin for jQuery for working with colors.
+ *
+ * Version 1.0.
+ *
+ * Inspiration from jQuery color animation plugin by John Resig.
+ *
+ * Released under the MIT license by Ole Laursen, October 2009.
+ *
+ * Examples:
+ *
+ * $.color.parse("#fff").scale('rgb', 0.25).add('a', -0.5).toString()
+ * var c = $.color.extract($("#mydiv"), 'background-color');
+ * console.log(c.r, c.g, c.b, c.a);
+ * $.color.make(100, 50, 25, 0.4).toString() // returns "rgba(100,50,25,0.4)"
+ *
+ * Note that .scale() and .add() work in-place instead of returning
+ * new objects.
+ */
+(function(){jQuery.color={};jQuery.color.make=function(E,D,B,C){var F={};F.r=E||0;F.g=D||0;F.b=B||0;F.a=C!=null?C:1;F.add=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]+=H}return F.normalize()};F.scale=function(I,H){for(var G=0;G<I.length;++G){F[I.charAt(G)]*=H}return F.normalize()};F.toString=function(){if(F.a>=1){return"rgb("+[F.r,F.g,F.b].join(",")+")"}else{return"rgba("+[F.r,F.g,F.b,F.a].join(",")+")"}};F.normalize=function(){function G(I,J,H){return J<I?I:(J>H?H:J)}F.r=G(0,parseInt(F.r),255);F.g=G(0,parseInt(F.g),255);F.b=G(0,parseInt(F.b),255);F.a=G(0,F.a,1);return F};F.clone=function(){return jQuery.color.make(F.r,F.b,F.g,F.a)};return F.normalize()};jQuery.color.extract=function(C,B){var D;do{D=C.css(B).toLowerCase();if(D!=""&&D!="transparent"){break}C=C.parent()}while(!jQuery.nodeName(C.get(0),"body"));if(D=="rgba(0, 0, 0, 0)"){D="transparent"}return jQuery.color.parse(D)};jQuery.color.parse=function(E){var D,B=jQuery.color.make;if(D=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10))}if(D=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseInt(D[1],10),parseInt(D[2],10),parseInt(D[3],10),parseFloat(D[4]))}if(D=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55)}if(D=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(E)){return B(parseFloat(D[1])*2.55,parseFloat(D[2])*2.55,parseFloat(D[3])*2.55,parseFloat(D[4]))}if(D=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(E)){return B(parseInt(D[1],16),parseInt(D[2],16),parseInt(D[3],16))}if(D=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(E)){return B(parseInt(D[1]+D[1],16),parseInt(D[2]+D[2],16),parseInt(D[3]+D[3],16))}var C=jQuery.trim(E).toLowerCase();if(C=="transparent"){return B(255,255,255,0)}else{D=A[C];return B(D[0],D[1],D[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})();
+
+// the actual Flot code
+(function($) {
+ function Plot(placeholder, data_, options_, plugins) {
+ // data is on the form:
+ // [ series1, series2 ... ]
+ // where series is either just the data as [ [x1, y1], [x2, y2], ... ]
+ // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... }
+
+ var series = [],
+ options = {
+ // the color theme used for graphs
+ colors: ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"],
+ legend: {
+ show: true,
+ noColumns: 1, // number of colums in legend table
+ labelFormatter: null, // fn: string -> string
+ labelBoxBorderColor: "#ccc", // border color for the little label boxes
+ container: null, // container (as jQuery object) to put legend in, null means default on top of graph
+ position: "ne", // position of default legend container within plot
+ margin: 5, // distance from grid edge to default legend container within plot
+ backgroundColor: null, // null means auto-detect
+ backgroundOpacity: 0.85 // set to 0 to avoid background
+ },
+ xaxis: {
+ mode: null, // null or "time"
+ transform: null, // null or f: number -> number to transform axis
+ inverseTransform: null, // if transform is set, this should be the inverse function
+ min: null, // min. value to show, null means set automatically
+ max: null, // max. value to show, null means set automatically
+ autoscaleMargin: null, // margin in % to add if auto-setting min/max
+ ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
+ tickFormatter: null, // fn: number -> string
+ labelWidth: null, // size of tick labels in pixels
+ labelHeight: null,
+
+ // mode specific options
+ tickDecimals: null, // no. of decimals, null means auto
+ tickSize: null, // number or [number, "unit"]
+ minTickSize: null, // number or [number, "unit"]
+ monthNames: null, // list of names of months
+ timeformat: null, // format string to use
+ twelveHourClock: false // 12 or 24 time in time mode
+ },
+ yaxis: {
+ autoscaleMargin: 0.02
+ },
+ x2axis: {
+ autoscaleMargin: null
+ },
+ y2axis: {
+ autoscaleMargin: 0.02
+ },
+ series: {
+ points: {
+ show: false,
+ radius: 3,
+ lineWidth: 2, // in pixels
+ fill: true,
+ fillColor: "#ffffff"
+ },
+ lines: {
+ // we don't put in show: false so we can see
+ // whether lines were actively disabled
+ lineWidth: 2, // in pixels
+ fill: false,
+ fillColor: null,
+ steps: false
+ },
+ bars: {
+ show: false,
+ lineWidth: 2, // in pixels
+ barWidth: 1, // in units of the x axis
+ fill: true,
+ fillColor: null,
+ align: "left", // or "center"
+ horizontal: false // when horizontal, left is now top
+ },
+ shadowSize: 3
+ },
+ grid: {
+ show: true,
+ aboveData: false,
+ color: "#545454", // primary color used for outline and labels
+ backgroundColor: null, // null for transparent, else color
+ tickColor: "rgba(0,0,0,0.15)", // color used for the ticks
+ labelMargin: 5, // in pixels
+ borderWidth: 2, // in pixels
+ borderColor: null, // set if different from the grid color
+ markings: null, // array of ranges or fn: axes -> array of ranges
+ markingsColor: "#f4f4f4",
+ markingsLineWidth: 2,
+ // interactive stuff
+ clickable: false,
+ hoverable: false,
+ autoHighlight: true, // highlight in case mouse is near
+ mouseActiveRadius: 10 // how far the mouse can be away to activate an item
+ },
+ hooks: {}
+ },
+ canvas = null, // the canvas for the plot itself
+ overlay = null, // canvas for interactive stuff on top of plot
+ eventHolder = null, // jQuery object that events should be bound to
+ ctx = null, octx = null,
+ axes = { xaxis: {}, yaxis: {}, x2axis: {}, y2axis: {} },
+ plotOffset = { left: 0, right: 0, top: 0, bottom: 0},
+ canvasWidth = 0, canvasHeight = 0,
+ plotWidth = 0, plotHeight = 0,
+ hooks = {
+ processOptions: [],
+ processRawData: [],
+ processDatapoints: [],
+ draw: [],
+ bindEvents: [],
+ drawOverlay: []
+ },
+ plot = this;
+
+ // public functions
+ plot.setData = setData;
+ plot.setupGrid = setupGrid;
+ plot.draw = draw;
+ plot.getPlaceholder = function() { return placeholder; };
+ plot.getCanvas = function() { return canvas; };
+ plot.getPlotOffset = function() { return plotOffset; };
+ plot.width = function () { return plotWidth; };
+ plot.height = function () { return plotHeight; };
+ plot.offset = function () {
+ var o = eventHolder.offset();
+ o.left += plotOffset.left;
+ o.top += plotOffset.top;
+ return o;
+ };
+ plot.getData = function() { return series; };
+ plot.getAxes = function() { return axes; };
+ plot.getOptions = function() { return options; };
+ plot.highlight = highlight;
+ plot.unhighlight = unhighlight;
+ plot.triggerRedrawOverlay = triggerRedrawOverlay;
+ plot.pointOffset = function(point) {
+ return { left: parseInt(axisSpecToRealAxis(point, "xaxis").p2c(+point.x) + plotOffset.left),
+ top: parseInt(axisSpecToRealAxis(point, "yaxis").p2c(+point.y) + plotOffset.top) };
+ };
+
+
+ // public attributes
+ plot.hooks = hooks;
+
+ // initialize
+ initPlugins(plot);
+ parseOptions(options_);
+ constructCanvas();
+ setData(data_);
+ setupGrid();
+ draw();
+ bindEvents();
+
+
+ function executeHooks(hook, args) {
+ args = [plot].concat(args);
+ for (var i = 0; i < hook.length; ++i)
+ hook[i].apply(this, args);
+ }
+
+ function initPlugins() {
+ for (var i = 0; i < plugins.length; ++i) {
+ var p = plugins[i];
+ p.init(plot);
+ if (p.options)
+ $.extend(true, options, p.options);
+ }
+ }
+
+ function parseOptions(opts) {
+ $.extend(true, options, opts);
+ if (options.grid.borderColor == null)
+ options.grid.borderColor = options.grid.color;
+ // backwards compatibility, to be removed in future
+ if (options.xaxis.noTicks && options.xaxis.ticks == null)
+ options.xaxis.ticks = options.xaxis.noTicks;
+ if (options.yaxis.noTicks && options.yaxis.ticks == null)
+ options.yaxis.ticks = options.yaxis.noTicks;
+ if (options.grid.coloredAreas)
+ options.grid.markings = options.grid.coloredAreas;
+ if (options.grid.coloredAreasColor)
+ options.grid.markingsColor = options.grid.coloredAreasColor;
+ if (options.lines)
+ $.extend(true, options.series.lines, options.lines);
+ if (options.points)
+ $.extend(true, options.series.points, options.points);
+ if (options.bars)
+ $.extend(true, options.series.bars, options.bars);
+ if (options.shadowSize)
+ options.series.shadowSize = options.shadowSize;
+
+ for (var n in hooks)
+ if (options.hooks[n] && options.hooks[n].length)
+ hooks[n] = hooks[n].concat(options.hooks[n]);
+
+ executeHooks(hooks.processOptions, [options]);
+ }
+
+ function setData(d) {
+ series = parseData(d);
+ fillInSeriesOptions();
+ processData();
+ }
+
+ function parseData(d) {
+ var res = [];
+ for (var i = 0; i < d.length; ++i) {
+ var s = $.extend(true, {}, options.series);
+
+ if (d[i].data) {
+ s.data = d[i].data; // move the data instead of deep-copy
+ delete d[i].data;
+
+ $.extend(true, s, d[i]);
+
+ d[i].data = s.data;
+ }
+ else
+ s.data = d[i];
+ res.push(s);
+ }
+
+ return res;
+ }
+
+ function axisSpecToRealAxis(obj, attr) {
+ var a = obj[attr];
+ if (!a || a == 1)
+ return axes[attr];
+ if (typeof a == "number")
+ return axes[attr.charAt(0) + a + attr.slice(1)];
+ return a; // assume it's OK
+ }
+
+ function fillInSeriesOptions() {
+ var i;
+
+ // collect what we already got of colors
+ var neededColors = series.length,
+ usedColors = [],
+ assignedColors = [];
+ for (i = 0; i < series.length; ++i) {
+ var sc = series[i].color;
+ if (sc != null) {
+ --neededColors;
+ if (typeof sc == "number")
+ assignedColors.push(sc);
+ else
+ usedColors.push($.color.parse(series[i].color));
+ }
+ }
+
+ // we might need to generate more colors if higher indices
+ // are assigned
+ for (i = 0; i < assignedColors.length; ++i) {
+ neededColors = Math.max(neededColors, assignedColors[i] + 1);
+ }
+
+ // produce colors as needed
+ var colors = [], variation = 0;
+ i = 0;
+ while (colors.length < neededColors) {
+ var c;
+ if (options.colors.length == i) // check degenerate case
+ c = $.color.make(100, 100, 100);
+ else
+ c = $.color.parse(options.colors[i]);
+
+ // vary color if needed
+ var sign = variation % 2 == 1 ? -1 : 1;
+ c.scale('rgb', 1 + sign * Math.ceil(variation / 2) * 0.2)
+
+ // FIXME: if we're getting to close to something else,
+ // we should probably skip this one
+ colors.push(c);
+
+ ++i;
+ if (i >= options.colors.length) {
+ i = 0;
+ ++variation;
+ }
+ }
+
+ // fill in the options
+ var colori = 0, s;
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+
+ // assign colors
+ if (s.color == null) {
+ s.color = colors[colori].toString();
+ ++colori;
+ }
+ else if (typeof s.color == "number")
+ s.color = colors[s.color].toString();
+
+ // turn on lines automatically in case nothing is set
+ if (s.lines.show == null) {
+ var v, show = true;
+ for (v in s)
+ if (s[v].show) {
+ show = false;
+ break;
+ }
+ if (show)
+ s.lines.show = true;
+ }
+
+ // setup axes
+ s.xaxis = axisSpecToRealAxis(s, "xaxis");
+ s.yaxis = axisSpecToRealAxis(s, "yaxis");
+ }
+ }
+
+ function processData() {
+ var topSentry = Number.POSITIVE_INFINITY,
+ bottomSentry = Number.NEGATIVE_INFINITY,
+ i, j, k, m, length,
+ s, points, ps, x, y, axis, val, f, p;
+
+ for (axis in axes) {
+ axes[axis].datamin = topSentry;
+ axes[axis].datamax = bottomSentry;
+ axes[axis].used = false;
+ }
+
+ function updateAxis(axis, min, max) {
+ if (min < axis.datamin)
+ axis.datamin = min;
+ if (max > axis.datamax)
+ axis.datamax = max;
+ }
+
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+ s.datapoints = { points: [] };
+
+ executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]);
+ }
+
+ // first pass: clean and copy data
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+
+ var data = s.data, format = s.datapoints.format;
+
+ if (!format) {
+ format = [];
+ // find out how to copy
+ format.push({ x: true, number: true, required: true });
+ format.push({ y: true, number: true, required: true });
+
+ if (s.bars.show)
+ format.push({ y: true, number: true, required: false, defaultValue: 0 });
+
+ s.datapoints.format = format;
+ }
+
+ if (s.datapoints.pointsize != null)
+ continue; // already filled in
+
+ if (s.datapoints.pointsize == null)
+ s.datapoints.pointsize = format.length;
+
+ ps = s.datapoints.pointsize;
+ points = s.datapoints.points;
+
+ insertSteps = s.lines.show && s.lines.steps;
+ s.xaxis.used = s.yaxis.used = true;
+
+ for (j = k = 0; j < data.length; ++j, k += ps) {
+ p = data[j];
+
+ var nullify = p == null;
+ if (!nullify) {
+ for (m = 0; m < ps; ++m) {
+ val = p[m];
+ f = format[m];
+
+ if (f) {
+ if (f.number && val != null) {
+ val = +val; // convert to number
+ if (isNaN(val))
+ val = null;
+ }
+
+ if (val == null) {
+ if (f.required)
+ nullify = true;
+
+ if (f.defaultValue != null)
+ val = f.defaultValue;
+ }
+ }
+
+ points[k + m] = val;
+ }
+ }
+
+ if (nullify) {
+ for (m = 0; m < ps; ++m) {
+ val = points[k + m];
+ if (val != null) {
+ f = format[m];
+ // extract min/max info
+ if (f.x)
+ updateAxis(s.xaxis, val, val);
+ if (f.y)
+ updateAxis(s.yaxis, val, val);
+ }
+ points[k + m] = null;
+ }
+ }
+ else {
+ // a little bit of line specific stuff that
+ // perhaps shouldn't be here, but lacking
+ // better means...
+ if (insertSteps && k > 0
+ && points[k - ps] != null
+ && points[k - ps] != points[k]
+ && points[k - ps + 1] != points[k + 1]) {
+ // copy the point to make room for a middle point
+ for (m = 0; m < ps; ++m)
+ points[k + ps + m] = points[k + m];
+
+ // middle point has same y
+ points[k + 1] = points[k - ps + 1];
+
+ // we've added a point, better reflect that
+ k += ps;
+ }
+ }
+ }
+ }
+
+ // give the hooks a chance to run
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+
+ executeHooks(hooks.processDatapoints, [ s, s.datapoints]);
+ }
+
+ // second pass: find datamax/datamin for auto-scaling
+ for (i = 0; i < series.length; ++i) {
+ s = series[i];
+ points = s.datapoints.points,
+ ps = s.datapoints.pointsize;
+
+ var xmin = topSentry, ymin = topSentry,
+ xmax = bottomSentry, ymax = bottomSentry;
+
+ for (j = 0; j < points.length; j += ps) {
+ if (points[j] == null)
+ continue;
+
+ for (m = 0; m < ps; ++m) {
+ val = points[j + m];
+ f = format[m];
+ if (!f)
+ continue;
+
+ if (f.x) {
+ if (val < xmin)
+ xmin = val;
+ if (val > xmax)
+ xmax = val;
+ }
+ if (f.y) {
+ if (val < ymin)
+ ymin = val;
+ if (val > ymax)
+ ymax = val;
+ }
+ }
+ }
+
+ if (s.bars.show) {
+ // make sure we got room for the bar on the dancing floor
+ var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2;
+ if (s.bars.horizontal) {
+ ymin += delta;
+ ymax += delta + s.bars.barWidth;
+ }
+ else {
+ xmin += delta;
+ xmax += delta + s.bars.barWidth;
+ }
+ }
+
+ updateAxis(s.xaxis, xmin, xmax);
+ updateAxis(s.yaxis, ymin, ymax);
+ }
+
+ for (axis in axes) {
+ if (axes[axis].datamin == topSentry)
+ axes[axis].datamin = null;
+ if (axes[axis].datamax == bottomSentry)
+ axes[axis].datamax = null;
+ }
+ }
+
+ function constructCanvas() {
+ function makeCanvas(width, height) {
+ var c = document.createElement('canvas');
+ c.width = width;
+ c.height = height;
+ if ($.browser.msie) // excanvas hack
+ c = window.G_vmlCanvasManager.initElement(c);
+ return c;
+ }
+
+ canvasWidth = placeholder.width();
+ canvasHeight = placeholder.height();
+ placeholder.html(""); // clear placeholder
+ if (placeholder.css("position") == 'static')
+ placeholder.css("position", "relative"); // for positioning labels and overlay
+
+ if (canvasWidth <= 0 || canvasHeight <= 0)
+ throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight;
+
+ if ($.browser.msie) // excanvas hack
+ window.G_vmlCanvasManager.init_(document); // make sure everything is setup
+
+ // the canvas
+ canvas = $(makeCanvas(canvasWidth, canvasHeight)).appendTo(placeholder).get(0);
+ ctx = canvas.getContext("2d");
+
+ // overlay canvas for interactive features
+ overlay = $(makeCanvas(canvasWidth, canvasHeight)).css({ position: 'absolute', left: 0, top: 0 }).appendTo(placeholder).get(0);
+ octx = overlay.getContext("2d");
+ octx.stroke();
+ }
+
+ function bindEvents() {
+ // we include the canvas in the event holder too, because IE 7
+ // sometimes has trouble with the stacking order
+ eventHolder = $([overlay, canvas]);
+
+ // bind events
+ if (options.grid.hoverable)
+ eventHolder.mousemove(onMouseMove);
+
+ if (options.grid.clickable)
+ eventHolder.click(onClick);
+
+ executeHooks(hooks.bindEvents, [eventHolder]);
+ }
+
+ function setupGrid() {
+ function setTransformationHelpers(axis, o) {
+ function identity(x) { return x; }
+
+ var s, m, t = o.transform || identity,
+ it = o.inverseTransform;
+
+ // add transformation helpers
+ if (axis == axes.xaxis || axis == axes.x2axis) {
+ // precompute how much the axis is scaling a point
+ // in canvas space
+ s = axis.scale = plotWidth / (t(axis.max) - t(axis.min));
+ m = t(axis.min);
+
+ // data point to canvas coordinate
+ if (t == identity) // slight optimization
+ axis.p2c = function (p) { return (p - m) * s; };
+ else
+ axis.p2c = function (p) { return (t(p) - m) * s; };
+ // canvas coordinate to data point
+ if (!it)
+ axis.c2p = function (c) { return m + c / s; };
+ else
+ axis.c2p = function (c) { return it(m + c / s); };
+ }
+ else {
+ s = axis.scale = plotHeight / (t(axis.max) - t(axis.min));
+ m = t(axis.max);
+
+ if (t == identity)
+ axis.p2c = function (p) { return (m - p) * s; };
+ else
+ axis.p2c = function (p) { return (m - t(p)) * s; };
+ if (!it)
+ axis.c2p = function (c) { return m - c / s; };
+ else
+ axis.c2p = function (c) { return it(m - c / s); };
+ }
+ }
+
+ function measureLabels(axis, axisOptions) {
+ var i, labels = [], l;
+
+ axis.labelWidth = axisOptions.labelWidth;
+ axis.labelHeight = axisOptions.labelHeight;
+
+ if (axis == axes.xaxis || axis == axes.x2axis) {
+ // to avoid measuring the widths of the labels, we
+ // construct fixed-size boxes and put the labels inside
+ // them, we don't need the exact figures and the
+ // fixed-size box content is easy to center
+ if (axis.labelWidth == null)
+ axis.labelWidth = canvasWidth / (axis.ticks.length > 0 ? axis.ticks.length : 1);
+
+ // measure x label heights
+ if (axis.labelHeight == null) {
+ labels = [];
+ for (i = 0; i < axis.ticks.length; ++i) {
+ l = axis.ticks[i].label;
+ if (l)
+ labels.push('<div class="tickLabel" style="float:left;width:' + axis.labelWidth + 'px">' + l + '</div>');
+ }
+
+ if (labels.length > 0) {
+ var dummyDiv = $('<div style="position:absolute;top:-10000px;width:10000px;font-size:smaller">'
+ + labels.join("") + '<div style="clear:left"></div></div>').appendTo(placeholder);
+ axis.labelHeight = dummyDiv.height();
+ dummyDiv.remove();
+ }
+ }
+ }
+ else if (axis.labelWidth == null || axis.labelHeight == null) {
+ // calculate y label dimensions
+ for (i = 0; i < axis.ticks.length; ++i) {
+ l = axis.ticks[i].label;
+ if (l)
+ labels.push('<div class="tickLabel">' + l + '</div>');
+ }
+
+ if (labels.length > 0) {
+ var dummyDiv = $('<div style="position:absolute;top:-10000px;font-size:smaller">'
+ + labels.join("") + '</div>').appendTo(placeholder);
+ if (axis.labelWidth == null)
+ axis.labelWidth = dummyDiv.width();
+ if (axis.labelHeight == null)
+ axis.labelHeight = dummyDiv.find("div").height();
+ dummyDiv.remove();
+ }
+
+ }
+
+ if (axis.labelWidth == null)
+ axis.labelWidth = 0;
+ if (axis.labelHeight == null)
+ axis.labelHeight = 0;
+ }
+
+ function setGridSpacing() {
+ // get the most space needed around the grid for things
+ // that may stick out
+ var maxOutset = options.grid.borderWidth;
+ for (i = 0; i < series.length; ++i)
+ maxOutset = Math.max(maxOutset, 2 * (series[i].points.radius + series[i].points.lineWidth/2));
+
+ plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = maxOutset;
+
+ var margin = options.grid.labelMargin + options.grid.borderWidth;
+
+ if (axes.xaxis.labelHeight > 0)
+ plotOffset.bottom = Math.max(maxOutset, axes.xaxis.labelHeight + margin);
+ if (axes.yaxis.labelWidth > 0)
+ plotOffset.left = Math.max(maxOutset, axes.yaxis.labelWidth + margin);
+ if (axes.x2axis.labelHeight > 0)
+ plotOffset.top = Math.max(maxOutset, axes.x2axis.labelHeight + margin);
+ if (axes.y2axis.labelWidth > 0)
+ plotOffset.right = Math.max(maxOutset, axes.y2axis.labelWidth + margin);
+
+ plotWidth = canvasWidth - plotOffset.left - plotOffset.right;
+ plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top;
+ }
+
+ var axis;
+ for (axis in axes)
+ setRange(axes[axis], options[axis]);
+
+ if (options.grid.show) {
+ for (axis in axes) {
+ prepareTickGeneration(axes[axis], options[axis]);
+ setTicks(axes[axis], options[axis]);
+ measureLabels(axes[axis], options[axis]);
+ }
+
+ setGridSpacing();
+ }
+ else {
+ plotOffset.left = plotOffset.right = plotOffset.top = plotOffset.bottom = 0;
+ plotWidth = canvasWidth;
+ plotHeight = canvasHeight;
+ }
+
+ for (axis in axes)
+ setTransformationHelpers(axes[axis], options[axis]);
+
+ if (options.grid.show)
+ insertLabels();
+
+ insertLegend();
+ }
+
+ function setRange(axis, axisOptions) {
+ var min = +(axisOptions.min != null ? axisOptions.min : axis.datamin),
+ max = +(axisOptions.max != null ? axisOptions.max : axis.datamax),
+ delta = max - min;
+
+ if (delta == 0.0) {
+ // degenerate case
+ var widen = max == 0 ? 1 : 0.01;
+
+ if (axisOptions.min == null)
+ min -= widen;
+ // alway widen max if we couldn't widen min to ensure we
+ // don't fall into min == max which doesn't work
+ if (axisOptions.max == null || axisOptions.min != null)
+ max += widen;
+ }
+ else {
+ // consider autoscaling
+ var margin = axisOptions.autoscaleMargin;
+ if (margin != null) {
+ if (axisOptions.min == null) {
+ min -= delta * margin;
+ // make sure we don't go below zero if all values
+ // are positive
+ if (min < 0 && axis.datamin != null && axis.datamin >= 0)
+ min = 0;
+ }
+ if (axisOptions.max == null) {
+ max += delta * margin;
+ if (max > 0 && axis.datamax != null && axis.datamax <= 0)
+ max = 0;
+ }
+ }
+ }
+ axis.min = min;
+ axis.max = max;
+ }
+
+ function prepareTickGeneration(axis, axisOptions) {
+ // estimate number of ticks
+ var noTicks;
+ if (typeof axisOptions.ticks == "number" && axisOptions.ticks > 0)
+ noTicks = axisOptions.ticks;
+ else if (axis == axes.xaxis || axis == axes.x2axis)
+ // heuristic based on the model a*sqrt(x) fitted to
+ // some reasonable data points
+ noTicks = 0.3 * Math.sqrt(canvasWidth);
+ else
+ noTicks = 0.3 * Math.sqrt(canvasHeight);
+
+ var delta = (axis.max - axis.min) / noTicks,
+ size, generator, unit, formatter, i, magn, norm;
+
+ if (axisOptions.mode == "time") {
+ // pretty handling of time
+
+ // map of app. size of time units in milliseconds
+ var timeUnitSize = {
+ "second": 1000,
+ "minute": 60 * 1000,
+ "hour": 60 * 60 * 1000,
+ "day": 24 * 60 * 60 * 1000,
+ "month": 30 * 24 * 60 * 60 * 1000,
+ "year": 365.2425 * 24 * 60 * 60 * 1000
+ };
+
+
+ // the allowed tick sizes, after 1 year we use
+ // an integer algorithm
+ var spec = [
+ [1, "second"], [2, "second"], [5, "second"], [10, "second"],
+ [30, "second"],
+ [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"],
+ [30, "minute"],
+ [1, "hour"], [2, "hour"], [4, "hour"],
+ [8, "hour"], [12, "hour"],
+ [1, "day"], [2, "day"], [3, "day"],
+ [0.25, "month"], [0.5, "month"], [1, "month"],
+ [2, "month"], [3, "month"], [6, "month"],
+ [1, "year"]
+ ];
+
+ var minSize = 0;
+ if (axisOptions.minTickSize != null) {
+ if (typeof axisOptions.tickSize == "number")
+ minSize = axisOptions.tickSize;
+ else
+ minSize = axisOptions.minTickSize[0] * timeUnitSize[axisOptions.minTickSize[1]];
+ }
+
+ for (i = 0; i < spec.length - 1; ++i)
+ if (delta < (spec[i][0] * timeUnitSize[spec[i][1]]
+ + spec[i + 1][0] * timeUnitSize[spec[i + 1][1]]) / 2
+ && spec[i][0] * timeUnitSize[spec[i][1]] >= minSize)
+ break;
+ size = spec[i][0];
+ unit = spec[i][1];
+
+ // special-case the possibility of several years
+ if (unit == "year") {
+ magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10));
+ norm = (delta / timeUnitSize.year) / magn;
+ if (norm < 1.5)
+ size = 1;
+ else if (norm < 3)
+ size = 2;
+ else if (norm < 7.5)
+ size = 5;
+ else
+ size = 10;
+
+ size *= magn;
+ }
+
+ if (axisOptions.tickSize) {
+ size = axisOptions.tickSize[0];
+ unit = axisOptions.tickSize[1];
+ }
+
+ generator = function(axis) {
+ var ticks = [],
+ tickSize = axis.tickSize[0], unit = axis.tickSize[1],
+ d = new Date(axis.min);
+
+ var step = tickSize * timeUnitSize[unit];
+
+ if (unit == "second")
+ d.setUTCSeconds(floorInBase(d.getUTCSeconds(), tickSize));
+ if (unit == "minute")
+ d.setUTCMinutes(floorInBase(d.getUTCMinutes(), tickSize));
+ if (unit == "hour")
+ d.setUTCHours(floorInBase(d.getUTCHours(), tickSize));
+ if (unit == "month")
+ d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize));
+ if (unit == "year")
+ d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize));
+
+ // reset smaller components
+ d.setUTCMilliseconds(0);
+ if (step >= timeUnitSize.minute)
+ d.setUTCSeconds(0);
+ if (step >= timeUnitSize.hour)
+ d.setUTCMinutes(0);
+ if (step >= timeUnitSize.day)
+ d.setUTCHours(0);
+ if (step >= timeUnitSize.day * 4)
+ d.setUTCDate(1);
+ if (step >= timeUnitSize.year)
+ d.setUTCMonth(0);
+
+
+ var carry = 0, v = Number.NaN, prev;
+ do {
+ prev = v;
+ v = d.getTime();
+ ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+ if (unit == "month") {
+ if (tickSize < 1) {
+ // a bit complicated - we'll divide the month
+ // up but we need to take care of fractions
+ // so we don't end up in the middle of a day
+ d.setUTCDate(1);
+ var start = d.getTime();
+ d.setUTCMonth(d.getUTCMonth() + 1);
+ var end = d.getTime();
+ d.setTime(v + carry * timeUnitSize.hour + (end - start) * tickSize);
+ carry = d.getUTCHours();
+ d.setUTCHours(0);
+ }
+ else
+ d.setUTCMonth(d.getUTCMonth() + tickSize);
+ }
+ else if (unit == "year") {
+ d.setUTCFullYear(d.getUTCFullYear() + tickSize);
+ }
+ else
+ d.setTime(v + step);
+ } while (v < axis.max && v != prev);
+
+ return ticks;
+ };
+
+ formatter = function (v, axis) {
+ var d = new Date(v);
+
+ // first check global format
+ if (axisOptions.timeformat != null)
+ return $.plot.formatDate(d, axisOptions.timeformat, axisOptions.monthNames);
+
+ var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]];
+ var span = axis.max - axis.min;
+ var suffix = (axisOptions.twelveHourClock) ? " %p" : "";
+
+ if (t < timeUnitSize.minute)
+ fmt = "%h:%M:%S" + suffix;
+ else if (t < timeUnitSize.day) {
+ if (span < 2 * timeUnitSize.day)
+ fmt = "%h:%M" + suffix;
+ else
+ fmt = "%b %d %h:%M" + suffix;
+ }
+ else if (t < timeUnitSize.month)
+ fmt = "%b %d";
+ else if (t < timeUnitSize.year) {
+ if (span < timeUnitSize.year)
+ fmt = "%b";
+ else
+ fmt = "%b %y";
+ }
+ else
+ fmt = "%y";
+
+ return $.plot.formatDate(d, fmt, axisOptions.monthNames);
+ };
+ }
+ else {
+ // pretty rounding of base-10 numbers
+ var maxDec = axisOptions.tickDecimals;
+ var dec = -Math.floor(Math.log(delta) / Math.LN10);
+ if (maxDec != null && dec > maxDec)
+ dec = maxDec;
+
+ magn = Math.pow(10, -dec);
+ norm = delta / magn; // norm is between 1.0 and 10.0
+
+ if (norm < 1.5)
+ size = 1;
+ else if (norm < 3) {
+ size = 2;
+ // special case for 2.5, requires an extra decimal
+ if (norm > 2.25 && (maxDec == null || dec + 1 <= maxDec)) {
+ size = 2.5;
+ ++dec;
+ }
+ }
+ else if (norm < 7.5)
+ size = 5;
+ else
+ size = 10;
+
+ size *= magn;
+
+ if (axisOptions.minTickSize != null && size < axisOptions.minTickSize)
+ size = axisOptions.minTickSize;
+
+ if (axisOptions.tickSize != null)
+ size = axisOptions.tickSize;
+
+ axis.tickDecimals = Math.max(0, (maxDec != null) ? maxDec : dec);
+
+ generator = function (axis) {
+ var ticks = [];
+
+ // spew out all possible ticks
+ var start = floorInBase(axis.min, axis.tickSize),
+ i = 0, v = Number.NaN, prev;
+ do {
+ prev = v;
+ v = start + i * axis.tickSize;
+ ticks.push({ v: v, label: axis.tickFormatter(v, axis) });
+ ++i;
+ } while (v < axis.max && v != prev);
+ return ticks;
+ };
+
+ formatter = function (v, axis) {
+ return v.toFixed(axis.tickDecimals);
+ };
+ }
+
+ axis.tickSize = unit ? [size, unit] : size;
+ axis.tickGenerator = generator;
+ if ($.isFunction(axisOptions.tickFormatter))
+ axis.tickFormatter = function (v, axis) { return "" + axisOptions.tickFormatter(v, axis); };
+ else
+ axis.tickFormatter = formatter;
+ }
+
+ function setTicks(axis, axisOptions) {
+ axis.ticks = [];
+
+ if (!axis.used)
+ return;
+
+ if (axisOptions.ticks == null)
+ axis.ticks = axis.tickGenerator(axis);
+ else if (typeof axisOptions.ticks == "number") {
+ if (axisOptions.ticks > 0)
+ axis.ticks = axis.tickGenerator(axis);
+ }
+ else if (axisOptions.ticks) {
+ var ticks = axisOptions.ticks;
+
+ if ($.isFunction(ticks))
+ // generate the ticks
+ ticks = ticks({ min: axis.min, max: axis.max });
+
+ // clean up the user-supplied ticks, copy them over
+ var i, v;
+ for (i = 0; i < ticks.length; ++i) {
+ var label = null;
+ var t = ticks[i];
+ if (typeof t == "object") {
+ v = t[0];
+ if (t.length > 1)
+ label = t[1];
+ }
+ else
+ v = t;
+ if (label == null)
+ label = axis.tickFormatter(v, axis);
+ axis.ticks[i] = { v: v, label: label };
+ }
+ }
+
+ if (axisOptions.autoscaleMargin != null && axis.ticks.length > 0) {
+ // snap to ticks
+ if (axisOptions.min == null)
+ axis.min = Math.min(axis.min, axis.ticks[0].v);
+ if (axisOptions.max == null && axis.ticks.length > 1)
+ axis.max = Math.max(axis.max, axis.ticks[axis.ticks.length - 1].v);
+ }
+ }
+
+ function draw() {
+ ctx.clearRect(0, 0, canvasWidth, canvasHeight);
+
+ var grid = options.grid;
+
+ if (grid.show && !grid.aboveData)
+ drawGrid();
+
+ for (var i = 0; i < series.length; ++i)
+ drawSeries(series[i]);
+
+ executeHooks(hooks.draw, [ctx]);
+
+ if (grid.show && grid.aboveData)
+ drawGrid();
+ }
+
+ function extractRange(ranges, coord) {
+ var firstAxis = coord + "axis",
+ secondaryAxis = coord + "2axis",
+ axis, from, to, reverse;
+
+ if (ranges[firstAxis]) {
+ axis = axes[firstAxis];
+ from = ranges[firstAxis].from;
+ to = ranges[firstAxis].to;
+ }
+ else if (ranges[secondaryAxis]) {
+ axis = axes[secondaryAxis];
+ from = ranges[secondaryAxis].from;
+ to = ranges[secondaryAxis].to;
+ }
+ else {
+ // backwards-compat stuff - to be removed in future
+ axis = axes[firstAxis];
+ from = ranges[coord + "1"];
+ to = ranges[coord + "2"];
+ }
+
+ // auto-reverse as an added bonus
+ if (from != null && to != null && from > to)
+ return { from: to, to: from, axis: axis };
+
+ return { from: from, to: to, axis: axis };
+ }
+
+ function drawGrid() {
+ var i;
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ // draw background, if any
+ if (options.grid.backgroundColor) {
+ ctx.fillStyle = getColorOrGradient(options.grid.backgroundColor, plotHeight, 0, "rgba(255, 255, 255, 0)");
+ ctx.fillRect(0, 0, plotWidth, plotHeight);
+ }
+
+ // draw markings
+ var markings = options.grid.markings;
+ if (markings) {
+ if ($.isFunction(markings))
+ // xmin etc. are backwards-compatible, to be removed in future
+ markings = markings({ xmin: axes.xaxis.min, xmax: axes.xaxis.max, ymin: axes.yaxis.min, ymax: axes.yaxis.max, xaxis: axes.xaxis, yaxis: axes.yaxis, x2axis: axes.x2axis, y2axis: axes.y2axis });
+
+ for (i = 0; i < markings.length; ++i) {
+ var m = markings[i],
+ xrange = extractRange(m, "...
[truncated message content] |
|
From: <ma...@us...> - 2010-12-03 23:44:26
|
Revision: 183
http://openautomation.svn.sourceforge.net/openautomation/?rev=183&view=rev
Author: mayerch
Date: 2010-12-03 23:44:20 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
initial (= experimental) support for popups
Modified Paths:
--------------
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/lib/templateengine.js
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2010-12-03 16:03:14 UTC (rev 182)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2010-12-03 23:44:20 UTC (rev 183)
@@ -258,4 +258,30 @@
div#loading {
display: none !important;
+}
+
+.popup {
+ position: absolute;
+ width: 90%;
+ height: 90%;
+ top: 5%;
+ left: 5%;
+ z-index: 100;
+ -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px;
+ background: #000;
+ border: 1px solid #fff;
+ opacity: 0.75;
+}
+
+.popup div {
+ margin: 4px;
+}
+
+.popup div.head {
+ border-bottom: 1px solid;
+}
+
+.popup.error {
+ background: #800000;
+ border: #f00;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-03 16:03:14 UTC (rev 182)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-03 23:44:20 UTC (rev 183)
@@ -32,6 +32,22 @@
return this.creators[name];
}
+ this.popups = {};
+
+ this.addPopup = function (name, object) {
+ this.popups[name] = object;
+ this.popups[name].type = name;
+console.log( name );
+console.log( this.popups[name] );
+ }
+
+ this.getPopup = function(name) {
+ if (typeof this.popups[name] == undefined) {
+ return this.popups.unknown;
+ }
+ return this.popups[name];
+ }
+
/**
* The creators object contians all widgets creators and their mappin to the
* XML config file tags
@@ -326,6 +342,28 @@
content: {type: "string", required: true}
});
+ this.addPopup('unknown', {
+ create: function( attributes ) {
+ var ret_val = $('<div class="popup" />');
+ ret_val.addClass( this.type );
+ if( attributes['title'] ) ret_val.append( $('<div class="head">' + attributes['title'] + '</div>') );
+ var content = '';
+ if( attributes['content'] ) content = attributes['content'];
+ ret_val.append( '<div class="main">' + content + '</div>' );
+ return ret_val;
+ },
+ attributes: {
+ title: {type: 'string', required: false},
+ content: {type: 'string', required: false},
+ width: {type: 'string', required: false},
+ height: {type: 'string', required: false}
+ }
+ });
+
+ this.addPopup('info' , this.getPopup('unknown') );
+ this.addPopup('warning', this.getPopup('unknown') );
+ this.addPopup('error' , this.getPopup('unknown') ) ;
+
this.switchAction = function() {
var data = $(this).data();
// alert( data.GA + ' = ' + data.value );
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2010-12-03 16:03:14 UTC (rev 182)
+++ CometVisu/trunk/visu/lib/templateengine.js 2010-12-03 23:44:20 UTC (rev 183)
@@ -296,6 +296,28 @@
}
}
+/**
+ * Show a popup of type "type".
+ * The attributes is an type dependend object
+ * This function returnes a jQuery object that points to the whole popup,
+ * so it's content can be easily extended
+ */
+function showPopup( type, attributes )
+{
+ //var retval = design.popups[ type ].create( attributes ); //page, path );
+ //return retval;
+ return design.popups[ type ].create( attributes ).appendTo('body');
+}
+
+/**
+ * Remove the popup.
+ * The parameter is the jQuery object returned by the showPopup function
+ */
+function removePopup( jQuery_object )
+{
+ jQuery_object.remove();
+}
+
/****************************************************************************/
/* FIXME - Question: should this belong to the VisuDesign object so that it */
/* is possible to overload?!? */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-03 16:23:02
|
Revision: 182
http://openautomation.svn.sourceforge.net/openautomation/?rev=182&view=rev
Author: mayerch
Date: 2010-12-03 16:03:14 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
New Feature: iframe widget
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-12-03 16:01:50 UTC (rev 181)
+++ CometVisu/trunk/ChangeLog 2010-12-03 16:03:14 UTC (rev 182)
@@ -4,6 +4,7 @@
- New Feature: Plugins
- New Plugin: colorChooser (based on farbtastic)
- New Feature: user settable status bar (i.e. footer)
+- New Feature: iframe widget
0.5.1
=====
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2010-12-03 16:01:57
|
Revision: 181
http://openautomation.svn.sourceforge.net/openautomation/?rev=181&view=rev
Author: mayerch
Date: 2010-12-03 16:01:50 +0000 (Fri, 03 Dec 2010)
Log Message:
-----------
New Feature:iframe widget
Modified Paths:
--------------
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config.xml
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/visu/designs/structure_pure.js
===================================================================
--- CometVisu/trunk/visu/designs/structure_pure.js 2010-12-03 13:59:22 UTC (rev 180)
+++ CometVisu/trunk/visu/designs/structure_pure.js 2010-12-03 16:01:50 UTC (rev 181)
@@ -294,6 +294,27 @@
content: {type: "string", required: true}
});
+ this.addCreator("iframe", {
+ create: function( page, path ) {
+ var ret_val = $('<div class="widget" />');
+ ret_val.addClass( 'iframe' );
+ ret_val.append( '<div class="label">' + page.textContent + '</div>' );
+ var style = '';
+ if( $(page).attr('width') ) style += 'width:' + $(page).attr('width') + ';';
+ if( $(page).attr('height') ) style += 'height:' + $(page).attr('height') + ';';
+ if( style != '' ) style = 'style="' + style + '"';
+ var actor = '<div class="actor"><iframe src="' +$(page).attr('src') + '" ' + style + '></iframe></div>';
+ ret_val.append( $(actor) ); // abuse "each" to call in context...
+ return ret_val;
+ },
+ attributes: {
+ src: {type: "uri", required: true},
+ width: {type: "string", required: false},
+ height: {type: "string", required: false},
+ },
+ content: {type: "string", required: false}
+ });
+
this.addCreator("unknown", {
create: function( page, path ) {
var ret_val = $('<div class="widget" />');
Modified: CometVisu/trunk/visu/visu_config.xml
===================================================================
--- CometVisu/trunk/visu/visu_config.xml 2010-12-03 13:59:22 UTC (rev 180)
+++ CometVisu/trunk/visu/visu_config.xml 2010-12-03 16:01:50 UTC (rev 181)
@@ -87,6 +87,9 @@
<break />
<image src="http://www.yr.no/place/Germany/Bavaria/Holzkirchen~2899676/meteogram.png" refresh="1800" />
<line />
+ <page name="iframe Test">
+ <iframe src="http://www.cometvisu.org" width="500px" height="500px"></iframe>
+ </page>
<info address="1/0/41" datatype="1.000" mapping="OnOff">Treppenlicht</info>
<page name="Fenster Kontakte" flavour="blue">
<info address="4/3/10" datatype="1" mapping="OpenClose" styling="GreenRed">Bad EG Reed Fenster</info>
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2010-12-03 13:59:22 UTC (rev 180)
+++ CometVisu/trunk/visu/visu_config.xsd 2010-12-03 16:01:50 UTC (rev 181)
@@ -218,6 +218,16 @@
</xsd:simpleContent>
</xsd:complexType>
+<xsd:complexType name="iframe">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute name="src" type="uri" use="required" />
+ <xsd:attribute name="width" type="dimension" />
+ <xsd:attribute name="height" type="dimension" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
<xsd:complexType name="break" />
<xsd:complexType name="line" />
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.
