Menu
▾
▴
openautomation-svn
|
From: <net...@us...> - 2010-11-01 21:14:37
|
Revision: 64
http://openautomation.svn.sourceforge.net/openautomation/?rev=64&view=rev
Author: netzkind
Date: 2010-11-01 21:14:31 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Added XML-Schema/XSD to validate config-XML
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
Added Paths:
-----------
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-11-01 17:37:41 UTC (rev 63)
+++ CometVisu/trunk/ChangeLog 2010-11-01 21:14:31 UTC (rev 64)
@@ -8,6 +8,7 @@
- New Feature: tag for "line" break
- New Feature: tag for images
- New Feature: <text> has new optional attribute "align"
+- Added XML Schema / XSD to validate config-XML
0.5.0
=====
Added: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd (rev 0)
+++ CometVisu/trunk/visu/visu_config.xsd 2010-11-01 21:14:31 UTC (rev 64)
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<!-- basic types -->
+<xsd:simpleType name="address">
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="[0-9]{1,2}/[0-9]{1,2}/[0-9]{1,2}" />
+ </xsd:restriction>
+</xsd:simpleType>
+
+<xsd:simpleType name="dimension">
+ <xsd:restriction base="xsd:string" />
+</xsd:simpleType>
+<xsd:simpleType name="uri">
+ <xsd:restriction base="xsd:string" />
+</xsd:simpleType>
+
+<xsd:complexType name="entry">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute ref="value" use="required" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
+<!-- simple elements -->
+
+
+<!-- attributes -->
+<xsd:attribute name="address" type="address" />
+<xsd:attribute name="datatype" type="xsd:decimal" />
+<xsd:attribute name="response_address" type="address" />
+<xsd:attribute name="response_datatype" type="xsd:decimal" />
+
+<xsd:attribute name="pre" type="xsd:string" />
+<xsd:attribute name="post" type="xsd:string" />
+
+<xsd:attribute name="min" type="xsd:decimal" />
+<xsd:attribute name="max" type="xsd:decimal" />
+<xsd:attribute name="step" type="xsd:decimal" />
+
+<xsd:attribute name="mapping" type="xsd:string" />
+<xsd:attribute name="style" type="xsd:string" />
+<xsd:attribute name="value" type="xsd:string" />
+
+<!-- complex elements -->
+<xsd:element name="pages">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element ref="mappings" />
+ <xsd:element ref="styles" />
+ <xsd:element ref="page" minOccurs="1" />
+ </xsd:choice>
+ </xsd:complexType>
+</xsd:element>
+
+<xsd:element name="mappings">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element ref="mapping" />
+ </xsd:choice>
+ </xsd:complexType>
+</xsd:element>
+
+<xsd:element name="mapping">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="entry" type="entry" minOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+</xsd:element>
+
+<xsd:element name="styles">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element ref="style" />
+ </xsd:choice>
+ </xsd:complexType>
+</xsd:element>
+
+<xsd:element name="style">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="entry" type="entry" minOccurs="1" />
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+</xsd:element>
+
+<!-- define a page - if you add a new widget, you need to list it here -->
+<xsd:element name="page">
+ <xsd:complexType>
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <!-- list all possbile widgets here -->
+ <xsd:element name="text" type="xsd:string" />
+ <xsd:element name="line" type="line" />
+ <xsd:element name="switch" type="switch" />
+ <xsd:element name="toggle" type="switch" />
+ <xsd:element name="trigger" type="trigger" />
+ <xsd:element name="dim" type="dim" />
+ <xsd:element name="slider" type="dim" />
+ <xsd:element name="info" type="info" />
+ <xsd:element name="shade" type="info" />
+ <xsd:element name="image" type="image" />
+ <xsd:element name="break" type="break" />
+ <xsd:element ref="page" />
+ </xsd:choice>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+</xsd:element>
+
+<!-- more fun part - all widgets - if you add a new widget, you need to define it here -->
+
+<xsd:complexType name="switch">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute ref="address" use="required" />
+ <xsd:attribute ref="datatype" use="required" />
+ <xsd:attribute ref="response_address" use="required" />
+ <xsd:attribute ref="response_datatype" use="required" />
+ <xsd:attribute ref="pre" />
+ <xsd:attribute ref="post" />
+ <xsd:attribute ref="mapping" />
+ <xsd:attribute ref="style" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
+
+<xsd:complexType name="trigger">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute ref="address" use="required" />
+ <xsd:attribute ref="datatype" use="required" />
+ <xsd:attribute ref="value" use="required" />
+ <xsd:attribute ref="pre" />
+ <xsd:attribute ref="post" />
+ <xsd:attribute ref="mapping" />
+ <xsd:attribute ref="style" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
+<xsd:complexType name="dim">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute ref="address" use="required" />
+ <xsd:attribute ref="datatype" use="required" />
+ <xsd:attribute ref="response_address" use="required" />
+ <xsd:attribute ref="response_datatype" use="required" />
+ <xsd:attribute ref="min" />
+ <xsd:attribute ref="max" />
+ <xsd:attribute ref="step" />
+ <xsd:attribute ref="mapping" />
+ <xsd:attribute ref="style" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
+<xsd:complexType name="info">
+ <xsd:simpleContent>
+ <xsd:extension base="xsd:string">
+ <xsd:attribute ref="address" use="required" />
+ <xsd:attribute ref="datatype" use="required" />
+ <xsd:attribute ref="pre" />
+ <xsd:attribute ref="post" />
+ <xsd:attribute ref="mapping" />
+ <xsd:attribute ref="style" />
+ </xsd:extension>
+ </xsd:simpleContent>
+</xsd:complexType>
+
+<xsd:complexType name="image">
+ <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" />
+
+<!-- toggle is not yet implemented -->
+<!-- shade is not yet implemented -->
+<!-- slider is not yet implemented -->
+
+</xsd:schema>
\ 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-11-06 18:08:58
|
Revision: 87
http://openautomation.svn.sourceforge.net/openautomation/?rev=87&view=rev
Author: netzkind
Date: 2010-11-06 18:08:50 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
rewrite of editor-code, now auto-extensible; changed handling of creators in visudesign_pure; added automatic DPT and GA-dropdown; added validation for input-values
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/edit/save_config.php
CometVisu/trunk/visu/edit/style_edit.css
CometVisu/trunk/visu/edit/visuconfig_edit.js
CometVisu/trunk/visu/edit_config.html
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/lib/visudesign_custom.js
CometVisu/trunk/visu/lib/visudesign_pure.js
CometVisu/trunk/visu/visu_config.xsd
Added Paths:
-----------
CometVisu/trunk/visu/edit/get_addresses.php
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-11-06 17:01:33 UTC (rev 86)
+++ CometVisu/trunk/ChangeLog 2010-11-06 18:08:50 UTC (rev 87)
@@ -1,7 +1,7 @@
HEAD
====
-- New Feature: editor
+- New Feature: editor (easily extensible)
- New Feature: generic slide widget
- New Feature: slide and dim widgets allow range and step attributes
- New Feature: ranges for mapping and style
@@ -10,6 +10,7 @@
- New Feature: <text> has new optional attribute "align"
- Added XML Schema / XSD to validate config-XML
- New Feature: tag for videos (HTML5 based)
+- changed procedures for creating new widgets
0.5.0
=====
Added: CometVisu/trunk/visu/edit/get_addresses.php
===================================================================
--- CometVisu/trunk/visu/edit/get_addresses.php (rev 0)
+++ CometVisu/trunk/visu/edit/get_addresses.php 2010-11-06 18:08:50 UTC (rev 87)
@@ -0,0 +1,35 @@
+<?php
+define('FILE_GA', "/etc/wiregate/eibga.conf");
+define('FILE_HG', "/etc/wiregate/eibga_hg.conf");
+define('FILE_MG', "/etc/wiregate/eibga_mg.conf");
+
+$arrGA = parse_ini_file(FILE_GA, true);
+$arrHG = parse_ini_file(FILE_HG, true);
+$arrMG = parse_ini_file(FILE_MG, true);
+
+
+$arrAdresses = array();
+foreach ($arrGA as $strGA => $arrData) {
+ $arrGAParts = explode("/", $strGA, 3);
+
+ $strHG = "";
+ if (true === isset($arrHG[$arrGAParts[0]])) {
+ $strHG = utf8_encode($arrHG[$arrGAParts[0]]['name']);
+ }
+
+ $strMG = "";
+ if (true === isset($arrMG[$arrGAParts[1]])) {
+ $strMG = utf8_encode($arrMG[$arrGAParts[1]]['name']);
+ }
+
+ $arrAdresses[$strHG][$strMG][] = array(
+ "address" => $strGA,
+ "name" => utf8_encode($arrData['name']),
+ "dpt" => $arrData['DPTSubId']
+ );
+}
+
+print json_encode($arrAdresses);
+exit;
+
+?>
Modified: CometVisu/trunk/visu/edit/save_config.php
===================================================================
--- CometVisu/trunk/visu/edit/save_config.php 2010-11-06 17:01:33 UTC (rev 86)
+++ CometVisu/trunk/visu/edit/save_config.php 2010-11-06 18:08:50 UTC (rev 87)
@@ -125,6 +125,11 @@
// Parameter die mit "_" beginnen sind special purpose
continue;
}
+
+ if ($strAttribute === "textContent") {
+ $objXML->nodeValue = $strValue;
+ continue;
+ }
$objXML->setAttribute($strAttribute, $strValue);
}
Modified: CometVisu/trunk/visu/edit/style_edit.css
===================================================================
--- CometVisu/trunk/visu/edit/style_edit.css 2010-11-06 17:01:33 UTC (rev 86)
+++ CometVisu/trunk/visu/edit/style_edit.css 2010-11-06 18:08:50 UTC (rev 87)
@@ -9,6 +9,8 @@
filter: alpha(opacity=50);
opacity: 0.5;
text-align: center;
+ float: none !important;
+ padding: 0 !important;
}
.editcontrol {
@@ -62,7 +64,7 @@
width: 1.5em;
}
-div#addDummy {
+div#addMaster {
border: 1px solid #444;
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
Modified: CometVisu/trunk/visu/edit/visuconfig_edit.js
===================================================================
--- CometVisu/trunk/visu/edit/visuconfig_edit.js 2010-11-06 17:01:33 UTC (rev 86)
+++ CometVisu/trunk/visu/edit/visuconfig_edit.js 2010-11-06 18:08:50 UTC (rev 87)
@@ -4,7 +4,10 @@
confirm_save: "Save config?",
prompt_rename: "Rename page '%s' to ...",
save_good: "Config has been successfully saved.",
- save_bad: "Config not saved. Error: '%s'"
+ save_bad: "Config not saved. Error: '%s'",
+ value_required: "Field '%s' is required but empty. Please correct your input.",
+ value_invalid: "The value for field '%s' is invalid. Please correct your input.",
+ regexp_invalid: "There something wrong with the cable."
}
if (typeof texts[element] == "undefined") {
@@ -20,10 +23,12 @@
return myText;
}
+var addressesCache;
+
jQuery(document).ready(function() {
jQuery("div#addwidgetcontrol").bind("click", function() {
- jQuery("#addDummy").trigger("show").find("#add_type").triggerHandler("change");
+ jQuery("#addMaster").trigger("show").find("#add_type").triggerHandler("change");
});
$("#saveconfigcontrol").bind("click", function () {
@@ -33,7 +38,19 @@
}
});
+ // get all GA from the server
+ $.getJSON('edit/get_addresses.php', function(data) { addressesCache = data});
+
jQuery("#pages").bind("done", function() {
+ $("#pages hr, #pages br").each(function() {
+ if ($(this).closest(".widget").length == 0) {
+ $(this).wrap("<div class=\"widget line\" />");
+ var d = $.extend({}, $(this).data());
+ $(this).closest("div.widget").data(d);
+ }
+ });
+
+
jQuery(".page div").sortable({
handle: ".movecontrol",
items: '.widget',
@@ -54,13 +71,27 @@
jQuery(this).css("background-color", jQuery(this).data("background-color-old"));
jQuery(this).find("div.editcontrol, div.movecontrol, div.removecontrol").remove();
});
+
+ var options = {};
+ $("#addMaster").find("select#add_type").empty();
+ jQuery.each(design.creators, function (index, e) {
+ $("#addMaster").find("select#add_type").append(
+ $("<option />").attr("value", index).html(index)
+ );
+ });
});
jQuery(".removecontrol").live("click", function() {
var widget = $(this).parents("div.widget");
var data = getWidgetData(widget, true);
- var b = confirm(lingua("confirm_delete", data._text));
+ var t;
+ if (data._type == "page") {
+ t = data.name;
+ } else {
+ t = data.textContent;
+ }
+ var b = confirm(lingua("confirm_delete", t));
if (b) {
widget.remove();
}
@@ -68,6 +99,7 @@
jQuery(".editcontrol").live("click", function() {
+
var widget = $(this).parents("div.widget");
if (widget.is(".pagelink")) {
return renamePage(widget);
@@ -78,29 +110,21 @@
// kennzeichnen welches Element grade bearbeitet wird
widget.addClass("inedit");
- jQuery.each(data, function(i, element) {
- // alle bekannten Einstellungen in die Maske einfügen
- $("#addDummy").find("#add_" + i).val(element);
- });
+ $("#addMaster").data("widgetdata", data);
- if (typeof data._text != "undefined") {
- // text ist in einem Sonderfeld abgelegt
- $("#addDummy #add_text").val(data._text)
- }
+ $("#addMaster #add_type").find("option[value=" + data._type + "]").attr("selected", "selected");
- $("#addDummy #add_type").find("option[value=" + data._type + "]").attr("selected", "selected").trigger("change");
-
- $("#addDummy").triggerHandler("show");
+ $("#addMaster").triggerHandler("show");
});
jQuery("#pages").bind("done", function() {
// die Selectlisten vorbelegen
- $("#addDummy #add_mapping, #addDummy #add_style").empty().append($("<option />").attr("value", "").html("-"));
+ $("#addMaster #add_mapping, #addMaster #add_style").empty().append($("<option />").attr("value", "").html("-"));
jQuery.each(mappings, function(i, element) {
- $("#addDummy #add_mapping").append($("<option />").attr("value", i).html(i));
+ $("#addMaster #add_mapping").append($("<option />").attr("value", i).html(i));
});
jQuery.each(styles, function(i, element) {
- $("#addDummy #add_style").append($("<option />").attr("value", i).html(i));
+ $("#addMaster #add_style").append($("<option />").attr("value", i).html(i));
});
});
@@ -108,14 +132,21 @@
jQuery(function() {
- // dem AddDummy Leben einhauchen
- jQuery("#addDummy")
+ // dem addMaster Leben einhauchen
+ jQuery("#addMaster")
.bind("show", function() {
if ($("#pages .inedit").is(".widget")) {
$(this).find(".create").hide().end().find(".edit").show();
} else {
$(this).find(".create").show().end().find(".edit").hide();
}
+
+ // if we have widget-specific data, we must be in edit-mode
+ var widgetdata = $(this).data("widgetdata");
+ if (typeof widgetdata != "undefined") {
+ $(this).find("#add_type").find("option[value=" + widgetdata._type + "]").attr("selected", "selected").trigger("change");
+ }
+
$(this).show()
.find("#add_type").triggerHandler("change")
jQuery(".page div").sortable("destroy");
@@ -126,73 +157,162 @@
$("#pages").triggerHandler("done");
})
.bind("cleanup", function() {
+ $(this).removeData("widgetdata");
jQuery(this).find("input[type=text]").val("");
$("#pages").find(".inedit").removeClass("inedit");
})
.find("#add_cancel").click(function() {
- jQuery("#addDummy").trigger("hide").trigger("cleanup")
+ jQuery("#addMaster").trigger("hide").trigger("cleanup")
})
.end()
.find("#add_type").change(function() {
+ // the type has been changed
+ // we need to change the input-field accordingly to match
+ // what attributes we need
var val = jQuery(this).val();
- var divSelector = "";
- switch (val) {
- case 'switch':
- case 'toggle':
- divSelector = ".add_text, .add_address, .add_datatype, .add_response_address, .add_response_datatype, .add_pre, .add_post, .add_mapping, .add_style";
- break;
- case 'dim':
- case 'slide':
- divSelector = ".add_text, .add_address, .add_datatype, .add_response_address, .add_response_datatype, .add_pre, .add_post, .add_mapping, .add_style, .add_min, .add_max, .add_step";
- break;
- case 'trigger':
- divSelector = ".add_text, .add_address, .add_datatype, .add_pre, .add_post, .add_mapping, .add_style, .add_value";
- break;
- case 'line':
- divSelector = "";
- break;
- case 'shade':
- divSelector = "";
- break;
- case 'info':
- divSelector = ".add_text, .add_address, .add_datatype, .add_pre, .add_post, .add_mapping, .add_style";
- break;
- case 'text':
- divSelector = ".add_text";
- break;
- case 'page':
- divSelector = ".add_text";
- break;
+ var creator = design.getCreator(val);
+ var attributes = creator.attributes;
+ if (typeof attributes == "undefined") {
+ alert("there's something wrong with the cable");
+ return;
}
- jQuery("#addDummy").find("div.add_inputs")
- .not(divSelector).hide()
- .find("input[type=text]").val("")
- .end()
- .end()
- .filter(divSelector).show();
+ var container = $("#addMaster div.inputs");
+ var values = $.extend({}, $("#addMaster").data("widgetdata"));
+
+ // alte Werte zwischenspeichern
+ container.find(":input").each(function() {
+ if ($(this).val() != "") {
+ var name = $(this).data("name");
+ values[name] = $(this).val();
+ }
+ })
+ container.empty();
+
+ if (creator.content == "string") {
+ var element = $("<div />").addClass("add_input").addClass("content")
+ .append($("<label />").attr("for", "add_textContent").html("text-content"))
+ .append($("<input type=\"text\" id=\"add_textContent\"/>"));
+ if (typeof values["textContent"] != "undefined") {
+ element.find("input").val(values["textContent"]);
+ }
+
+ container.append(element);
+ delete element;
+ }
+
+ $.each(attributes, function (index, e) {
+ var element = $("<div />").addClass("add_input").addClass("attribute")
+ .append($("<label />").attr("for", "add_" + index).html(index));
+
+ switch (e.type) {
+ case "address":
+ element.append($("<select id=\"add_" + index + "\" />")
+ .append($("<option />").attr("value", "").html("-")));
+
+ element.find("select:first").append(getAddressesObject());
+
+ element.find("select").bind("change", function() {
+ // on changing the address, the coresponding datatype-field is
+ // automagically set
+ var name = $(this).attr("id");
+ var dptFieldName = name.replace(/_?address$/i, "_datatype");
+ var dpt = $(this).find("option:selected").attr("class").replace(/[^dpt_\d+\.\d+]*/, "").replace(/^dpt_/, "");
+ $("#addMaster div.inputs #" + dptFieldName).val(dpt);
+ });
+
+ if (typeof values[index] != "undefined") {
+ element.find("option[value=" + values[index] + "]").attr("selected", "selected");
+ }
+
+ break;
+
+ case "mapping":
+ element.append($("<select id=\"add_mapping\" />")
+ .append($("<option />").attr("value", "").html("-")));
+ jQuery.each(mappings, function(i, tmp) {
+ element.find("select#add_mapping").append($("<option />").attr("value", i).html(i));
+ });
+
+ if (typeof values[index] != "undefined") {
+ element.find("option[value=" + values[index] + "]").attr("selected", "selected");
+ }
+
+ break;
+
+ case "style":
+ element.append($("<select id=\"add_style\" />")
+ .append($("<option />").attr("value", "").html("-")));
+ jQuery.each(styles, function(i, tmp) {
+ element.find("select#add_style").append($("<option />").attr("value", i).html(i));
+ });
+
+ if (typeof values[index] != "undefined") {
+ element.find("option[value=" + values[index] + "]").attr("selected", "selected");
+ }
+
+ break;
+
+ default:
+ element.append($("<input type=\"text\" id=\"add_" + index + "\" />"));
+
+ if (typeof values[index] != "undefined") {
+ element.find("input").val(values[index]);
+ }
+
+ break;
+ }
+
+ element.find(":input")
+ .data("name", index)
+ .data("required", e.required)
+ .data("type", e.type);
+
+ container.append(element);
+ delete element;
+ });
})
.end()
.find("#add_submit").click(function() {
// Daten aus den Eingabefeldner übernehmen
- // einfach alle rein - das Design weiß schon welche Daten es benötigt
+ // einfach alle rein - wir haben ja nur die passenden Felder
+
+ var container = $("#addMaster div.inputs");
+
var dataObject = {
- value: jQuery("#addDummy input#add_value").val(),
- address: jQuery("#addDummy input#add_address").val(),
- datatype: jQuery("#addDummy input#add_datatype").val(),
- response_address: jQuery("#addDummy input#add_response_address").val(),
- response_datatype: jQuery("#addDummy input#add_response_datatype").val(),
- pre: jQuery("#addDummy input#add_pre").val(),
- post: jQuery("#addDummy input#add_post").val(),
- mapping: jQuery("#addDummy select#add_mapping").val(),
- design: jQuery("#addDummy select#add_style").val(),
- min: jQuery("#addDummy input#add_min").val(),
- max: jQuery("#addDummy input#add_max").val(),
- step: jQuery("#addDummy input#add_step").val(),
- textContent: jQuery("#addDummy input#add_text").val(),
- nodeName: jQuery("#addDummy #add_type").val(),
- name: jQuery("#addDummy input#add_text").val() // wird nur bei page benötigt
- };
+ nodeName: jQuery("#addMaster #add_type").val()
+ };
+
+ var error = false;
+
+ // alte Werte zwischenspeichern
+ container.find(":input").each(function() {
+ var name;
+ if ($(this).closest("div.add_input").hasClass("attribute")) {
+ name = $(this).data("name");
+ } else if ($(this).closest("div.add_input").hasClass("content")) {
+ name = "textContent";
+ }
+
+ if ($(this).val() != "") {
+ // validating
+ if (false === isInputValid($(this).val(), $(this).data("type"))) {
+ alert(lingua("value_invalid", name));
+ // do not save
+ error = true;
+ }
+ dataObject[name] = $(this).val();
+ } else if ($(this).data("required") === true) {
+ // do not save
+ alert(lingua("value_required", name));
+ error = true;
+ }
+ })
+
+ if (error !== false) {
+ return;
+ }
+
// als path verwenden wir einfach den aktuellen UNIX-Timestamp
// der wird nicht schon belegt sein
var path = $(".page:visible:last").attr("id");
@@ -210,12 +330,55 @@
jQuery("#pages").triggerHandler("done");
// und dann noch mich wieder verstecken
- jQuery("#addDummy").trigger("hide").trigger("cleanup");
+ jQuery("#addMaster").trigger("hide").trigger("cleanup");
})
.end();
});
+/**
+ * check whether a user-given value matches the type-criterias and thus is valid
+ */
+function isInputValid(val, type) {
+ if (typeof type == "undefined" || type == null) {
+ // nicht mit Geistern rumschlagen
+ return true;
+ }
+ if (typeof type == "object") {
+ // wohl ein regulärer Ausdruck
+ try {
+ if (val.match(type)) {
+ return true;
+ } else {
+ return false;
+ }
+
+ } catch (e) {
+ alert(lingua("regexp_invalid"));
+ return false;
+ }
+ }
+
+ switch (type) {
+ case "address":
+ return !Boolean(val.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-9]{1,2}$/));
+ break;
+ case "numeric":
+ return Boolean(val.match(/^\d+([\.,]\d+)?$/g));
+ break;
+ case "string":
+ case "uri":
+ return Boolean(typeof val == "string");
+ break;
+ case "mapping":
+ return Boolean(typeof mappings[val] != "undefined");
+ break;
+ case "style":
+ return Boolean(typeof styles[val] != "undefined");
+ break;
+ }
+}
+
function saveConfig() {
var configData = createObjectFromPage("#0.page");
var configDataJSON = JSON.stringify(configData);
@@ -245,80 +408,17 @@
});
}
-function getWidgetData(element, nodive) {
+function getWidgetData(element) {
var myObj = {};
+
var e = $(element);
- var a = $(e).find(".actor");
- if (e.is("div.switch")) {
- // switch oder trigger
- if (a.data("type") == "trigger") {
- // trigger
- myObj = {
- address: a.data("GA"),
- datatype: a.data("datatype"),
- value: a.data("sendValue"),
- pre: e.data("pre"),
- post: e.data("post"),
- mapping: a.data("mapping"),
- style: a.data("style"),
- _text: e.find("div.label").text(),
- _type: "trigger"
- };
- } else {
- // switch
- myObj = {
- address: a.data("GA"),
- datatype: a.data("datatype"),
- pre: e.data("pre"),
- post: e.data("post"),
- mapping: a.data("mapping"),
- style: a.data("style"),
- response_address: e.data("response_address"),
- response_datatype: e.data("response_datatype"),
- _text: e.find("div.label").text(),
- _type: "switch"
- };
- }
- } else if (e.is("div.text")) {
- // text
- myObj = {
- _text: e.find("div.label").text(),
- _type: "text"
- };
- } else if (e.is("div.dim")) {
- // slider
- myObj = {
- address: a.data("GA"),
- datatype: a.data("datatype"),
- mapping: a.data("mapping"),
- style: a.data("style"),
- min: a.data("min"),
- max: a.data("max"),
- step: a.data("step"),
- response_address: e.data("response_address"),
- response_datatype: e.data("response_datatype"),
- _text: e.find("div.label").text(),
- _type: "dim"
- };
- } else if (e.is("div.info")) {
- // Info-Feld
- myObj = {
- address: a.data("GA"),
- datatype: a.data("datatype"),
- pre: e.data("pre"),
- post: e.data("post"),
- mapping: a.data("mapping"),
- style: a.data("style"),
- _text: e.find("div.label").text(),
- _type: "info"
- };
- } else if (e.is("div.line")) {
- // Trennlinie
- myObj = {
- _type: "line",
- _text: "line"
- }
- } else if (e.is(".pagelink")) {
+
+ myObj._type = e.data("nodeName");
+ myObj.textContent = e.data("textContent");
+ $.extend(myObj, e.data("attributes"));
+
+ if (e.is(".pagelink")) {
+ // it's a page, we need to dive in
// eine Sub-Seite
// versuchen die Seiten-Id durch den Link zu bekommen
var s = e.find("a");
@@ -334,19 +434,10 @@
if (subObject._elements.length > 0) {
myObj = subObject;
}
- } else if (nodive) {
- // wir sollen nicht rekursiv arbeiten,
- // aber dieses eine Objekt liefern wir zurück
- myObj = {
- _type: "page",
- _text: s.text(), // für edit-modus benötigt
- name: s.text()
- };
}
}
return myObj;
-
}
function createObjectFromPage(pageObject) {
@@ -378,7 +469,7 @@
function renamePage(widget) {
var data = getWidgetData(widget, true);
- var newText = prompt(lingua("prompt_rename", data._text), data._text);
+ var newText = prompt(lingua("prompt_rename", data.name), data.name);
if (!newText) {
return;
}
@@ -386,5 +477,35 @@
var path = widget.data("path");
widget.find("a").html(newText);
+ widget.data("name", newText);
$("#pages").find("#" + path + ".page").find("h1").html(newText);
+}
+
+var cachedAddressesObject;
+function getAddressesObject() {
+
+ if (typeof cachedAddressesObject == "object") {
+ return cachedAddressesObject.clone();
+ }
+
+ element = $("<select />");
+
+ $.each(addressesCache, function(hg, sub) {
+ $.each(sub, function(mg, addresses) {
+ element.append(
+ $("<optgroup />").attr("label", hg + " - " + mg)
+ );
+ $.each(addresses, function (i, address) {
+ element.find("optgroup:last")
+ .append($("<option />").attr("value", address.address)
+ .addClass("dpt_" + address.dpt)
+ .html(address.name)
+ )
+ });
+ });
+ });
+
+ cachedAddressesObject = element.children();
+
+ return cachedAddressesObject;
}
\ No newline at end of file
Modified: CometVisu/trunk/visu/edit_config.html
===================================================================
--- CometVisu/trunk/visu/edit_config.html 2010-11-06 17:01:33 UTC (rev 86)
+++ CometVisu/trunk/visu/edit_config.html 2010-11-06 18:08:50 UTC (rev 87)
@@ -13,7 +13,7 @@
<script src="lib/visuclient.js" type="text/javascript"></script>
<script src="lib/knx_decode.js" type="text/javascript"></script>
<script src="lib/visudesign_pure.js" type="text/javascript"></script>
- <script src="edit/visudesign_editmode.js" type="text/javascript"></script>
+ <script src="lib/visudesign_custom.js" type="text/javascript"></script>
<script src="lib/templateengine.js" type="text/javascript"></script>
<script src="edit/visuconfig_edit.js" type="text/javascript"></script>
<script src="edit/json2.js" type="text/javascript"></script>
@@ -35,7 +35,7 @@
</div>
</div>
- <div id="addDummy">
+ <div id="addMaster">
<form method="post" action="self">
<div class="addwidget">
<h2 class="create">Insert new widget</h2>
@@ -43,73 +43,13 @@
<div class="editcontrols">
<label for="add_type">Typ</label>
<select id="add_type">
- <option value="switch">switch</option>
- <option value="trigger">trigger</option>
- <option value="line">line</option>
- <option value="dim">slider/dimmer</option>
- <option value="shade">shade</option>
- <option value="info">info</option>
- <option value="text">text</option>
- <option value="page">page</option>
+ <option>-</option>
</select>
- <div class="add_inputs add_text">
- <label for="add_text">Text</label>
- <input type="text" id="add_text" />
- </div>
- <div class="add_inputs add_address">
- <label for="add_address">address</label>
- <input type="text" id="add_address" />
- </div>
- <div class="add_inputs add_datatype">
- <label for="add_datatype">DPT</label>
- <input type="text" id="add_datatype" />
- </div>
- <div class="add_inputs add_value">
- <label for="add_value">Value</label>
- <input type="text" id="add_value" />
- </div>
+ <div class="inputs">
- <div class="add_inputs add_response_address">
- <label for="add_response_address">response_address</label>
- <input type="text" id="add_response_address" />
</div>
- <div class="add_inputs add_response_datatype">
- <label for="add_response_datatype">response DPT</label>
- <input type="text" id="add_response_datatype" />
- </div>
- <div class="add_inputs add_min">
- <label for="add_min">mininmal value</label>
- <input type="text" id="add_min" />
- </div>
- <div class="add_inputs add_max">
- <label for="add_max">maximal value</label>
- <input type="text" id="add_max" />
- </div>
- <div class="add_inputs add_step">
- <label for="add_step">step size</label>
- <input type="text" id="add_step" />
- </div>
-
-
- ...
[truncated message content] |
|
From: <j-...@us...> - 2011-05-12 18:25:15
|
Revision: 332
http://openautomation.svn.sourceforge.net/openautomation/?rev=332&view=rev
Author: j-n-k
Date: 2011-05-12 18:25:06 +0000 (Thu, 12 May 2011)
Log Message:
-----------
updated config scheme, added documentaion for widgets
Modified Paths:
--------------
CometVisu/trunk/visu/visu_config.xsd
CometVisu/trunk/visu/visu_config_demo.xml
Added Paths:
-----------
CometVisu/trunk/documentation/
CometVisu/trunk/documentation/widgets.htm
Added: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm (rev 0)
+++ CometVisu/trunk/documentation/widgets.htm 2011-05-12 18:25:06 UTC (rev 332)
@@ -0,0 +1,1712 @@
+<html xmlns:v="urn:schemas-microsoft-com:vml"
+xmlns:o="urn:schemas-microsoft-com:office:office"
+xmlns:w="urn:schemas-microsoft-com:office:word"
+xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
+xmlns="http://www.w3.org/TR/REC-html40">
+
+<head>
+<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
+<meta name=ProgId content=Word.Document>
+<meta name=Generator content="Microsoft Word 12">
+<meta name=Originator content="Microsoft Word 12">
+<link rel=File-List href="widgets-Dateien/filelist.xml">
+<!--[if gte mso 9]><xml>
+ <o:DocumentProperties>
+ <o:Author>Jan N. Klug</o:Author>
+ <o:LastAuthor>Jan N. Klug</o:LastAuthor>
+ <o:Revision>2</o:Revision>
+ <o:Created>2011-05-12T10:58:00Z</o:Created>
+ <o:LastSaved>2011-05-12T10:58:00Z</o:LastSaved>
+ <o:Pages>2</o:Pages>
+ <o:Words>215</o:Words>
+ <o:Characters>1359</o:Characters>
+ <o:Lines>11</o:Lines>
+ <o:Paragraphs>3</o:Paragraphs>
+ <o:CharactersWithSpaces>1571</o:CharactersWithSpaces>
+ <o:Version>12.00</o:Version>
+ </o:DocumentProperties>
+</xml><![endif]-->
+<link rel=themeData href="widgets-Dateien/themedata.thmx">
+<link rel=colorSchemeMapping href="widgets-Dateien/colorschememapping.xml">
+<!--[if gte mso 9]><xml>
+ <w:WordDocument>
+ <w:TrackMoves>false</w:TrackMoves>
+ <w:TrackFormatting/>
+ <w:HyphenationZone>21</w:HyphenationZone>
+ <w:PunctuationKerning/>
+ <w:ValidateAgainstSchemas/>
+ <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
+ <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
+ <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
+ <w:DoNotPromoteQF/>
+ <w:LidThemeOther>DE</w:LidThemeOther>
+ <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
+ <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
+ <w:Compatibility>
+ <w:BreakWrappedTables/>
+ <w:SnapToGridInCell/>
+ <w:WrapTextWithPunct/>
+ <w:UseAsianBreakRules/>
+ <w:DontGrowAutofit/>
+ <w:SplitPgBreakAndParaMark/>
+ <w:DontVertAlignCellWithSp/>
+ <w:DontBreakConstrainedForcedTables/>
+ <w:DontVertAlignInTxbx/>
+ <w:Word11KerningPairs/>
+ <w:CachedColBalance/>
+ </w:Compatibility>
+ <m:mathPr>
+ <m:mathFont m:val="Cambria Math"/>
+ <m:brkBin m:val="before"/>
+ <m:brkBinSub m:val="--"/>
+ <m:smallFrac m:val="off"/>
+ <m:dispDef/>
+ <m:lMargin m:val="0"/>
+ <m:rMargin m:val="0"/>
+ <m:defJc m:val="centerGroup"/>
+ <m:wrapIndent m:val="1440"/>
+ <m:intLim m:val="subSup"/>
+ <m:naryLim m:val="undOvr"/>
+ </m:mathPr></w:WordDocument>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
+ DefSemiHidden="true" DefQFormat="false" DefPriority="99"
+ LatentStyleCount="267">
+ <w:LsdException Locked="false" Priority="0" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
+ <w:LsdException Locked="false" Priority="9" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
+ <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
+ <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
+ <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
+ <w:LsdException Locked="false" Priority="10" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Title"/>
+ <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
+ <w:LsdException Locked="false" Priority="11" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
+ <w:LsdException Locked="false" Priority="22" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
+ <w:LsdException Locked="false" Priority="20" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
+ <w:LsdException Locked="false" Priority="59" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Table Grid"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
+ <w:LsdException Locked="false" Priority="1" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 1"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
+ <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
+ <w:LsdException Locked="false" Priority="34" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
+ <w:LsdException Locked="false" Priority="29" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
+ <w:LsdException Locked="false" Priority="30" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 1"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 2"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 2"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 3"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 3"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 4"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 4"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 5"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 5"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
+ <w:LsdException Locked="false" Priority="60" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="61" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light List Accent 6"/>
+ <w:LsdException Locked="false" Priority="62" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="63" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="64" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="65" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="66" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="67" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
+ <w:LsdException Locked="false" Priority="68" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
+ <w:LsdException Locked="false" Priority="69" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
+ <w:LsdException Locked="false" Priority="70" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Dark List Accent 6"/>
+ <w:LsdException Locked="false" Priority="71" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
+ <w:LsdException Locked="false" Priority="72" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
+ <w:LsdException Locked="false" Priority="73" SemiHidden="false"
+ UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
+ <w:LsdException Locked="false" Priority="19" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
+ <w:LsdException Locked="false" Priority="21" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
+ <w:LsdException Locked="false" Priority="31" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
+ <w:LsdException Locked="false" Priority="32" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
+ <w:LsdException Locked="false" Priority="33" SemiHidden="false"
+ UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
+ <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
+ <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
+ </w:LatentStyles>
+</xml><![endif]-->
+<style>
+<!--
+ /* Font Definitions */
+ @font-face
+ {font-family:"Cambria Math";
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:roman;
+ mso-font-pitch:variable;
+ mso-font-signature:-536870145 1107305727 0 0 415 0;}
+@font-face
+ {font-family:Cambria;
+ panose-1:2 4 5 3 5 4 6 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:roman;
+ mso-font-pitch:variable;
+ mso-font-signature:-536870145 1073743103 0 0 415 0;}
+@font-face
+ {font-family:Calibri;
+ panose-1:2 15 5 2 2 2 4 3 2 4;
+ mso-font-charset:0;
+ mso-generic-font-family:swiss;
+ mso-font-pitch:variable;
+ mso-font-signature:-520092929 1073786111 9 0 415 0;}
+ /* Style Definitions */
+ p.MsoNormal, li.MsoNormal, div.MsoNormal
+ {mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ margin-top:0cm;
+ margin-right:0cm;
+ margin-bottom:10.0pt;
+ margin-left:0cm;
+ line-height:115%;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-fareast-font-family:Calibri;
+ mso-fareast-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+h1
+ {mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-qformat:yes;
+ mso-style-link:"\xDCberschrift 1 Zchn";
+ mso-style-next:Standard;
+ margin-top:24.0pt;
+ margin-right:0cm;
+ margin-bottom:0cm;
+ margin-left:0cm;
+ margin-bottom:.0001pt;
+ line-height:115%;
+ mso-pagination:widow-orphan lines-together;
+ page-break-after:avoid;
+ mso-outline-level:1;
+ font-size:14.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:"Times New Roman";
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#365F91;
+ mso-themecolor:accent1;
+ mso-themeshade:191;
+ mso-font-kerning:0pt;
+ mso-fareast-language:EN-US;}
+span.berschrift1Zchn
+ {mso-style-name:"\xDCberschrift 1 Zchn";
+ mso-style-priority:9;
+ mso-style-unhide:no;
+ mso-style-locked:yes;
+ mso-style-link:"\xDCberschrift 1";
+ mso-ansi-font-size:14.0pt;
+ mso-bidi-font-size:14.0pt;
+ font-family:"Cambria","serif";
+ mso-ascii-font-family:Cambria;
+ mso-ascii-theme-font:major-latin;
+ mso-fareast-font-family:"Times New Roman";
+ mso-fareast-theme-font:major-fareast;
+ mso-hansi-font-family:Cambria;
+ mso-hansi-theme-font:major-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:major-bidi;
+ color:#365F91;
+ mso-themecolor:accent1;
+ mso-themeshade:191;
+ font-weight:bold;}
+.MsoChpDefault
+ {mso-style-type:export-only;
+ mso-default-props:yes;
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-fareast-font-family:Calibri;
+ mso-fareast-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+.MsoPapDefault
+ {mso-style-type:export-only;
+ margin-bottom:10.0pt;
+ line-height:115%;}
+@page WordSection1
+ {size:595.3pt 841.9pt;
+ margin:70.85pt 70.85pt 2.0cm 70.85pt;
+ mso-header-margin:35.4pt;
+ mso-footer-margin:35.4pt;
+ mso-paper-source:0;}
+div.WordSection1
+ {page:WordSection1;}
+-->
+</style>
+<!--[if gte mso 10]>
+<style>
+ /* Style Definitions */
+ table.MsoNormalTable
+ {mso-style-name:"Normale Tabelle";
+ mso-tstyle-rowband-size:0;
+ mso-tstyle-colband-size:0;
+ mso-style-noshow:yes;
+ mso-style-priority:99;
+ mso-style-qformat:yes;
+ mso-style-parent:"";
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-para-margin-top:0cm;
+ mso-para-margin-right:0cm;
+ mso-para-margin-bottom:10.0pt;
+ mso-para-margin-left:0cm;
+ line-height:115%;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+table.MsoTableGrid
+ {mso-style-name:Tabellengitternetz;
+ mso-tstyle-rowband-size:0;
+ mso-tstyle-colband-size:0;
+ mso-style-priority:59;
+ mso-style-unhide:no;
+ border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;
+ mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
+ mso-border-insideh:.5pt solid windowtext;
+ mso-border-insidev:.5pt solid windowtext;
+ mso-para-margin:0cm;
+ mso-para-margin-bottom:.0001pt;
+ mso-pagination:widow-orphan;
+ font-size:11.0pt;
+ font-family:"Calibri","sans-serif";
+ mso-ascii-font-family:Calibri;
+ mso-ascii-theme-font:minor-latin;
+ mso-hansi-font-family:Calibri;
+ mso-hansi-theme-font:minor-latin;
+ mso-bidi-font-family:"Times New Roman";
+ mso-bidi-theme-font:minor-bidi;
+ mso-fareast-language:EN-US;}
+</style>
+<![endif]--><!--[if gte mso 9]><xml>
+ <o:shapedefaults v:ext="edit" spidmax="3074"/>
+</xml><![endif]--><!--[if gte mso 9]><xml>
+ <o:shapelayout v:ext="edit">
+ <o:idmap v:ext="edit" data="1"/>
+ </o:shapelayout></xml><![endif]-->
+</head>
+
+<body lang=DE style='tab-interval:35.4pt'>
+
+<div class=WordSection1>
+
+<h1 style='margin-bottom:10.0pt'>text</h1>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>align</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><span style='font-family:"Courier New"'>left</span>, <span
+ style='font-family:"Courier New"'>right</span>, <span style='font-family:
+ "Courier New"'>center</span></p>
+ </td>
+ </tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
+ <td width=256 valign=top style='width:153.5pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><o:p> </o:p></p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=256 valign=top style='width:153.55pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string</p>
+ </td>
+ </tr...
[truncated message content] |
|
From: <j-...@us...> - 2011-11-03 20:25:20
|
Revision: 498
http://openautomation.svn.sourceforge.net/openautomation/?rev=498&view=rev
Author: j-n-k
Date: 2011-11-03 20:25:14 +0000 (Thu, 03 Nov 2011)
Log Message:
-----------
Rendering problem as fixed by Rev. 496 in discreet
Changed AUTHORS
Modified Paths:
--------------
CometVisu/trunk/AUTHORS
CometVisu/trunk/visu/designs/discreet/basic.css
Modified: CometVisu/trunk/AUTHORS
===================================================================
--- CometVisu/trunk/AUTHORS 2011-11-03 20:02:14 UTC (rev 497)
+++ CometVisu/trunk/AUTHORS 2011-11-03 20:25:14 UTC (rev 498)
@@ -5,3 +5,4 @@
Julian Hartmann - julian.hartmann (at) gmail (dot) com
Michael Markstaller - mm (at) elabnet (dot) de
Christian Mayer - CometVisu (at) ChristianMayer (dot) de
+Jan N. Klug - jan.n.klug (at) rub (dot) de
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2011-11-03 20:02:14 UTC (rev 497)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2011-11-03 20:25:14 UTC (rev 498)
@@ -173,8 +173,10 @@
.link a
{
+ line-height: 2em;
color: #81664b;
width: 49%;
+ padding-left: 1em;
}
.page
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-09 12:07:48
|
Revision: 746
http://openautomation.svn.sourceforge.net/openautomation/?rev=746&view=rev
Author: mayerch
Date: 2012-04-09 12:07:39 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
Preparation for cleaner file structure and automated build script:
* create "release" directory for concatenated and (in future) minimized version
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/Makefile
Added Paths:
-----------
CometVisu/trunk/build/
CometVisu/trunk/build/template/
CometVisu/trunk/build/template/assets/
CometVisu/trunk/build/template/assets/ac-js
CometVisu/trunk/build/template/assets/api-js
CometVisu/trunk/build/template/assets/api.css
CometVisu/trunk/build/template/assets/bg_hd.gif
CometVisu/trunk/build/template/assets/reset-fonts-grids-min.css
CometVisu/trunk/build/template/assets/yui.png
CometVisu/trunk/build/template/classmap.tmpl
CometVisu/trunk/build/template/index.tmpl
CometVisu/trunk/build/template/main.tmpl
Property Changed:
----------------
CometVisu/trunk/
Property changes on: CometVisu/trunk
___________________________________________________________________
Added: svn:ignore
+ release
docs
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-04-09 11:26:58 UTC (rev 745)
+++ CometVisu/trunk/ChangeLog 2012-04-09 12:07:39 UTC (rev 746)
@@ -32,7 +32,10 @@
* initial support for automatic documentation generation (using YUIdoc)
* switch from big structure_pure.js to one file per widget
* switch from big structure_pure.js to one file per widget - part 2
- * initial makefile that can reducde the multiple source files (e.g. for the widgets) into one to speed up network loading
+ * initial makefile that can reducde the multiple source files (e.g. for the
+ widgets) into one to speed up network loading
+ * create "release" directory for concatenated and (in future) minimized
+ version
- lots of little bugfixes and improvements
<Changes up to Revision 744 included>
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2012-04-09 11:26:58 UTC (rev 745)
+++ CometVisu/trunk/Makefile 2012-04-09 12:07:39 UTC (rev 746)
@@ -39,16 +39,24 @@
lint:
${LINT} ${SRC}
-visu/designs/structure_pure.js: $(STRUCTURE_PURE_SRC)
- cat $^ > visu/designs/structure_pure.jss
- cp visu/index.html visu/index.min.html
+release:
+ cp -rfp visu release
+ find release -path "*/.svn" -exec rm -rf {} +
+
+release/designs/structure_pure.js: release $(STRUCTURE_PURE_SRC)
+ cat $(STRUCTURE_PURE_SRC) > release/designs/structure_pure.js
+ cp visu/index.html release/index.html
+ cp visu/edit_config.html release/edit_config.html
for SRC_FILE in $^; do \
SRC2_FILE=`echo $$SRC_FILE | sed 's_visu/__'`; \
- sed "s#.*<script src=\"$$SRC2_FILE\" type=\"text/javascript\"></script>.*##" -i visu/index.min.html; \
+ sed "s#.*<script src=\"$$SRC2_FILE\" type=\"text/javascript\"></script>.*##" -i release/index.html; \
done
- sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i visu/index.min.html
+ sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i release/index.html
+ sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i release/edit_config.html
-build: $(SRC)
- echo $^
+build: release/designs/structure_pure.js
+
+clean:
+ rm -rf release
.PHONY: lint docs build
Added: CometVisu/trunk/build/template/assets/ac-js
===================================================================
--- CometVisu/trunk/build/template/assets/ac-js (rev 0)
+++ CometVisu/trunk/build/template/assets/ac-js 2012-04-09 12:07:39 UTC (rev 746)
@@ -0,0 +1,178 @@
+(function() {
+
+ var Event=YAHOO.util.Event,
+ Dom=YAHOO.util.Dom,
+ oACDS, oAutoComp,
+ show = {
+ 'private': false,
+ 'protected': false,
+ 'deprecated': false
+ },
+
+ ITEM_TEMPLATE = '<em>{host}</em> <span>{name}</span>',
+ // ITEM_TEMPLATE = '<em>{host}</em> <span>{params}</span> <span>{name}</span>',
+ // ITEM_TEMPLATE = '<em>{host}</em> <span>{params}</span> <span>{name}</span><div>{description}</div>',
+ yuidoc = YAHOO.namespace('yuidoc'),
+ propdata,
+ initialized = false;
+
+yuidoc.init = function(altdata) {
+ yuidoc.initUI(altdata);
+};
+
+yuidoc.initUI = function(altdata) {
+
+ if (initialized) {
+ return;
+ }
+
+ propdata = ALL_YUI_PROPS || altdata;
+
+ //Checkboxes are available..
+ var handleClick = function(e) {
+ var id, checked = false;
+ if (YAHOO.lang.isString(e)) {
+ id = e;
+ } else {
+ var tar = Event.getTarget(e);
+ id = tar.id;
+ }
+ var el = Dom.get(id);
+ checked = el.checked;
+
+ var className = id;
+ if (checked) {
+ show[id.replace('show_', '')] = true;
+ Dom.addClass(document.body, className);
+ YAHOO.util.Cookie.setSub('yuidoc', id, 'checked');
+ } else {
+ show[id.replace('show_', '')] = false;
+ Dom.removeClass(document.body, className);
+ YAHOO.util.Cookie.setSub('yuidoc', id, '');
+ }
+ };
+
+ var checkCookie = function(id) {
+ var value = YAHOO.util.Cookie.getSub('yuidoc', id),
+ el = Dom.get(id), checked = (value === 'checked');;
+
+ el.checked = checked;
+ return checked;
+ };
+
+ var els = ['show_deprecated', 'show_protected', 'show_private'],
+ reapplyHash = false;
+
+ for (var i = 0; i < els.length; i++) {
+ Event.on(els[i], 'click', handleClick);
+ reapplyHash = checkCookie(els[i]) || reapplyHash;
+ handleClick(els[i]);
+ }
+
+ // If we dynamically show private/protected/etc items during
+ // load, we need to reapply anchors so that the search feature
+ // works correctly for items that are initially hidden.
+ if (reapplyHash) {
+ var dl = document.location, hash = dl.hash;
+ if (hash) {
+ dl.hash = hash;
+ }
+ }
+
+};
+
+//Starting the AutoComplete code
+ var getResults = function(query) {
+ var results = [];
+ if (query && query.length > 0) {
+ var q = query.toLowerCase();
+ for (var i=0, len=propdata.length; i<len; ++i) {
+ var prop = propdata[i];
+ if (!show['protected'] && prop.access == "protected") {
+ // skip
+ } else if (!show['private'] && prop.access == "private") {
+ // skip
+ } else if (!show['deprecated'] && prop.deprecated) {
+ // skip
+ } else {
+ var s = (prop.host + "." + prop.name).toLowerCase();
+ if (s.indexOf(q) > -1 ) {
+ results.push([query, prop]);
+ }
+ }
+ }
+ }
+
+ return results;
+ };
+
+ // Define Custom Event handlers
+ var myOnDataReturn = function(sType, aArgs) {
+ var oAutoComp = aArgs[0];
+ var query = aArgs[1];
+ var aResults = aArgs[2];
+
+ if(aResults.length == 0) {
+ if (query.length > 0) {
+ oAutoComp.setBody("<div id=\"resultsdefault\">Not found</div>");
+ }
+ }
+ };
+
+ var myOnItemSelect = function(sType, aArgs) {
+ var ac = aArgs[0];
+ var item = aArgs[2];
+ location.href = item[1].url;
+ };
+
+
+ Event.onAvailable("searchresults", function() {
+
+ // Instantiate JS Function DataSource
+ oACDS = new YAHOO.widget.DS_JSFunction(getResults);
+ oACDS.maxCacheEntries = 30;
+
+ // Instantiate AutoComplete
+ oAutoComp = new YAHOO.widget.AutoComplete('searchinput','searchresults', oACDS);
+ //oAutoComp.alwaysShowContainer = true;
+ oAutoComp.queryDelay = 0.2;
+ oAutoComp.maxResultsDisplayed = 200;
+ oAutoComp.minQueryLength = 0;
+ oAutoComp.formatResult = function(oResultItem, query) {
+ // var sMarkup = "<em>" + oResultItem[1].host + '</em> <span>' + oResultItem[1].name + '</span>';
+ // return sMarkup;
+ // return "<em>" + oResultItem[1].host + '</em> <span>' + oResultItem[1].name + '</span>';
+ return YAHOO.lang.substitute(ITEM_TEMPLATE, oResultItem[1]);
+ };
+
+ // Subscribe to Custom Events
+ oAutoComp.dataReturnEvent.subscribe(myOnDataReturn);
+ oAutoComp.itemSelectEvent.subscribe(myOnItemSelect);
+
+ // Set initial content in the container
+ oAutoComp.sendQuery(Dom.get("searchinput").value);
+
+ });
+
+ var validateForm = function() {
+ return false;
+ };
+
+ YAHOO.util.Event.onAvailable('classTab', function() {
+ var tabs = new YAHOO.widget.TabView('classTab');
+ });
+
+ /*
+ YAHOO.util.Event.onAvailable('codeTree', function() {
+ var tree1 = new YAHOO.widget.TreeView('codeTree');
+ tree1.render();
+ });
+ */
+
+ YAHOO.util.Event.onDOMReady(function() {
+ if (typeof ALL_YUI_PROPS != "undefined") {
+ YAHOO.yuidoc.initUI();
+ }
+ });
+
+})();
Added: CometVisu/trunk/build/template/assets/api-js
===================================================================
--- CometVisu/trunk/build/template/assets/api-js (rev 0)
+++ CometVisu/trunk/build/template/assets/api-js 2012-04-09 12:07:39 UTC (rev 746)
@@ -0,0 +1,42 @@
+/*
+Copyright (c) 2009, Yahoo! Inc. All rights reserved.
+Code licensed under the BSD License:
+http://developer.yahoo.net/yui/license.txt
+version: 2.7.0
+*/
+if(typeof YAHOO=="undefined"||!YAHOO){var YAHOO={};}YAHOO.namespace=function(){var A=arguments,E=null,C,B,D;for(C=0;C<A.length;C=C+1){D=(""+A[C]).split(".");E=YAHOO;for(B=(D[0]=="YAHOO")?1:0;B<D.length;B=B+1){E[D[B]]=E[D[B]]||{};E=E[D[B]];}}return E;};YAHOO.log=function(D,A,C){var B=YAHOO.widget.Logger;if(B&&B.log){return B.log(D,A,C);}else{return false;}};YAHOO.register=function(A,E,D){var I=YAHOO.env.modules,B,H,G,F,C;if(!I[A]){I[A]={versions:[],builds:[]};}B=I[A];H=D.version;G=D.build;F=YAHOO.env.listeners;B.name=A;B.version=H;B.build=G;B.versions.push(H);B.builds.push(G);B.mainClass=E;for(C=0;C<F.length;C=C+1){F[C](B);}if(E){E.VERSION=H;E.BUILD=G;}else{YAHOO.log("mainClass is undefined for module "+A,"warn");}};YAHOO.env=YAHOO.env||{modules:[],listeners:[]};YAHOO.env.getVersion=function(A){return YAHOO.env.modules[A]||null;};YAHOO.env.ua=function(){var C={ie:0,opera:0,gecko:0,webkit:0,mobile:null,air:0,caja:0},B=navigator.userAgent,A;if((/KHTML/).test(B)){C.webkit=1;}A=B.match(/AppleWebKit\/([^\s]*)/);if(A&&A[1]){C.webkit=parseFloat(A[1]);if(/ Mobile\//.test(B)){C.mobile="Apple";}else{A=B.match(/NokiaN[^\/]*/);if(A){C.mobile=A[0];}}A=B.match(/AdobeAIR\/([^\s]*)/);if(A){C.air=A[0];}}if(!C.webkit){A=B.match(/Opera[\s\/]([^\s]*)/);if(A&&A[1]){C.opera=parseFloat(A[1]);A=B.match(/Opera Mini[^;]*/);if(A){C.mobile=A[0];}}else{A=B.match(/MSIE\s([^;]*)/);if(A&&A[1]){C.ie=parseFloat(A[1]);}else{A=B.match(/Gecko\/([^\s]*)/);if(A){C.gecko=1;A=B.match(/rv:([^\s\)]*)/);if(A&&A[1]){C.gecko=parseFloat(A[1]);}}}}}A=B.match(/Caja\/([^\s]*)/);if(A&&A[1]){C.caja=parseFloat(A[1]);}return C;}();(function(){YAHOO.namespace("util","widget","example");if("undefined"!==typeof YAHOO_config){var B=YAHOO_config.listener,A=YAHOO.env.listeners,D=true,C;if(B){for(C=0;C<A.length;C=C+1){if(A[C]==B){D=false;break;}}if(D){A.push(B);}}}})();YAHOO.lang=YAHOO.lang||{};(function(){var B=YAHOO.lang,F="[object Array]",C="[object Function]",A=Object.prototype,E=["toString","valueOf"],D={isArray:function(G){return A.toString.apply(G)===F;},isBoolean:function(G){return typeof G==="boolean";},isFunction:function(G){return A.toString.apply(G)===C;},isNull:function(G){return G===null;},isNumber:function(G){return typeof G==="number"&&isFinite(G);},isObject:function(G){return(G&&(typeof G==="object"||B.isFunction(G)))||false;},isString:function(G){return typeof G==="string";},isUndefined:function(G){return typeof G==="undefined";},_IEEnumFix:(YAHOO.env.ua.ie)?function(I,H){var G,K,J;for(G=0;G<E.length;G=G+1){K=E[G];J=H[K];if(B.isFunction(J)&&J!=A[K]){I[K]=J;}}}:function(){},extend:function(J,K,I){if(!K||!J){throw new Error("extend failed, please check that "+"all dependencies are included.");}var H=function(){},G;H.prototype=K.prototype;J.prototype=new H();J.prototype.constructor=J;J.superclass=K.prototype;if(K.prototype.constructor==A.constructor){K.prototype.constructor=K;}if(I){for(G in I){if(B.hasOwnProperty(I,G)){J.prototype[G]=I[G];}}B._IEEnumFix(J.prototype,I);}},augmentObject:function(K,J){if(!J||!K){throw new Error("Absorb failed, verify dependencies.");}var G=arguments,I,L,H=G[2];if(H&&H!==true){for(I=2;I<G.length;I=I+1){K[G[I]]=J[G[I]];}}else{for(L in J){if(H||!(L in K)){K[L]=J[L];}}B._IEEnumFix(K,J);}},augmentProto:function(J,I){if(!I||!J){throw new Error("Augment failed, verify dependencies.");}var G=[J.prototype,I.prototype],H;for(H=2;H<arguments.length;H=H+1){G.push(arguments[H]);}B.augmentObject.apply(this,G);},dump:function(G,L){var I,K,N=[],O="{...}",H="f(){...}",M=", ",J=" => ";if(!B.isObject(G)){return G+"";}else{if(G instanceof Date||("nodeType" in G&&"tagName" in G)){return G;}else{if(B.isFunction(G)){return H;}}}L=(B.isNumber(L))?L:3;if(B.isArray(G)){N.push("[");for(I=0,K=G.length;I<K;I=I+1){if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}if(N.length>1){N.pop();}N.push("]");}else{N.push("{");for(I in G){if(B.hasOwnProperty(G,I)){N.push(I+J);if(B.isObject(G[I])){N.push((L>0)?B.dump(G[I],L-1):O);}else{N.push(G[I]);}N.push(M);}}if(N.length>1){N.pop();}N.push("}");}return N.join("");},substitute:function(V,H,O){var L,K,J,R,S,U,Q=[],I,M="dump",P=" ",G="{",T="}",N;for(;;){L=V.lastIndexOf(G);if(L<0){break;}K=V.indexOf(T,L);if(L+1>=K){break;}I=V.substring(L+1,K);R=I;U=null;J=R.indexOf(P);if(J>-1){U=R.substring(J+1);R=R.substring(0,J);}S=H[R];if(O){S=O(R,S,U);}if(B.isObject(S)){if(B.isArray(S)){S=B.dump(S,parseInt(U,10));}else{U=U||"";N=U.indexOf(M);if(N>-1){U=U.substring(4);}if(S.toString===A.toString||N>-1){S=B.dump(S,parseInt(U,10));}else{S=S.toString();}}}else{if(!B.isString(S)&&!B.isNumber(S)){S="~-"+Q.length+"-~";Q[Q.length]=I;}}V=V.substring(0,L)+S+V.substring(K+1);}for(L=Q.length-1;L>=0;L=L-1){V=V.replace(new RegExp("~-"+L+"-~"),"{"+Q[L]+"}","g");}return V;},trim:function(G){try{return G.replace(/^\s+|\s+$/g,"");}catch(H){return G;}},merge:function(){var J={},H=arguments,G=H.length,I;for(I=0;I<G;I=I+1){B.augmentObject(J,H[I],true);}return J;},later:function(N,H,O,J,K){N=N||0;H=H||{};var I=O,M=J,L,G;if(B.isString(O)){I=H[O];}if(!I){throw new TypeError("method undefined");}if(!B.isArray(M)){M=[J];}L=function(){I.apply(H,M);};G=(K)?setInterval(L,N):setTimeout(L,N);return{interval:K,cancel:function(){if(this.interval){clearInterval(G);}else{clearTimeout(G);}}};},isValue:function(G){return(B.isObject(G)||B.isString(G)||B.isNumber(G)||B.isBoolean(G));}};B.hasOwnProperty=(A.hasOwnProperty)?function(G,H){return G&&G.hasOwnProperty(H);}:function(G,H){return !B.isUndefined(G[H])&&G.constructor.prototype[H]!==G[H];};D.augmentObject(B,D,true);YAHOO.util.Lang=B;B.augment=B.augmentProto;YAHOO.augment=B.augmentProto;YAHOO.extend=B.extend;})();YAHOO.register("yahoo",YAHOO,{version:"2.7.0",build:"1796"});(function(){YAHOO.env._id_counter=YAHOO.env._id_counter||0;var E=YAHOO.util,L=YAHOO.lang,m=YAHOO.env.ua,A=YAHOO.lang.trim,d={},h={},N=/^t(?:able|d|h)$/i,X=/color$/i,K=window.document,W=K.documentElement,e="ownerDocument",n="defaultView",v="documentElement",t="compatMode",b="offsetLeft",P="offsetTop",u="offsetParent",Z="parentNode",l="nodeType",C="tagName",O="scrollLeft",i="scrollTop",Q="getBoundingClientRect",w="getComputedStyle",a="currentStyle",M="CSS1Compat",c="BackCompat",g="class",F="className",J="",B=" ",s="(?:^|\\s)",k="(?= |$)",U="g",p="position",f="fixed",V="relative",j="left",o="top",r="medium",q="borderLeftWidth",R="borderTopWidth",D=m.opera,I=m.webkit,H=m.gecko,T=m.ie;E.Dom={CUSTOM_ATTRIBUTES:(!W.hasAttribute)?{"for":"htmlFor","class":F}:{"htmlFor":"for","className":g},get:function(y){var AA,Y,z,x,G;if(y){if(y[l]||y.item){return y;}if(typeof y==="string"){AA=y;y=K.getElementById(y);if(y&&y.id===AA){return y;}else{if(y&&K.all){y=null;Y=K.all[AA];for(x=0,G=Y.length;x<G;++x){if(Y[x].id===AA){return Y[x];}}}}return y;}if(y.DOM_EVENTS){y=y.get("element");}if("length" in y){z=[];for(x=0,G=y.length;x<G;++x){z[z.length]=E.Dom.get(y[x]);}return z;}return y;}return null;},getComputedStyle:function(G,Y){if(window[w]){return G[e][n][w](G,null)[Y];}else{if(G[a]){return E.Dom.IE_ComputedStyle.get(G,Y);}}},getStyle:function(G,Y){return E.Dom.batch(G,E.Dom._getStyle,Y);},_getStyle:function(){if(window[w]){return function(G,y){y=(y==="float")?y="cssFloat":E.Dom._toCamel(y);var x=G.style[y],Y;if(!x){Y=G[e][n][w](G,null);if(Y){x=Y[y];}}return x;};}else{if(W[a]){return function(G,y){var x;switch(y){case"opacity":x=100;try{x=G.filters["DXImageTransform.Microsoft.Alpha"].opacity;}catch(z){try{x=G.filters("alpha").opacity;}catch(Y){}}return x/100;case"float":y="styleFloat";default:y=E.Dom._toCamel(y);x=G[a]?G[a][y]:null;return(G.style[y]||x);}};}}}(),setStyle:function(G,Y,x){E.Dom.batch(G,E.Dom._setStyle,{prop:Y,val:x});},_setStyle:function(){if(T){return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){switch(x){case"opacity":if(L.isString(Y.style.filter)){Y.style.filter="alpha(opacity="+y*100+")";if(!Y[a]||!Y[a].hasLayout){Y.style.zoom=1;}}break;case"float":x="styleFloat";default:Y.style[x]=y;}}else{}};}else{return function(Y,G){var x=E.Dom._toCamel(G.prop),y=G.val;if(Y){if(x=="float"){x="cssFloat";}Y.style[x]=y;}else{}};}}(),getXY:function(G){return E.Dom.batch(G,E.Dom._getXY);},_canPosition:function(G){return(E.Dom._getStyle(G,"display")!=="none"&&E.Dom._inDoc(G));},_getXY:function(){if(K[v][Q]){return function(y){var z,Y,AA,AF,AE,AD,AC,G,x,AB=Math.floor,AG=false;if(E.Dom._canPosition(y)){AA=y[Q]();AF=y[e];z=E.Dom.getDocumentScrollLeft(AF);Y=E.Dom.getDocumentScrollTop(AF);AG=[AB(AA[j]),AB(AA[o])];if(T&&m.ie<8){AE=2;AD=2;AC=AF[t];G=S(AF[v],q);x=S(AF[v],R);if(m.ie===6){if(AC!==c){AE=0;AD=0;}}if((AC==c)){if(G!==r){AE=parseInt(G,10);}if(x!==r){AD=parseInt(x,10);}}AG[0]-=AE;AG[1]-=AD;}if((Y||z)){AG[0]+=z;AG[1]+=Y;}AG[0]=AB(AG[0]);AG[1]=AB(AG[1]);}else{}return AG;};}else{return function(y){var x,Y,AA,AB,AC,z=false,G=y;if(E.Dom._canPosition(y)){z=[y[b],y[P]];x=E.Dom.getDocumentScrollLeft(y[e]);Y=E.Dom.getDocumentScrollTop(y[e]);AC=((H||m.webkit>519)?true:false);while((G=G[u])){z[0]+=G[b];z[1]+=G[P];if(AC){z=E.Dom._calcBorders(G,z);}}if(E.Dom._getStyle(y,p)!==f){G=y;while((G=G[Z])&&G[C]){AA=G[i];AB=G[O];if(H&&(E.Dom._getStyle(G,"overflow")!=="visible")){z=E.Dom._calcBorders(G,z);}if(AA||AB){z[0]-=AB;z[1]-=AA;}}z[0]+=x;z[1]+=Y;}else{if(D){z[0]-=x;z[1]-=Y;}else{if(I||H){z[0]+=x;z[1]+=Y;}}}z[0]=Math.floor(z[0]);z[1]=Math.floor(z[1]);}else{}return z;};}}(),getX:function(G){var Y=function(x){return E.Dom.getXY(x)[0];};return E.Dom.batch(G,Y,E.Dom,true);},getY:function(G){var Y=function(x){return E.Dom.getXY(x)[1];};return E.Dom.batch(G,Y,E.Dom,true);},setXY:function(G,x,Y){E.Dom.batch(G,E.Dom._setXY,{pos:x,noRetry:Y});},_setXY:function(G,z){var AA=E.Dom._getStyle(G,p),y=E.Dom.setStyle,AD=z.pos,Y=z.noRetry,AB=[parseInt(E.Dom.getComputedStyle(G,j),10),parseInt(E.Dom.getComputedStyle(G,o),10)],AC,x;if(AA=="static"){AA=V;y(G,p,AA);}AC=E.Dom._getXY(G);if(!AD||AC===false){return false;}if(isNaN(AB[0])){AB[0]=(AA==V)?0:G[b];}if(isNaN(AB[1])){AB[1]=(AA==V)?0:G[P];}if(AD[0]!==null){y(G,j,AD[0]-AC[0]+AB[0]+"px");}if(AD[1]!==null){y(G,o,AD[1]-AC[1]+AB[1]+"px");}if(!Y){x=E.Dom._getXY(G);if((AD[0]!==null&&x[0]!=AD[0])||(AD[1]!==null&&x[1]!=AD[1])){E.Dom._setXY(G,{pos:AD,noRetry:true});}}},setX:function(Y,G){E.Dom.setXY(Y,[G,null]);},setY:function(G,Y){E.Dom.setXY(G,[null,Y]);},getRegion:function(G){var Y=function(x){var y=false;if(E.Dom._canPosition(x)){y=E.Region.getRegion(x);}else{}return y;};return E.Dom.batch(G,Y,E.Dom,true);},getClientWidth:function(){return E.Dom.getViewportWidth();},getClientHeight:function(){return E.Dom.getViewportHeight();},getElementsByClassName:function(AB,AF,AC,AE,x,AD){AB=L.trim(AB);AF=AF||"*";AC=(AC)?E.Dom.get(AC):null||K;if(!AC){return[];}var Y=[],G=AC.getElementsByTagName(AF),z=E.Dom.hasClass;for(var y=0,AA=G.length;y<AA;++y){if(z(G[y],AB)){Y[Y.length]=G[y];}}if(AE){E.Dom.batch(Y,AE,x,AD);}return Y;},hasClass:function(Y,G){return E.Dom.batch(Y,E.Dom._hasClass,G);},_hasClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(Y.exec){G=Y.test(y);}else{G=Y&&(B+y+B).indexOf(B+Y+B)>-1;}}else{}return G;},addClass:function(Y,G){return E.Dom.batch(Y,E.Dom._addClass,G);},_addClass:function(x,Y){var G=false,y;if(x&&Y){y=E.Dom.getAttribute(x,F)||J;if(!E.Dom._hasClass(x,Y)){E.Dom.setAttribute(x,F,A(y+B+Y));G=true;}}else{}return G;},removeClass:function(Y,G){return E.Dom.batch(Y,E.Dom._removeClass,G);},_removeClass:function(y,x){var Y=false,AA,z,G;if(y&&x){AA=E.Dom.getAttribute(y,F)||J;E.Dom.setAttribute(y,F,AA.replace(E.Dom._getClassRegex(x),J));z=E.Dom.getAttribute(y,F);if(AA!==z){E.Dom.setAttribute(y,F,A(z));Y=true;if(E.Dom.getAttribute(y,F)===""){G=(y.hasAttribute&&y.hasAttribute(g))?g:F;y.removeAttribute(G);}}}else{}return Y;},replaceClass:function(x,Y,G){return E.Dom.batch(x,E.Dom._replaceClass,{from:Y,to:G});
+},_replaceClass:function(y,x){var Y,AB,AA,G=false,z;if(y&&x){AB=x.from;AA=x.to;if(!AA){G=false;}else{if(!AB){G=E.Dom._addClass(y,x.to);}else{if(AB!==AA){z=E.Dom.getAttribute(y,F)||J;Y=(B+z.replace(E.Dom._getClassRegex(AB),B+AA)).split(E.Dom._getClassRegex(AA));Y.splice(1,0,B+AA);E.Dom.setAttribute(y,F,A(Y.join(J)));G=true;}}}}else{}return G;},generateId:function(G,x){x=x||"yui-gen";var Y=function(y){if(y&&y.id){return y.id;}var z=x+YAHOO.env._id_counter++;if(y){if(y[e].getElementById(z)){return E.Dom.generateId(y,z+x);}y.id=z;}return z;};return E.Dom.batch(G,Y,E.Dom,true)||Y.apply(E.Dom,arguments);},isAncestor:function(Y,x){Y=E.Dom.get(Y);x=E.Dom.get(x);var G=false;if((Y&&x)&&(Y[l]&&x[l])){if(Y.contains&&Y!==x){G=Y.contains(x);}else{if(Y.compareDocumentPosition){G=!!(Y.compareDocumentPosition(x)&16);}}}else{}return G;},inDocument:function(G,Y){return E.Dom._inDoc(E.Dom.get(G),Y);},_inDoc:function(Y,x){var G=false;if(Y&&Y[C]){x=x||Y[e];G=E.Dom.isAncestor(x[v],Y);}else{}return G;},getElementsBy:function(Y,AF,AB,AD,y,AC,AE){AF=AF||"*";AB=(AB)?E.Dom.get(AB):null||K;if(!AB){return[];}var x=[],G=AB.getElementsByTagName(AF);for(var z=0,AA=G.length;z<AA;++z){if(Y(G[z])){if(AE){x=G[z];break;}else{x[x.length]=G[z];}}}if(AD){E.Dom.batch(x,AD,y,AC);}return x;},getElementBy:function(x,G,Y){return E.Dom.getElementsBy(x,G,Y,null,null,null,true);},batch:function(x,AB,AA,z){var y=[],Y=(z)?AA:window;x=(x&&(x[C]||x.item))?x:E.Dom.get(x);if(x&&AB){if(x[C]||x.length===undefined){return AB.call(Y,x,AA);}for(var G=0;G<x.length;++G){y[y.length]=AB.call(Y,x[G],AA);}}else{return false;}return y;},getDocumentHeight:function(){var Y=(K[t]!=M||I)?K.body.scrollHeight:W.scrollHeight,G=Math.max(Y,E.Dom.getViewportHeight());return G;},getDocumentWidth:function(){var Y=(K[t]!=M||I)?K.body.scrollWidth:W.scrollWidth,G=Math.max(Y,E.Dom.getViewportWidth());return G;},getViewportHeight:function(){var G=self.innerHeight,Y=K[t];if((Y||T)&&!D){G=(Y==M)?W.clientHeight:K.body.clientHeight;}return G;},getViewportWidth:function(){var G=self.innerWidth,Y=K[t];if(Y||T){G=(Y==M)?W.clientWidth:K.body.clientWidth;}return G;},getAncestorBy:function(G,Y){while((G=G[Z])){if(E.Dom._testElement(G,Y)){return G;}}return null;},getAncestorByClassName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return E.Dom.hasClass(y,G);};return E.Dom.getAncestorBy(Y,x);},getAncestorByTagName:function(Y,G){Y=E.Dom.get(Y);if(!Y){return null;}var x=function(y){return y[C]&&y[C].toUpperCase()==G.toUpperCase();};return E.Dom.getAncestorBy(Y,x);},getPreviousSiblingBy:function(G,Y){while(G){G=G.previousSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getPreviousSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getPreviousSiblingBy(G);},getNextSiblingBy:function(G,Y){while(G){G=G.nextSibling;if(E.Dom._testElement(G,Y)){return G;}}return null;},getNextSibling:function(G){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getNextSiblingBy(G);},getFirstChildBy:function(G,x){var Y=(E.Dom._testElement(G.firstChild,x))?G.firstChild:null;return Y||E.Dom.getNextSiblingBy(G.firstChild,x);},getFirstChild:function(G,Y){G=E.Dom.get(G);if(!G){return null;}return E.Dom.getFirstChildBy(G);},getLastChildBy:function(G,x){if(!G){return null;}var Y=(E.Dom._testElement(G.lastChild,x))?G.lastChild:null;return Y||E.Dom.getPreviousSiblingBy(G.lastChild,x);},getLastChild:function(G){G=E.Dom.get(G);return E.Dom.getLastChildBy(G);},getChildrenBy:function(Y,y){var x=E.Dom.getFirstChildBy(Y,y),G=x?[x]:[];E.Dom.getNextSiblingBy(x,function(z){if(!y||y(z)){G[G.length]=z;}return false;});return G;},getChildren:function(G){G=E.Dom.get(G);if(!G){}return E.Dom.getChildrenBy(G);},getDocumentScrollLeft:function(G){G=G||K;return Math.max(G[v].scrollLeft,G.body.scrollLeft);},getDocumentScrollTop:function(G){G=G||K;return Math.max(G[v].scrollTop,G.body.scrollTop);},insertBefore:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}return G[Z].insertBefore(Y,G);},insertAfter:function(Y,G){Y=E.Dom.get(Y);G=E.Dom.get(G);if(!Y||!G||!G[Z]){return null;}if(G.nextSibling){return G[Z].insertBefore(Y,G.nextSibling);}else{return G[Z].appendChild(Y);}},getClientRegion:function(){var x=E.Dom.getDocumentScrollTop(),Y=E.Dom.getDocumentScrollLeft(),y=E.Dom.getViewportWidth()+Y,G=E.Dom.getViewportHeight()+x;return new E.Region(x,y,G,Y);},setAttribute:function(Y,G,x){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;Y.setAttribute(G,x);},getAttribute:function(Y,G){G=E.Dom.CUSTOM_ATTRIBUTES[G]||G;return Y.getAttribute(G);},_toCamel:function(Y){var x=d;function G(y,z){return z.toUpperCase();}return x[Y]||(x[Y]=Y.indexOf("-")===-1?Y:Y.replace(/-([a-z])/gi,G));},_getClassRegex:function(Y){var G;if(Y!==undefined){if(Y.exec){G=Y;}else{G=h[Y];if(!G){Y=Y.replace(E.Dom._patterns.CLASS_RE_TOKENS,"\\$1");G=h[Y]=new RegExp(s+Y+k,U);}}}return G;},_patterns:{ROOT_TAG:/^body|html$/i,CLASS_RE_TOKENS:/([\.\(\)\^\$\*\+\?\|\[\]\{\}])/g},_testElement:function(G,Y){return G&&G[l]==1&&(!Y||Y(G));},_calcBorders:function(x,y){var Y=parseInt(E.Dom[w](x,R),10)||0,G=parseInt(E.Dom[w](x,q),10)||0;if(H){if(N.test(x[C])){Y=0;G=0;}}y[0]+=G;y[1]+=Y;return y;}};var S=E.Dom[w];if(m.opera){E.Dom[w]=function(Y,G){var x=S(Y,G);if(X.test(G)){x=E.Dom.Color.toRGB(x);}return x;};}if(m.webkit){E.Dom[w]=function(Y,G){var x=S(Y,G);if(x==="rgba(0, 0, 0, 0)"){x="transparent";}return x;};}})();YAHOO.util.Region=function(C,D,A,B){this.top=C;this.y=C;this[1]=C;this.right=D;this.bottom=A;this.left=B;this.x=B;this[0]=B;this.width=this.right-this.left;this.height=this.bottom-this.top;};YAHOO.util.Region.prototype.contains=function(A){return(A.left>=this.left&&A.right<=this.right&&A.top>=this.top&&A.bottom<=this.bottom);};YAHOO.util.Region.prototype.getArea=function(){return((this.bottom-this.top)*(this.right-this.left));};YAHOO.util.Region.prototype.intersect=function(E){var C=Math.max(this.top,E.top),D=Math.min(this.right,E.right),A=Math.min(this.bottom,E.bottom),B=Math.max(this.left,E.left);if(A>=C&&D>=B){return new YAHOO.util.Region(C,D,A,B);
+}else{return null;}};YAHOO.util.Region.prototype.union=function(E){var C=Math.min(this.top,E.top),D=Math.max(this.right,E.right),A=Math.max(this.bottom,E.bottom),B=Math.min(this.left,E.left);return new YAHOO.util.Region(C,D,A,B);};YAHOO.util.Region.prototype.toString=function(){return("Region {"+"top: "+this.top+", right: "+this.right+", bottom: "+this.bottom+", left: "+this.left+", height: "+this.height+", width: "+this.width+"}");};YAHOO.util.Region.getRegion=function(D){var F=YAHOO.util.Dom.getXY(D),C=F[1],E=F[0]+D.offsetWidth,A=F[1]+D.offsetHeight,B=F[0];return new YAHOO.util.Region(C,E,A,B);};YAHOO.util.Point=function(A,B){if(YAHOO.lang.isArray(A)){B=A[1];A=A[0];}YAHOO.util.Point.superclass.constructor.call(this,B,A,B,A);};YAHOO.extend(YAHOO.util.Point,YAHOO.util.Region);(function(){var B=YAHOO.util,A="clientTop",F="clientLeft",J="parentNode",K="right",W="hasLayout",I="px",U="opacity",L="auto",D="borderLeftWidth",G="borderTopWidth",P="borderRightWidth",V="borderBottomWidth",S="visible",Q="transparent",N="height",E="width",H="style",T="currentStyle",R=/^width|height$/,O=/^(\d[.\d]*)+(em|ex|px|gd|rem|vw|vh|vm|ch|mm|cm|in|pt|pc|deg|rad|ms|s|hz|khz|%){1}?/i,M={get:function(X,Z){var Y="",a=X[T][Z];if(Z===U){Y=B.Dom.getStyle(X,U);}else{if(!a||(a.indexOf&&a.indexOf(I)>-1)){Y=a;}else{if(B.Dom.IE_COMPUTED[Z]){Y=B.Dom.IE_COMPUTED[Z](X,Z);}else{if(O.test(a)){Y=B.Dom.IE.ComputedStyle.getPixel(X,Z);}else{Y=a;}}}}return Y;},getOffset:function(Z,e){var b=Z[T][e],X=e.charAt(0).toUpperCase()+e.substr(1),c="offset"+X,Y="pixel"+X,a="",d;if(b==L){d=Z[c];if(d===undefined){a=0;}a=d;if(R.test(e)){Z[H][e]=d;if(Z[c]>d){a=d-(Z[c]-d);}Z[H][e]=L;}}else{if(!Z[H][Y]&&!Z[H][e]){Z[H][e]=b;}a=Z[H][Y];}return a+I;},getBorderWidth:function(X,Z){var Y=null;if(!X[T][W]){X[H].zoom=1;}switch(Z){case G:Y=X[A];break;case V:Y=X.offsetHeight-X.clientHeight-X[A];break;case D:Y=X[F];break;case P:Y=X.offsetWidth-X.clientWidth-X[F];break;}return Y+I;},getPixel:function(Y,X){var a=null,b=Y[T][K],Z=Y[T][X];Y[H][K]=Z;a=Y[H].pixelRight;Y[H][K]=b;return a+I;},getMargin:function(Y,X){var Z;if(Y[T][X]==L){Z=0+I;}else{Z=B.Dom.IE.ComputedStyle.getPixel(Y,X);}return Z;},getVisibility:function(Y,X){var Z;while((Z=Y[T])&&Z[X]=="inherit"){Y=Y[J];}return(Z)?Z[X]:S;},getColor:function(Y,X){return B.Dom.Color.toRGB(Y[T][X])||Q;},getBorderColor:function(Y,X){var Z=Y[T],a=Z[X]||Z.color;return B.Dom.Co...
[truncated message content] |
|
From: <net...@us...> - 2012-11-23 17:36:55
|
Revision: 1162
http://openautomation.svn.sourceforge.net/openautomation/?rev=1162&view=rev
Author: netzkind
Date: 2012-11-23 17:36:41 +0000 (Fri, 23 Nov 2012)
Log Message:
-----------
updated jquery to 1.8.2
amended XSD
reached MS2 of development for new editor
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/dependencies/jquery.js
CometVisu/trunk/visu/editor/DEVELOPMENT.txt
CometVisu/trunk/visu/editor/index.html
CometVisu/trunk/visu/editor/lib/Configuration.js
CometVisu/trunk/visu/editor/lib/Schema.js
CometVisu/trunk/visu/visu_config.xsd
Added Paths:
-----------
CometVisu/trunk/editor-gfx/
CometVisu/trunk/editor-gfx/Buttons_Visu.ai
CometVisu/trunk/editor-gfx/Buttons_Visu_sprite.psd
CometVisu/trunk/visu/editor/init.js
CometVisu/trunk/visu/editor/lib/Editor.css
CometVisu/trunk/visu/editor/lib/Editor.js
CometVisu/trunk/visu/editor/lib/Messages.js
CometVisu/trunk/visu/editor/lib/Result.js
CometVisu/trunk/visu/editor/lib/editor_sprite.png
Removed Paths:
-------------
CometVisu/trunk/visu/dependencies/jquery.jnotify.js
CometVisu/trunk/visu/editor/lib/DumpConfig.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-11-23 11:00:28 UTC (rev 1161)
+++ CometVisu/trunk/ChangeLog 2012-11-23 17:36:41 UTC (rev 1162)
@@ -41,6 +41,9 @@
- lots of little bugfixes and improvements
<Changes up to Revision 744 included>
+- Editor: old WYSIWYG-editor was removed due to existing and forseeable compatibility issues
+- updated jQuery to 1.8.2
+
0.6.2
=====
Added: CometVisu/trunk/editor-gfx/Buttons_Visu.ai
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/editor-gfx/Buttons_Visu.ai
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: CometVisu/trunk/editor-gfx/Buttons_Visu_sprite.psd
===================================================================
(Binary files differ)
Property changes on: CometVisu/trunk/editor-gfx/Buttons_Visu_sprite.psd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Deleted: CometVisu/trunk/visu/dependencies/jquery.jnotify.js
===================================================================
--- CometVisu/trunk/visu/dependencies/jquery.jnotify.js 2012-11-23 11:00:28 UTC (rev 1161)
+++ CometVisu/trunk/visu/dependencies/jquery.jnotify.js 2012-11-23 17:36:41 UTC (rev 1162)
@@ -1,143 +0,0 @@
-/**
-* jQuery.jNotify
-* jQuery Notification Engine
-*
-* Copyright (c) 2010 Fabio Franzini
-*
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-*
-* The above copyright notify and this permission notify shall be included in
-* all copies or substantial portions of the Software.
-*
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*
-* @author Fabio Franzini
-* @copyright 2010 www.fabiofranzini.com
-* @version 1
-**/
-
-(function(jQuery) {
- jQuery.fn.jnotifyInizialize = function(options) {
- var element = this;
-
- var defaults = {
- oneAtTime: false,
- appendType: 'append'
- };
-
- var options = jQuery.extend({}, defaults, options);
-
- this.addClass('notify-wrapper');
-
- if (options.oneAtTime)
- this.addClass('notify-wrapper-oneattime');
-
- if (options.appendType == 'prepend' && options.oneAtTime == false)
- this.addClass('notify-wrapper-prepend');
-
- return this;
- };
- jQuery.fn.jnotifyAddMessage = function(options) {
-
- var notifyWrapper = this;
-
- if (notifyWrapper.hasClass('notify-wrapper')) {
-
- var defaults = {
- text: '',
- type: 'message',
- showIcon: true,
- permanent: false,
- disappearTime: 3000
- };
-
- var options = jQuery.extend({}, defaults, options);
- var styleClass;
- var iconClass;
-
- switch (options.type) {
- case 'message':
- {
- styleClass = 'ui-state-highlight';
- iconClass = 'ui-icon-info';
- }
- break;
- case 'error':
- {
- styleClass = 'ui-state-error';
- iconClass = 'ui-icon-alert';
- }
- break;
- default:
- {
- styleClass = 'ui-state-highlight';
- iconClass = 'ui-icon-info';
- }
- break;
- }
-
- if (notifyWrapper.hasClass('notify-wrapper-oneattime')) {
- this.children().remove();
- }
-
- var notifyItemWrapper = jQuery('<div class="jnotify-item-wrapper"></div>');
- var notifyItem = jQuery('<div class="ui-corner-all jnotify-item"></div>')
- .addClass(styleClass);
-
- if (notifyWrapper.hasClass('notify-wrapper-prepend'))
- notifyItem.prependTo(notifyWrapper);
- else
- notifyItem.appendTo(notifyWrapper);
-
- notifyItem.wrap(notifyItemWrapper);
-
- if (options.showIcon)
- jQuery('<span class="ui-icon" style="float:left; margin-right: .3em;" />')
- .addClass(iconClass)
- .appendTo(notifyItem);
-
- jQuery('<span></span>').html(options.text).appendTo(notifyItem);
- jQuery('<div class="jnotify-item-close"><span class="ui-icon ui-icon-circle-close"/></div>')
- .prependTo(notifyItem)
- .click(function() { remove(notifyItem) });
-
- // IEsucks
- if (navigator.userAgent.match(/MSIE (\d+\.\d+);/)) {
- notifyWrapper.css({ top: document.documentElement.scrollTop });
- //http://groups.google.com/group/jquery-dev/browse_thread/thread/ba38e6474e3e9a41
- notifyWrapper.removeClass('IEsucks');
- }
- // ------
-
- if (!options.permanent) {
- setTimeout(function() { remove(notifyItem); }, options.disappearTime);
- }
- }
-
- function remove(obj) {
- obj.animate({ opacity: '0' }, 600, function() {
- obj.parent().animate({ height: '0px' }, 300,
- function() {
- obj.parent().remove();
- // IEsucks
- if (navigator.userAgent.match(/MSIE (\d+\.\d+);/)) {
- //http://groups.google.com/group/jquery-dev/browse_thread/thread/ba38e6474e3e9a41
- obj.parent().parent().removeClass('IEsucks');
- }
- // -------
- });
- });
- }
- };
-})(jQuery);
\ No newline at end of file
Modified: CometVisu/trunk/visu/dependencies/jquery.js
===================================================================
--- CometVisu/trunk/visu/dependencies/jquery.js 2012-11-23 11:00:28 UTC (rev 1161)
+++ CometVisu/trunk/visu/dependencies/jquery.js 2012-11-23 17:36:41 UTC (rev 1162)
@@ -1,96 +1,94 @@
/*!
- * jQuery JavaScript Library v1.7.1
+ * jQuery JavaScript Library v1.8.2
* http://jquery.com/
*
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
* Includes Sizzle.js
* http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
*
- * Date: Mon Nov 21 21:11:03 2011 -0500
+ * Copyright 2012 jQuery Foundation and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: Thu Sep 20 2012 21:13:05 GMT-0400 (Eastern Daylight Time)
*/
(function( window, undefined ) {
+var
+ // A central reference to the root jQuery(document)
+ rootjQuery,
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document,
+ // The deferred used on DOM ready
+ readyList,
+
+ // Use the correct document accordingly with window argument (sandbox)
+ document = window.document,
+ location = window.location,
navigator = window.navigator,
- location = window.location;
-var jQuery = (function() {
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
- // The jQuery object is actually just the init constructor 'enhanced'
- return new jQuery.fn.init( selector, context, rootjQuery );
- },
-
// Map over jQuery in case of overwrite
_jQuery = window.jQuery,
// Map over the $ in case of overwrite
_$ = window.$,
- // A central reference to the root jQuery(document)
- rootjQuery,
+ // Save a reference to some core methods
+ core_push = Array.prototype.push,
+ core_slice = Array.prototype.slice,
+ core_indexOf = Array.prototype.indexOf,
+ core_toString = Object.prototype.toString,
+ core_hasOwn = Object.prototype.hasOwnProperty,
+ core_trim = String.prototype.trim,
- // A simple way to check for HTML strings or ID strings
- // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
- quickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+ // Define a local copy of jQuery
+ jQuery = function( selector, context ) {
+ // The jQuery object is actually just the init constructor 'enhanced'
+ return new jQuery.fn.init( selector, context, rootjQuery );
+ },
- // Check if a string has a non-whitespace character in it
- rnotwhite = /\S/,
+ // Used for matching numbers
+ core_pnum = /[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,
- // Used for trimming whitespace
- trimLeft = /^\s+/,
- trimRight = /\s+$/,
+ // Used for detecting and trimming whitespace
+ core_rnotwhite = /\S/,
+ core_rspace = /\s+/,
+ // Make sure we trim BOM and NBSP (here's looking at you, Safari 5.0 and IE)
+ rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
+
+ // A simple way to check for HTML strings
+ // Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
+ rquickExpr = /^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
// Match a standalone tag
- rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+ rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>|)$/,
// JSON RegExp
rvalidchars = /^[\],:{}\s]*$/,
- rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
- rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+ rvalidescape = /\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,
+ rvalidtokens = /"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,
- // Useragent RegExp
- rwebkit = /(webkit)[ \/]([\w.]+)/,
- ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
- rmsie = /(msie) ([\w.]+)/,
- rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
// Matches dashed string for camelizing
- rdashAlpha = /-([a-z]|[0-9])/ig,
rmsPrefix = /^-ms-/,
+ rdashAlpha = /-([\da-z])/gi,
// Used by jQuery.camelCase as callback to replace()
fcamelCase = function( all, letter ) {
return ( letter + "" ).toUpperCase();
},
- // Keep a UserAgent string for use with jQuery.browser
- userAgent = navigator.userAgent,
+ // The ready event handler and self cleanup method
+ DOMContentLoaded = function() {
+ if ( document.addEventListener ) {
+ document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+ jQuery.ready();
+ } else if ( document.readyState === "complete" ) {
+ // we're here because readyState === "complete" in oldIE
+ // which is good enough for us to call the dom ready!
+ document.detachEvent( "onreadystatechange", DOMContentLoaded );
+ jQuery.ready();
+ }
+ },
- // For matching the engine and version of the browser
- browserMatch,
-
- // The deferred used on DOM ready
- readyList,
-
- // The ready event handler
- DOMContentLoaded,
-
- // Save a reference to some core methods
- toString = Object.prototype.toString,
- hasOwn = Object.prototype.hasOwnProperty,
- push = Array.prototype.push,
- slice = Array.prototype.slice,
- trim = String.prototype.trim,
- indexOf = Array.prototype.indexOf,
-
// [[Class]] -> type pairs
class2type = {};
@@ -99,7 +97,7 @@
init: function( selector, context, rootjQuery ) {
var match, elem, ret, doc;
- // Handle $(""), $(null), or $(undefined)
+ // Handle $(""), $(null), $(undefined), $(false)
if ( !selector ) {
return this;
}
@@ -111,55 +109,33 @@
return this;
}
- // The body element only exists once, optimize finding it
- if ( selector === "body" && !context && document.body ) {
- this.context = document;
- this[0] = document.body;
- this.selector = selector;
- this.length = 1;
- return this;
- }
-
// Handle HTML strings
if ( typeof selector === "string" ) {
- // Are we dealing with HTML string or an ID?
if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
// Assume that strings that start and end with <> are HTML and skip the regex check
match = [ null, selector, null ];
} else {
- match = quickExpr.exec( selector );
+ match = rquickExpr.exec( selector );
}
- // Verify a match, and that no context was specified for #id
+ // Match html or make sure no context is specified for #id
if ( match && (match[1] || !context) ) {
// HANDLE: $(html) -> $(array)
if ( match[1] ) {
context = context instanceof jQuery ? context[0] : context;
- doc = ( context ? context.ownerDocument || context : document );
+ doc = ( context && context.nodeType ? context.ownerDocument || context : document );
- // If a single string is passed in and it's a single tag
- // just do a createElement and skip the rest
- ret = rsingleTag.exec( selector );
-
- if ( ret ) {
- if ( jQuery.isPlainObject( context ) ) {
- selector = [ document.createElement( ret[1] ) ];
- jQuery.fn.attr.call( selector, context, true );
-
- } else {
- selector = [ doc.createElement( ret[1] ) ];
- }
-
- } else {
- ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
- selector = ( ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment ).childNodes;
+ // scripts is true for back-compat
+ selector = jQuery.parseHTML( match[1], doc, true );
+ if ( rsingleTag.test( match[1] ) && jQuery.isPlainObject( context ) ) {
+ this.attr.call( selector, context, true );
}
return jQuery.merge( this, selector );
- // HANDLE: $("#id")
+ // HANDLE: $(#id)
} else {
elem = document.getElementById( match[2] );
@@ -210,7 +186,7 @@
selector: "",
// The current version of jQuery being used
- jquery: "1.7.1",
+ jquery: "1.8.2",
// The default length of a jQuery object is 0
length: 0,
@@ -221,7 +197,7 @@
},
toArray: function() {
- return slice.call( this, 0 );
+ return core_slice.call( this );
},
// Get the Nth element in the matched element set OR
@@ -239,16 +215,10 @@
// Take an array of elements and push it onto the stack
// (returning the new matched element set)
pushStack: function( elems, name, selector ) {
+
// Build a new jQuery matched element set
- var ret = this.constructor();
+ var ret = jQuery.merge( this.constructor(), elems );
- if ( jQuery.isArray( elems ) ) {
- push.apply( ret, elems );
-
- } else {
- jQuery.merge( ret, elems );
- }
-
// Add the old object onto the stack (as a reference)
ret.prevObject = this;
@@ -272,11 +242,8 @@
},
ready: function( fn ) {
- // Attach the listeners
- jQuery.bindReady();
-
// Add the callback
- readyList.add( fn );
+ jQuery.ready.promise().done( fn );
return this;
},
@@ -297,8 +264,8 @@
},
slice: function() {
- return this.pushStack( slice.apply( this, arguments ),
- "slice", slice.call(arguments).join(",") );
+ return this.pushStack( core_slice.apply( this, arguments ),
+ "slice", core_slice.call(arguments).join(",") );
},
map: function( callback ) {
@@ -313,7 +280,7 @@
// For internal use only.
// Behaves like an Array's method, not like a jQuery method.
- push: push,
+ push: core_push,
sort: [].sort,
splice: [].splice
};
@@ -416,73 +383,31 @@
// Handle when the DOM is ready
ready: function( wait ) {
- // Either a released hold or an DOMready/load event and not yet ready
- if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
- // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
- if ( !document.body ) {
- return setTimeout( jQuery.ready, 1 );
- }
- // Remember that the DOM is ready
- jQuery.isReady = true;
-
- // If a normal DOM Ready event fired, decrement, and wait if need be
- if ( wait !== true && --jQuery.readyWait > 0 ) {
- return;
- }
-
- // If there are functions bound, to execute
- readyList.fireWith( document, [ jQuery ] );
-
- // Trigger any bound ready events
- if ( jQuery.fn.trigger ) {
- jQuery( document ).trigger( "ready" ).off( "ready" );
- }
- }
- },
-
- bindReady: function() {
- if ( readyList ) {
+ // Abort if there are pending holds or we're already ready
+ if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
return;
}
- readyList = jQuery.Callbacks( "once memory" );
-
- // Catch cases where $(document).ready() is called after the
- // browser event has already occurred.
- if ( document.readyState === "complete" ) {
- // Handle it asynchronously to allow scripts the opportunity to delay ready
+ // Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+ if ( !document.body ) {
return setTimeout( jQuery.ready, 1 );
}
- // Mozilla, Opera and webkit nightlies currently support this event
- if ( document.addEventListener ) {
- // Use the handy event callback
- document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+ // Remember that the DOM is ready
+ jQuery.isReady = true;
- // A fallback to window.onload, that will always work
- window.addEventListener( "load", jQuery.ready, false );
+ // If a normal DOM Ready event fired, decrement, and wait if need be
+ if ( wait !== true && --jQuery.readyWait > 0 ) {
+ return;
+ }
- // If IE event model is used
- } else if ( document.attachEvent ) {
- // ensure firing before onload,
- // maybe late but safe also for iframes
- document.attachEvent( "onreadystatechange", DOMContentLoaded );
+ // If there are functions bound, to execute
+ readyList.resolveWith( document, [ jQuery ] );
- // A fallback to window.onload, that will always work
- window.attachEvent( "onload", jQuery.ready );
-
- // If IE and not a frame
- // continually check to see if the document is ready
- var toplevel = false;
-
- try {
- toplevel = window.frameElement == null;
- } catch(e) {}
-
- if ( document.documentElement.doScroll && toplevel ) {
- doScrollCheck();
- }
+ // Trigger any bound ready events
+ if ( jQuery.fn.trigger ) {
+ jQuery( document ).trigger("ready").off("ready");
}
},
@@ -497,9 +422,8 @@
return jQuery.type(obj) === "array";
},
- // A crude way of determining if an object is a window
isWindow: function( obj ) {
- return obj && typeof obj === "object" && "setInterval" in obj;
+ return obj != null && obj == obj.window;
},
isNumeric: function( obj ) {
@@ -509,7 +433,7 @@
type: function( obj ) {
return obj == null ?
String( obj ) :
- class2type[ toString.call(obj) ] || "object";
+ class2type[ core_toString.call(obj) ] || "object";
},
isPlainObject: function( obj ) {
@@ -523,8 +447,8 @@
try {
// Not own constructor property must be Object
if ( obj.constructor &&
- !hasOwn.call(obj, "constructor") &&
- !hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+ !core_hasOwn.call(obj, "constructor") &&
+ !core_hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
return false;
}
} catch ( e ) {
@@ -538,11 +462,12 @@
var key;
for ( key in obj ) {}
- return key === undefined || hasOwn.call( obj, key );
+ return key === undefined || core_hasOwn.call( obj, key );
},
isEmptyObject: function( obj ) {
- for ( var name in obj ) {
+ var name;
+ for ( name in obj ) {
return false;
}
return true;
@@ -552,8 +477,32 @@
throw new Error( msg );
},
+ // data: string of html
+ // context (optional): If specified, the fragment will be created in this context, defaults to document
+ // scripts (optional): If true, will include scripts passed in the html string
+ parseHTML: function( data, context, scripts ) {
+ var parsed;
+ if ( !data || typeof data !== "string" ) {
+ return null;
+ }
+ if ( typeof context === "boolean" ) {
+ scripts = context;
+ context = 0;
+ }
+ context = context || document;
+
+ // Single tag
+ if ( (parsed = rsingleTag.exec( data )) ) {
+ return [ context.createElement( parsed[1] ) ];
+ }
+
+ parsed = jQuery.buildFragment( [ data ], context, scripts ? null : [] );
+ return jQuery.merge( [],
+ (parsed.cacheable ? jQuery.clone( parsed.fragment ) : parsed.fragment).childNodes );
+ },
+
parseJSON: function( data ) {
- if ( typeof data !== "string" || !data ) {
+ if ( !data || typeof data !== "string") {
return null;
}
@@ -580,6 +529,9 @@
// Cross-browser xml parsing
parseXML: function( data ) {
var xml, tmp;
+ if ( !data || typeof data !== "string" ) {
+ return null;
+ }
try {
if ( window.DOMParser ) { // Standard
tmp = new DOMParser();
@@ -604,7 +556,7 @@
// Workarounds based on findings by Jim Driscoll
// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
globalEval: function( data ) {
- if ( data && rnotwhite.test( data ) ) {
+ if ( data && core_rnotwhite.test( data ) ) {
// We use execScript on Internet Explorer
// We use an anonymous function so that context is window
// rather than jQuery in Firefox
@@ -621,25 +573,26 @@
},
nodeName: function( elem, name ) {
- return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+ return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
},
// args is for internal usage only
- each: function( object, callback, args ) {
- var name, i = 0,
- length = object.length,
- isObj = length === undefined || jQuery.isFunction( object );
+ each: function( obj, callback, args ) {
+ var name,
+ i = 0,
+ length = obj.length,
+ isObj = length === undefined || jQuery.isFunction( obj );
if ( args ) {
if ( isObj ) {
- for ( name in object ) {
- if ( callback.apply( object[ name ], args ) === false ) {
+ for ( name in obj ) {
+ if ( callback.apply( obj[ name ], args ) === false ) {
break;
}
}
} else {
for ( ; i < length; ) {
- if ( callback.apply( object[ i++ ], args ) === false ) {
+ if ( callback.apply( obj[ i++ ], args ) === false ) {
break;
}
}
@@ -648,71 +601,72 @@
// A special, fast, case for the most common use of each
} else {
if ( isObj ) {
- for ( name in object ) {
- if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+ for ( name in obj ) {
+ if ( callback.call( obj[ name ], name, obj[ name ] ) === false ) {
break;
}
}
} else {
for ( ; i < length; ) {
- if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+ if ( callback.call( obj[ i ], i, obj[ i++ ] ) === false ) {
break;
}
}
}
}
- return object;
+ return obj;
},
// Use native String.trim function wherever possible
- trim: trim ?
+ trim: core_trim && !core_trim.call("\uFEFF\xA0") ?
function( text ) {
return text == null ?
"" :
- trim.call( text );
+ core_trim.call( text );
} :
// Otherwise use our own trimming functionality
function( text ) {
return text == null ?
"" :
- text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+ ( text + "" ).replace( rtrim, "" );
},
// results is for internal usage only
- makeArray: function( array, results ) {
- var ret = results || [];
+ makeArray: function( arr, results ) {
+ var type,
+ ret = results || [];
- if ( array != null ) {
+ if ( arr != null ) {
// The window, strings (and functions) also have 'length'
// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
- var type = jQuery.type( array );
+ type = jQuery.type( arr );
- if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
- push.call( ret, array );
+ if ( arr.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( arr ) ) {
+ core_push.call( ret, arr );
} else {
- jQuery.merge( ret, array );
+ jQuery.merge( ret, arr );
}
}
return ret;
},
- inArray: function( elem, array, i ) {
+ inArray: function( elem, arr, i ) {
var len;
- if ( array ) {
- if ( indexOf ) {
- return indexOf.call( array, elem, i );
+ if ( arr ) {
+ if ( core_indexOf ) {
+ return core_indexOf.call( arr, elem, i );
}
- len = array.length;
+ len = arr.length;
i = i ? i < 0 ? Math.max( 0, len + i ) : i : 0;
for ( ; i < len; i++ ) {
// Skip accessing in sparse arrays
- if ( i in array && array[ i ] === elem ) {
+ if ( i in arr && arr[ i ] === elem ) {
return i;
}
}
@@ -722,11 +676,12 @@
},
merge: function( first, second ) {
- var i = first.length,
+ var l = second.length,
+ i = first.length,
j = 0;
- if ( typeof second.length === "number" ) {
- for ( var l = second.length; j < l; j++ ) {
+ if ( typeof l === "number" ) {
+ for ( ; j < l; j++ ) {
first[ i++ ] = second[ j ];
}
@@ -742,12 +697,15 @@
},
grep: function( elems, callback, inv ) {
- var ret = [], retVal;
+ var retVal,
+ ret = [],
+ i = 0,
+ length = elems.length;
inv = !!inv;
// Go through the array, only saving the items
// that pass the validator function
- for ( var i = 0, length = elems.length; i < length; i++ ) {
+ for ( ; i < length; i++ ) {
retVal = !!callback( elems[ i ], i );
if ( inv !== retVal ) {
ret.push( elems[ i ] );
@@ -759,7 +717,8 @@
// arg is for internal usage only
map: function( elems, callback, arg ) {
- var value, key, ret = [],
+ var value, key,
+ ret = [],
i = 0,
length = elems.length,
// jquery objects are treated as arrays
@@ -796,8 +755,10 @@
// Bind a function to a context, optionally partially applying any
// arguments.
proxy: function( fn, context ) {
+ var tmp, args, proxy;
+
if ( typeof context === "string" ) {
- var tmp = fn[ context ];
+ tmp = fn[ context ];
context = fn;
fn = tmp;
}
@@ -809,178 +770,162 @@
}
// Simulated bind
- var args = slice.call( arguments, 2 ),
- proxy = function() {
- return fn.apply( context, args.concat( slice.call( arguments ) ) );
- };
+ args = core_slice.call( arguments, 2 );
+ proxy = function() {
+ return fn.apply( context, args.concat( core_slice.call( arguments ) ) );
+ };
// Set the guid of unique handler to the same of original handler, so it can be removed
- proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+ proxy.guid = fn.guid = fn.guid || jQuery.guid++;
return proxy;
},
- // Mutifunctional method to get and set values to a collection
+ // Multifunctional method to get and set values of a collection
// The value/s can optionally be executed if it's a function
- access: function( elems, key, value, exec, fn, pass ) {
- var length = elems.length;
+ access: function( elems, fn, key, value, chainable, emptyGet, pass ) {
+ var exec,
+ bulk = key == null,
+ i = 0,
+ length = elems.length;
- // Setting many attributes
- if ( typeof key === "object" ) {
- for ( var k in key ) {
- jQuery.access( elems, k, key[k], exec, fn, value );
+ // Sets many values
+ if ( key && typeof key === "object" ) {
+ for ( i in key ) {
+ jQuery.access( elems, fn, i, key[i], 1, emptyGet, value );
}
- return elems;
- }
+ chainable = 1;
- // Setting one attribute
- if ( value !== undefined ) {
+ // Sets one value
+ } else if ( value !== undefined ) {
// Optionally, function values get executed if exec is true
- exec = !pass && exec && jQuery.isFunction(value);
+ exec = pass === undefined && jQuery.isFunction( value );
- for ( var i = 0; i < length; i++ ) {
- fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+ if ( bulk ) {
+ // Bulk operations only iterate when executing function values
+ if ( exec ) {
+ exec = fn;
+ fn = function( elem, key, value ) {
+ return exec.call( jQuery( elem ), value );
+ };
+
+ // Otherwise they run against the entire set
+ } else {
+ fn.call( elems, value );
+ fn = null;
+ }
}
- return elems;
+ if ( fn ) {
+ for (; i < length; i++ ) {
+ fn( el...
[truncated message content] |
|
From: <net...@us...> - 2010-11-06 18:48:47
|
Revision: 89
http://openautomation.svn.sourceforge.net/openautomation/?rev=89&view=rev
Author: netzkind
Date: 2010-11-06 18:48:39 +0000 (Sat, 06 Nov 2010)
Log Message:
-----------
new design, set as default: "discreet"
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/index.html
CometVisu/trunk/visu/lib/templateengine.js
Added Paths:
-----------
CometVisu/trunk/visu/fonts/
CometVisu/trunk/visu/fonts/AUTHORS
CometVisu/trunk/visu/fonts/COPYING
CometVisu/trunk/visu/fonts/ChangeLog
CometVisu/trunk/visu/fonts/License.txt
CometVisu/trunk/visu/fonts/README
CometVisu/trunk/visu/fonts/TODO
CometVisu/trunk/visu/fonts/liberationsans-bold.ttf
CometVisu/trunk/visu/fonts/liberationsans-regular.ttf
CometVisu/trunk/visu/images/
CometVisu/trunk/visu/images/body_bg.png
CometVisu/trunk/visu/images/button_bg.png
CometVisu/trunk/visu/images/dot_green.png
CometVisu/trunk/visu/images/dot_red.png
CometVisu/trunk/visu/images/gradient.png
CometVisu/trunk/visu/images/hr_bg.png
CometVisu/trunk/visu/style_discreet.css
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-11-06 18:10:49 UTC (rev 88)
+++ CometVisu/trunk/ChangeLog 2010-11-06 18:48:39 UTC (rev 89)
@@ -11,6 +11,7 @@
- Added XML Schema / XSD to validate config-XML
- New Feature: tag for videos (HTML5 based)
- changed procedures for creating new widgets
+- added design "discreet", set as default
0.5.0
=====
Added: CometVisu/trunk/visu/fonts/AUTHORS
===================================================================
--- CometVisu/trunk/visu/fonts/AUTHORS (rev 0)
+++ CometVisu/trunk/visu/fonts/AUTHORS 2010-11-06 18:48:39 UTC (rev 89)
@@ -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/fonts/COPYING
===================================================================
--- CometVisu/trunk/visu/fonts/COPYING (rev 0)
+++ CometVisu/trunk/visu/fonts/COPYING 2010-11-06 18:48:39 UTC (rev 89)
@@ -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/fonts/ChangeLog
===================================================================
--- CometVisu/trunk/visu/fonts/ChangeLog (rev 0)
+++ CometVisu/trunk/visu/fonts/ChangeLog 2010-11-06 18:48:39 UTC (rev 89)
@@ -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/fonts/License.txt
===================================================================
--- CometVisu/trunk/visu/fonts/L...
[truncated message content] |
|
From: <net...@us...> - 2010-11-19 21:43:29
|
Revision: 140
http://openautomation.svn.sourceforge.net/openautomation/?rev=140&view=rev
Author: netzkind
Date: 2010-11-19 21:43:22 +0000 (Fri, 19 Nov 2010)
Log Message:
-----------
renamed styles to stylings, added dpt-dropdown for editor, fixed bugs:
https://sourceforge.net/tracker/?func=detail&aid=3109425&group_id=296426&atid=1251141
https://sourceforge.net/tracker/?func=detail&aid=3109428&group_id=296426&atid=1251141
https://sourceforge.net/tracker/?func=detail&aid=3109427&group_id=296426&atid=1251141
https://sourceforge.net/tracker/?func=detail&aid=3109424&group_id=296426&atid=1251141
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/edit/save_config.php
CometVisu/trunk/visu/edit/visuconfig_edit.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/lib/visudesign_custom.js
CometVisu/trunk/visu/lib/visudesign_pure.js
CometVisu/trunk/visu/visu_config.xml
CometVisu/trunk/visu/visu_config.xsd
Added Paths:
-----------
CometVisu/trunk/visu/edit/dpt_list.csv
CometVisu/trunk/visu/edit/dpt_list.json
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2010-11-18 19:19:29 UTC (rev 139)
+++ CometVisu/trunk/ChangeLog 2010-11-19 21:43:22 UTC (rev 140)
@@ -12,6 +12,7 @@
- New Feature: tag for videos (HTML5 based)
- changed procedures for creating new widgets
- added design "discreet", set as default
+- changed name for styles; new name: styling / stylings
0.5.0
=====
Added: CometVisu/trunk/visu/edit/dpt_list.csv
===================================================================
--- CometVisu/trunk/visu/edit/dpt_list.csv (rev 0)
+++ CometVisu/trunk/visu/edit/dpt_list.csv 2010-11-19 21:43:22 UTC (rev 140)
@@ -0,0 +1,327 @@
+"dpt","name"
+"1.001","DPT_Switch"
+"1.002","DPT_Bool"
+"1.003","DPT_Enable"
+"1.004","DPT_Ramp"
+"1.005","DPT_Alarm"
+"1.006","DPT_BinaryValue"
+"1.007","DPT_Step"
+"1.008","DPT_UpDown"
+"1.009","DPT_OpenClose"
+"1.010","DPT_Start"
+"1.011","DPT_State"
+"1.012","DPT_Invert"
+"1.013","DPT_DimSendStyle"
+"1.014","DPT_InputSource"
+"1.015","DPT_Reset"
+"1.016","DPT_Ack"
+"1.017","DPT_Trigger"
+"1.018","DPT_Occupancy"
+"1.019","DPT_Window_Door"
+"1.021","DPT_LogicalFunction"
+"1.022","DPT_Scene_AB"
+"1.023","DPT_ShutterBlinds_Mode"
+"1.100","DPT_Heat/Cool"
+"2.001","DPT_Switch_Control"
+"2.002","DPT_Bool_Control"
+"2.003","DPT_Enable_Control"
+"2.004","DPT_Ramp_Control"
+"2.005","DPT_Alarm_Control"
+"2.006","DPT_BinaryValue_Control"
+"2.007","DPT_Step_Control"
+"2.008","DPT_Direction1_Control"
+"2.009","DPT_Direction2_Control"
+"2.010","DPT_Start_Control"
+"2.011","DPT_State_Control"
+"2.012","DPT_Invert_Control"
+"3.007","DPT_Control_Dimming"
+"3.008","DPT_Control_Blinds"
+"4.001","DPT_Char_ASCII"
+"4.002","DPT_Char_8859_1"
+"5.001","DPT_Scaling"
+"5.003","DPT_Angle"
+"5.004","DPT_Percent_U8"
+"5.005","DPT_DecimalFactor"
+"5.006","DPT_Tariff"
+"5.010","DPT_Value_1_Ucount"
+"6.001","DPT_Percent_V8"
+"6.010","DPT_Value_1_Count"
+"6.020","DPT_Status_Mode3"
+"7.001","DPT_Value_2_Ucount"
+"7.002","DPT_TimePeriodMsec"
+"7.003","DPT_TimePeriod10MSec"
+"7.004","DPT_TimePeriod100MSec"
+"7.005","DPT_TimePeriodSec"
+"7.006","DPT_TimePeriodMin"
+"7.007","DPT_TimePeriodHrs"
+"7.010","DPT_PropDataType"
+"7.011","DPT_Length_mm"
+"7.012","DPT_UElCurrentmA"
+"7.013","DPT_Brightness"
+"8.001","DPT_Value_2_Count"
+"8.002","DPT_DeltaTimeMsec"
+"8.003","DPT_DeltaTime10MSec"
+"8.004","DPT_DeltaTime100MSec"
+"8.005","DPT_DeltaTimeSec"
+"8.006","DPT_DeltaTimeMin"
+"8.007","DPT_DeltaTimeHrs"
+"8.010","DPT_Percent_V16"
+"8.011","DPT_Rotation_Angle"
+"9.001","DPT_Value_Temp"
+"9.002","DPT_Value_Tempd"
+"9.003","DPT_Value_Tempa"
+"9.004","DPT_Value_Lux"
+"9.005","DPT_Value_Wsp"
+"9.006","DPT_Value_Pres"
+"9.007","DPT_Value_Humidity"
+"9.008","DPT_Value_AirQuality"
+"9.010","DPT_Value_Time1"
+"9.011","DPT_Value_Time2"
+"9.020","DPT_Value_Volt"
+"9.021","DPT_Value_Curr"
+"9.022","DPT_PowerDensity"
+"9.023","DPT_KelvinPerPercent"
+"9.024","DPT_Power"
+"9.025","DPT_Value_Volume_Flow"
+"9.026","DPT_Rain_Amount"
+"9.027","DPT_Value_Temp_F"
+"9.028","DPT_Value_Wsp_kmh"
+"10.001","DPT_TimeOfDay"
+"11.001","DPT_Date"
+"12.001","DPT_Value_4_Ucount"
+"13.001","DPT_Value_4_Count"
+"13.010","DPT_ActiveEnergy"
+"13.011","DPT_ApparantEnergy"
+"13.012","DPT_ReactiveEnergy"
+"13.013","DPT_ActiveEnergy_kWh"
+"13.014","DPT_ApparantEnergy_kVAh"
+"13.015","DPT_ReactiveEnergy_kVARh"
+"13.100","DPT_LongDeltaTimeSec"
+"14.000","DPT_Value_Acceleration"
+"14.001","DPT_Value_Acceleration_Angular"
+"14.002","DPT_Value_Activation_Energy"
+"14.003","DPT_Value_Activity"
+"14.004","DPT_Value_Mol"
+"14.005","DPT_Value_Amplitude"
+"14.006","DPT_Value_AngleRad"
+"14.007","DPT_Value_AngleDeg"
+"14.008","DPT_Value_Angular_Momentum"
+"14.009","DPT_Value_Angular_Velocity"
+"14.010","DPT_Value_Area"
+"14.011","DPT_Value_Capacitance"
+"14.012","DPT_Value_Charge_DensitySurface"
+"14.013","DPT_Value_Charge_DensityVolume"
+"14.014","DPT_Value_Compressibility"
+"14.015","DPT_Value_Conductance"
+"14.016","DPT_Value_Electrical_Conductivity"
+"14.017","DPT_Value_Density"
+"14.018","DPT_Value_Electric_Charge"
+"14.019","DPT_Value_Electric_Current"
+"14.020","DPT_Value_Electric_CurrentDensity"
+"14.021","DPT_Value_Electric_DipoleMoment"
+"14.022","DPT_Value_Electric_Displacement"
+"14.023","DPT_Value_Electric_FieldStrength"
+"14.024","DPT_Value_Electric_Flux"
+"14.025","DPT_Value_Electric_FluxDensity"
+"14.026","DPT_Value_Electric_Polarization"
+"14.027","DPT_Value_Electric_Potential"
+"14.028","DPT_Value_Electric_PotentialDifference"
+"14.029","DPT_Value_ElectromagneticMoment"
+"14.030","DPT_Value_Electromotive_Force"
+"14.031","DPT_Value_Energy"
+"14.032","DPT_Value_Force"
+"14.033","DPT_Value_Frequency"
+"14.034","DPT_Value_Angular_Frequency"
+"14.035","DPT_Value_Heat_Capacity"
+"14.036","DPT_Value_Heat_FlowRate"
+"14.037","DPT_Value_Heat_Quantity"
+"14.038","DPT_Value_Impedance"
+"14.039","DPT_Value_Length"
+"14.040","DPT_Value_Light_Quantity"
+"14.041","DPT_Value_Luminance"
+"14.042","DPT_Value_Luminous_Flux"
+"14.043","DPT_Value_Luminous_Intensity"
+"14.044","DPT_Value_Magnetic_FieldStrength"
+"14.045","DPT_Value_Magnetic_Flux"
+"14.046","DPT_Value_Magnetic_FluxDensity"
+"14.047","DPT_Value_Magnetic_Moment"
+"14.048","DPT_Value_Magnetic_Polarization"
+"14.049","DPT_Value_Magnetization"
+"14.050","DPT_Value_MagnetomotiveForce"
+"14.051","DPT_Value_Mass"
+"14.052","DPT_Value_MassFlux"
+"14.053","DPT_Value_Momentum"
+"14.054","DPT_Value_Phase_AngleRad"
+"14.055","DPT_Value_Phase_AngleDeg"
+"14.056","DPT_Value_Power"
+"14.057","DPT_Value_Power_Factor"
+"14.058","DPT_Value_Pressure"
+"14.059","DPT_Value_Reactance"
+"14.060","DPT_Value_Resistance"
+"14.061","DPT_Value_Resistivity"
+"14.062","DPT_Value_SelfInductance"
+"14.063","DPT_Value_SolidAngle"
+"14.064","DPT_Value_Sound_Intensity"
+"14.065","DPT_Value_Speed"
+"14.066","DPT_Value_Stress"
+"14.067","DPT_Value_Surface_Tension"
+"14.068","DPT_Value_Common_Temperature"
+"14.069","DPT_Value_Absolute_Temperature"
+"14.070","DPT_Value_TemperatureDifference"
+"14.071","DPT_Value_Thermal_Capacity"
+"14.072","DPT_Value_Thermal_Conductivity"
+"14.073","DPT_Value_ThermoelectricPower"
+"14.074","DPT_Value_Time"
+"14.075","DPT_Value_Torque"
+"14.076","DPT_Value_Volume"
+"14.077","DPT_Value_Volume_Flux"
+"14.078","DPT_Value_Weight"
+"14.079","DPT_Value_Work"
+"15.000","DPT_Access_Data"
+"16.000","DPT_String_ASCII"
+"16.001","DPT_String_8859_1"
+"17.001","DPT_SceneNumber"
+"18.001","DPT_SceneControl"
+"19.001","DPT_DateTime"
+"20.001","DPT_SCLOMode"
+"20.002","DPT_BuildingMode"
+"20.003","DPT_OccMode"
+"20.004","DPT_Priority"
+"20.005","DPT_LightApplicationMode"
+"20.006","DPT_ApplicationArea"
+"20.007","DPT_AlarmClassType"
+"20.008","DPT_PSUMode"
+"20.011","DPT_ErrorClass_System"
+"20.012","DPT_ErrorClass_HVAC"
+"20.013","DPT_Time_Delay"
+"20.014","DPT_Beaufort_Wind_Force_Scale"
+"20.017","DPT_SensorSelect"
+"20.100","DPT_FuelType"
+"20.101","DPT_BurnerType"
+"20.102","DPT_HVACMode"
+"20.103","DPT_DHWMode"
+"20.104","DPT_LoadPriority"
+"20.105","DPT_HVACContrMode"
+"20.106","DPT_HVACEmergMode"
+"20.107","DPT_ChangeoverMode"
+"20.108","DPT_ValveMode"
+"20.109","DPT_DamperMode"
+"20.110","DPT_HeaterMode"
+"20.111","DPT_FanMode"
+"20.112","DPT_MasterSlaveMode"
+"20.113","DPT_StatusRoomSetp"
+"20.600","DPT_Behaviour_Lock_Unlock"
+"20.601","DPT_Behaviour_Bus_Power_Up_Down"
+"20.1000","DPT_CommMode"
+"20.1001","DPT_AddInfoTypes"
+"20.1002","DPT_RF_ModeSelect"
+"20.1003","DPT_RF_FilterSelect"
+"21.001","DPT_StatusGen"
+"21.002","DPT_Device_Control"
+"21.100","DPT_ForceSign"
+"21.101","DPT_ForceSignCool"
+"21.102","DPT_StatusRHC"
+"21.103","DPT_StatusSDHWC"
+"21.104","DPT_FuelTypeSet"
+"21.105","DPT_StatusRCC"
+"21.106","DPT_StatusAHU"
+"21.1000","DPT_RF_ModeInfo"
+"21.1001","DPT_RF_FilterInfo"
+"21.1010","DPT_Channel_Activation_8"
+"22.100","DPT_StatusDHWC"
+"22.101","DPT_StatusRHCC"
+"22.1000","DPT_Media"
+"22.1010","DPT_Channel_Activation_16"
+"23.001","DPT_OnOff_Action"
+"23.002","DPT_Alarm_Reaction"
+"23.003","DPT_UpDown_Action"
+"23.102","DPT_HVAC_PB_Action"
+"24.001","DPT_VarString_8859_1"
+"25.1000","DPT_DoubleNibble"
+"26.001","DPT_SceneInfo"
+"27.001","DPT_CombinedInfoOnOff"
+"28.001","DPT_UTF-8"
+"29.010","DPT_ActiveEnergy_V64"
+"29.011","DPT_ApparantEnergy_V64"
+"29.012","DPT_ReactiveEnergy_V64"
+"30.1010","DPT_Channel_Activation_24"
+"31.101","DPT_PB_Action_HVAC_Extended"
+"200.100","DPT_Heat/Cool_Z"
+"200.101","DPT_BinaryValue_Z"
+"201.100","DPT_HVACMode_Z"
+"201.102","DPT_DHWMode_Z"
+"201.104","DPT_HVACContrMode_Z"
+"201.105","DPT_EnablH/Cstage_Z"
+"201.107","DPT_BuildingMode_Z"
+"201.108","DPT_OccMode_Z"
+"201.109","DPT_HVACEmergMode_Z"
+"202.001","DPT_RelValue_Z"
+"202.002","DPT_UCountValue8_Z"
+"203.002","DPT_TimePeriodMsec_Z"
+"203.003","DPT_TimePeriod10Msec_Z"
+"203.004","DPT_TimePeriod100Msec_Z"
+"203.005","DPT_TimePeriodSec_Z"
+"203.006","DPT_TimePeriodMin_Z"
+"203.007","DPT_TimePeriodHrs_Z"
+"203.011","DPT_UFlowRateLiter/h_Z"
+"203.012","DPT_UCountValue16_Z"
+"203.013","DPT_UElCurrent?A_Z"
+"203.014","DPT_PowerKW_Z"
+"203.015","DPT_AtmPressureAbs_Z"
+"203.017","DPT_PercentU16_Z"
+"203.100","DPT_HVACAirQual_Z"
+"203.101","DPT_WindSpeed_Z"
+"203.102","DPT_SunIntensity_Z"
+"203.104","DPT_HVACAirFlowAbs_Z"
+"204.001","DPT_RelSignedValue_Z"
+"205.002","DPT_DeltaTimeMsec_Z"
+"205.003","DPT_DeltaTime10Msec_Z"
+"205.004","DPT_DeltaTime100Msec_Z"
+"205.005","DPT_DeltaTimeSec_Z"
+"205.006","DPT_DeltaTimeMin_Z"
+"205.007","DPT_DeltaTimeHrs_Z"
+"205.100","DPT_TempHVACAbs_Z"
+"205.101","DPT_TempHVACRel_Z"
+"205.102","DPT_HVACAirFlowRel_Z"
+"206.100","DPT_HVACModeNext"
+"206.102","DPT_DHWModeNext"
+"206.104","DPT_OccModeNext"
+"206.105","DPT_BuildingModeNext"
+"207.100","DPT_StatusBUC"
+"207.101","DPT_LockSign"
+"207.102","DPT_ValueDemBOC"
+"207.104","DPT_ActPosDemAbs"
+"207.105","DPT_StatusAct"
+"209.100","DPT_StatusHPM"
+"209.101","DPT_TempRoomDemAbs"
+"209.102","DPT_StatusCPM"
+"209.103","DPT_StatusWTC"
+"210.100","DPT_TempFlowWaterDemAbs"
+"211.100","DPT_EnergyDemWater"
+"212.100","DPT_TempRoomSetpSetShift[3]"
+"212.101","DPT_TempRoomSetpSet[3]"
+"213.100","DPT_TempRoomSetpSet[4]"
+"213.101","DPT_TempDHWSetpSet[4]"
+"213.102","DPT_TempRoomSetpSetShift[4]"
+"214.100","DPT_PowerFlowWaterDemHPM"
+"214.101","DPT_PowerFlowWaterDemCPM"
+"215.100","DPT_StatusBOC"
+"215.101","DPT_StatusCC"
+"216.100","DPT_SpecHeatProd"
+"217.001","DPT_Version"
+"218.001","DPT_VolumeLiter_Z"
+"219.001","DPT_AlarmInfo"
+"220.100","DPT_TempHVACAbsNext"
+"221.001","DPT_SerNum"
+"222.100","DPT_TempRoomSetpSetF16[3]"
+"222.101","DPT_TempRoomSetpSetShiftF16[3]"
+"223.100","DPT_EnergyDemAir"
+"224.100","DPT_TempSupply"
+"225.001","DPT_ScalingSpeed"
+"225.002","DPT_Scaling_Step_Time"
+"229.001","DPT_MeteringValue"
+"230.1000","DPT_MBus_Address"
+"231.001","DPT_Locale_ASCII"
+"232.600","DPT_Colour_RGB"
+"234.001","DPT_LanguageCodeAlpha2_ASCII"
+"234.002","DPT_RegionCodeAlpha2_ASCII"
Added: CometVisu/trunk/visu/edit/dpt_list.json
===================================================================
--- CometVisu/trunk/visu/edit/dpt_list.json (rev 0)
+++ CometVisu/trunk/visu/edit/dpt_list.json 2010-11-19 21:43:22 UTC (rev 140)
@@ -0,0 +1,1305 @@
+[{
+ "dpt":"1.001",
+ "name":"DPT_Switch"
+ },
+ {
+ "dpt":"1.002",
+ "name":"DPT_Bool"
+ },
+ {
+ "dpt":"1.003",
+ "name":"DPT_Enable"
+ },
+ {
+ "dpt":"1.004",
+ "name":"DPT_Ramp"
+ },
+ {
+ "dpt":"1.005",
+ "name":"DPT_Alarm"
+ },
+ {
+ "dpt":"1.006",
+ "name":"DPT_BinaryValue"
+ },
+ {
+ "dpt":"1.007",
+ "name":"DPT_Step"
+ },
+ {
+ "dpt":"1.008",
+ "name":"DPT_UpDown"
+ },
+ {
+ "dpt":"1.009",
+ "name":"DPT_OpenClose"
+ },
+ {
+ "dpt":"1.010",
+ "name":"DPT_Start"
+ },
+ {
+ "dpt":"1.011",
+ "name":"DPT_State"
+ },
+ {
+ "dpt":"1.012",
+ "name":"DPT_Invert"
+ },
+ {
+ "dpt":"1.013",
+ "name":"DPT_DimSendStyle"
+ },
+ {
+ "dpt":"1.014",
+ "name":"DPT_InputSource"
+ },
+ {
+ "dpt":"1.015",
+ "name":"DPT_Reset"
+ },
+ {
+ "dpt":"1.016",
+ "name":"DPT_Ack"
+ },
+ {
+ "dpt":"1.017",
+ "name":"DPT_Trigger"
+ },
+ {
+ "dpt":"1.018",
+ "name":"DPT_Occupancy"
+ },
+ {
+ "dpt":"1.019",
+ "name":"DPT_Window_Door"
+ },
+ {
+ "dpt":"1.021",
+ "name":"DPT_LogicalFunction"
+ },
+ {
+ "dpt":"1.022",
+ "name":"DPT_Scene_AB"
+ },
+ {
+ "dpt":"1.023",
+ "name":"DPT_ShutterBlinds_Mode"
+ },
+ {
+ "dpt":"1.100",
+ "name":"DPT_Heat/Cool"
+ },
+ {
+ "dpt":"2.001",
+ "name":"DPT_Switch_Control"
+ },
+ {
+ "dpt":"2.002",
+ "name":"DPT_Bool_Control"
+ },
+ {
+ "dpt":"2.003",
+ "name":"DPT_Enable_Control"
+ },
+ {
+ "dpt":"2.004",
+ "name":"DPT_Ramp_Control"
+ },
+ {
+ "dpt":"2.005",
+ "name":"DPT_Alarm_Control"
+ },
+ {
+ "dpt":"2.006",
+ "name":"DPT_BinaryValue_Control"
+ },
+ {
+ "dpt":"2.007",
+ "name":"DPT_Step_Control"
+ },
+ {
+ "dpt":"2.008",
+ "name":"DPT_Direction1_Control"
+ },
+ {
+ "dpt":"2.009",
+ "name":"DPT_Direction2_Control"
+ },
+ {
+ "dpt":"2.010",
+ "name":"DPT_Start_Control"
+ },
+ {
+ "dpt":"2.011",
+ "name":"DPT_State_Control"
+ },
+ {
+ "dpt":"2.012",
+ "name":"DPT_Invert_Control"
+ },
+ {
+ "dpt":"3.007",
+ "name":"DPT_Control_Dimming"
+ },
+ {
+ "dpt":"3.008",
+ "name":"DPT_Control_Blinds"
+ },
+ {
+ "dpt":"4.001",
+ "name":"DPT_Char_ASCII"
+ },
+ {
+ "dpt":"4.002",
+ "name":"DPT_Char_8859_1"
+ },
+ {
+ "dpt":"5.001",
+ "name":"DPT_Scaling"
+ },
+ {
+ "dpt":"5.003",
+ "name":"DPT_Angle"
+ },
+ {
+ "dpt":"5.004",
+ "name":"DPT_Percent_U8"
+ },
+ {
+ "dpt":"5.005",
+ "name":"DPT_DecimalFactor"
+ },
+ {
+ "dpt":"5.006",
+ "name":"DPT_Tariff"
+ },
+ {
+ "dpt":"5.010",
+ "name":"DPT_Value_1_Ucount"
+ },
+ {
+ "dpt":"6.001",
+ "name":"DPT_Percent_V8"
+ },
+ {
+ "dpt":"6.010",
+ "name":"DPT_Value_1_Count"
+ },
+ {
+ "dpt":"6.020",
+ "name":"DPT_Status_Mode3"
+ },
+ {
+ "dpt":"7.001",
+ "name":"DPT_Value_2_Ucount"
+ },
+ {
+ "dpt":"7.002",
+ "name":"DPT_TimePeriodMsec"
+ },
+ {
+ "dpt":"7.003",
+ "name":"DPT_TimePeriod10MSec"
+ },
+ {
+ "dpt":"7.004",
+ "name":"DPT_TimePeriod100MSec"
+ },
+ {
+ "dpt":"7.005",
+ "name":"DPT_TimePeriodSec"
+ },
+ {
+ "dpt":"7.006",
+ "name":"DPT_TimePeriodMin"
+ },
+ {
+ "dpt":"7.007",
+ "name":"DPT_TimePeriodHrs"
+ },
+ {
+ "dpt":"7.010",
+ "name":"DPT_PropDataType"
+ },
+ {
+ "dpt":"7.011",
+ "name":"DPT_Length_mm"
+ },
+ {
+ "dpt":"7.012",
+ "name":"DPT_UElCurrentmA"
+ },
+ {
+ "dpt":"7.013",
+ "name":"DPT_Brightness"
+ },
+ {
+ "dpt":"8.001",
+ "name":"DPT_Value_2_Count"
+ },
+ {
+ "dpt":"8.002",
+ "name":"DPT_DeltaTimeMsec"
+ },
+ {
+ "dpt":"8.003",
+ "name":"DPT_DeltaTime10MSec"
+ },
+ {
+ "dpt":"8.004",
+ "name":"DPT_DeltaTime100MSec"
+ },
+ {
+ "dpt":"8.005",
+ "name":"DPT_DeltaTimeSec"
+ },
+ {
+ "dpt":"8.006",
+ "name":"DPT_DeltaTimeMin"
+ },
+ {
+ "dpt":"8.007",
+ "name":"DPT_DeltaTimeHrs"
+ },
+ {
+ "dpt":"8.010",
+ "name":"DPT_Percent_V16"
+ },
+ {
+ "dpt":"8.011",
+ "name":"DPT_Rotation_Angle"
+ },
+ {
+ "dpt":"9.001",
+ "name":"DPT_Value_Temp"
+ },
+ {
+ "dpt":"9.002",
+ "name":"DPT_Value_Tempd"
+ },
+ {
+ "dpt":"9.003",
+ "name":"DPT_Value_Tempa"
+ },
+ {
+ "dpt":"9.004",
+ "name":"DPT_Value_Lux"
+ },
+ {
+ "dpt":"9.005",
+ "name":"DPT_Value_Wsp"
+ },
+ {
+ "dpt":"9.006",
+ "name":"DPT_Value_Pres"
+ },
+ {
+ "dpt":"9.007",
+ "name":"DPT_Value_Humidity"
+ },
+ {
+ "dpt":"9.008",
+ "name":"DPT_Value_AirQuality"
+ },
+ {
+ "dpt":"9.010",
+ "name":"DPT_Value_Time1"
+ },
+ {
+ "dpt":"9.011",
+ "name":"DPT_Value_Time2"
+ },
+ {
+ "dpt":"9.020",
+ "name":"DPT_Value_Volt"
+ },
+ {
+ "dpt":"9.021",
+ "name":"DPT_Value_Curr"
+ },
+ {
+ "dpt":"9.022",
+ "name":"DPT_PowerDensity"
+ },
+ {
+ "dpt":"9.023",
+ "name":"DPT_KelvinPerPercent"
+ },
+ {
+ "dpt":"9.024",
+ "name":"DPT_Power"
+ },
+ {
+ "dpt":"9.025",
+ "name":"DPT_Value_Volume_Flow"
+ },
+ {
+ "dpt":"9.026",
+ "name":"DPT_Rain_Amount"
+ },
+ {
+ "dpt":"9.027",
+ "name":"DPT_Value_Temp_F"
+ },
+ {
+ "dpt":"9.028",
+ "name":"DPT_Value_Wsp_kmh"
+ },
+ {
+ "dpt":"10.001",
+ "name":"DPT_TimeOfDay"
+ },
+ {
+ "dpt":"11.001",
+ "name":"DPT_Date"
+ },
+ {
+ "dpt":"12.001",
+ "name":"DPT_Value_4_Ucount"
+ },
+ {
+ "dpt":"13.001",
+ "name":"DPT_Value_4_Count"
+ },
+ {
+ "dpt":"13.010",
+ "name":"DPT_ActiveEnergy"
+ },
+ {
+ "dpt":"13.011",
+ "name":"DPT_ApparantEnergy"
+ },
+ {
+ "dpt":"13.012",
+ "name":"DPT_ReactiveEnergy"
+ },
+ {
+ "dpt":"13.013",
+ "name":"DPT_ActiveEnergy_kWh"
+ },
+ {
+ "dpt":"13.014",
+ "name":"DPT_ApparantEnergy_kVAh"
+ },
+ {
+ "dpt":"13.015",
+ "name":"DPT_ReactiveEnergy_kVARh"
+ },
+ {
+ "dpt":"13.100",
+ "name":"DPT_LongDeltaTimeSec"
+ },
+ {
+ "dpt":"14.000",
+ "name":"DPT_Value_Acceleration"
+ },
+ {
+ "dpt":"14.001",
+ "name":"DPT_Value_Acceleration_Angular"
+ },
+ {
+ "dpt":"14.002",
+ "name":"DPT_Value_Activation_Energy"
+ },
+ {
+ "dpt":"14.003",
+ "name":"DPT_Value_Activity"
+ },
+ {
+ "dpt":"14.004",
+ "name":"DPT_Value_Mol"
+ },
+ {
+ "dpt":"14.005",
+ "name":"DPT_Value_Amplitude"
+ },
+ {
+ "dpt":"14.006",
+ "name":"DPT_Value_AngleRad"
+ },
+ {
+ "dpt":"14.007",
+ "name":"DPT_Value_AngleDeg"
+ },
+ {
+ "dpt":"14.008",
+ "name":"DPT_Value_Angular_Momentum"
+ },
+ {
+ "dpt":"14.009",
+ "name":"DPT_Value_Angular_Velocity"
+ },
+ {
+ "dpt":"14.010",
+ "name":"DPT_Value_Area"
+ },
+ {
+ "dpt":"14.011",
+ "name":"DPT_Value_Capacitance"
+ },
+ {
+ "dpt":"14.012",
+ "name":"DPT_Value_Charge_DensitySurface"
+ },
+ {
+ "dpt":"14.013",
+ "name":"DPT_Value_Charge_DensityVolume"
+ },
+ {
+ "dpt":"14.014",
+ "name":"DPT_Value_Compressibility"
+ },
+ {
+ "dpt":"14.015",
+ "name":"DPT_Value_Conductance"
+ },
+ {
+ "dpt":"14.016",
+ "name":"DPT_Value_Electrical_Conductivity"
+ },
+ {
+ "dpt":"14.017",
+ "name":"DPT_Value_Density"
+ },
+ {
+ "dpt":"14.018",
+ "name":"DPT_Value_Electric_Charge"
+ },
+ {
+ "dpt":"14.019",
+ "name":"DPT_Value_Electric_Current"
+ },
+ {
+ "dpt":"14.020",
+ "name":"DPT_Value_Electric_CurrentDensity"
+ },
+ {
+ "dpt":"14.021",
+ "name":"DPT_Value_Electric_DipoleMoment"
+ },
+ {
+ "dpt":"14.022",
+ "name":"DPT_Value_Electric_Displacement"
+ },
+ {
+ "dpt":"14.023",
+ "name":"DPT_Value_Electric_FieldStrength"
+ },
+ {
+ "dpt":"14.024",
+ "name":"DPT_Value_Electric_Flux"
+ },
+ {
+ "dpt":"14.025",
+ "name":"DPT_Value_Electric_FluxDensity"
+ },
+ {
+ "dpt":"14.026",
+ "name":"DPT_Value_Electric_Polarization"
+ },
+ {
+ "dpt":"14.027",
+ "name":"DPT_Value_Electric_Potential"
+ },
+ {
+ "dpt":"14.028",
+ "name":"DPT_Value_Electric_PotentialDifference"
+ },
+ {
+ "dpt":"14.029",
+ "name":"DPT_Value_ElectromagneticMoment"
+ },
+ {
+ "dpt":"14.030",
+ "name":"DPT_Value_Electromotive_Force"
+ },
+ {
+ "dpt":"14.031",
+ "name":"DPT_Value_Energy"
+ },
+ {
+ "dpt":"14.032",
+ "name":"DPT_Value_Force"
+ },
+ {
+ "dpt":"14.033",
+ "name":"DPT_Value_Frequency"
+ },
+ {
+ "dpt":"14.034",
+ "name":"DPT_Value_Angular_Frequency"
+ },
+ {
+ "dpt":"14.035",
+ "name":"DPT_Value_Heat_Capacity"
+ },
+ {
+ "dpt":"14.036",
+ "name":"DPT_Value_Heat_FlowRate"
+ },
+ {
+ "dpt":"14.037",
+ "name":"DPT_Value_Heat_Quantity"
+ },
+ {
+ "dpt":"14.038",
+ "name":"DPT_Value_Impedance"
+ },
+ {
+ "dpt":"14.039",
+ "name":"DPT_Value_Length"
+ },
+ {
+ "dpt":"14.040",
+ "name":"DPT_Value_Light_Quantity"
+ },
+ {
+ "dpt":"14.041",
+ "name":"DPT_Value_Luminance"
+ },
+ {
+ "dpt":"14.042",
+ "name":"DPT_Value_Luminous_Flux"
+ },
+ {
+ "dpt":"14.043",
+ "name":"DPT_Value_Luminous_Intensity"
+ },
+ {
+ "dpt":"14.044",
+ "name":"DPT_Value_Magnetic_FieldStrength"
+ },
+ {
+ "dpt":"14.045",
+ "name":"DPT_Value_Magnetic_Flux"
+ },
+ {
+ "dpt":"14.046",
+ "name":"DPT_Value_Magnetic_FluxDensity"
+ },
+ {
+ "dpt":"14.047",
+ "name":"DPT_Value_Magnetic_Moment"
+ },
+ {
+ "dpt":"14.048",
+ "name":"DPT_Value_Magnetic_Polarization"
+ },
+ {
+ "dpt":"14.049",
+ "name":"DPT_Value_Magnetization"
+ },
+ {
+ "dpt":"14.050",
+ "name":"DPT_Value_MagnetomotiveForce"
+ },
+ {
+ "dpt":"14.051",
+ "name":"DPT_Value_Mass"
+ },
+ {
+ "dpt":"14.052",
+ "name":"DPT_Value_MassFlux"
+ },
+ {
+ "dpt":"14.053",
+ "name":"DPT_Value_Momentum"
+ },
+ {
+ "dpt":"14.054",
+ "name":"DPT_Value_Phase_AngleRad"
+ },
+ {
+ "dpt":"14.055",
+ "name":"DPT_Value_Phase_AngleDeg"
+ },
+ {
+ "dpt":"14.056",
+ "name":"DPT_Value_Power"
+ },
+ {
+ "dpt":"14.057",
+ "name":"DPT_Value_Power_Factor"
+ },
+ {
+ "dpt":"14.058",
+ "name":"DPT_Value_Pressure"
+ },
+ {
+ "dpt":"14.059",
+ "name":"DPT_Value_Reactance"
+ },
+ {
+ "dpt":"14.060",
+ "name":"DPT_Value_Resistance"
+ },
+ {
+ "dpt":"14.061",
+ "name":"DPT_Value_Resistivity"
+ },
+ {
+ "dpt":"14.062",
+ "name":"DPT_Value_SelfInductance"
+ },
+ {
+ "dpt":"14.063",
+ "name":"DPT_Value_SolidAngle"
+ },
+ {
+ "dpt":"14.064",
+ "name":"DPT_Value_Sound_Intensity"
+ },
+ {
+ "dpt":"14.065",
+ "name":"DPT_Value_Speed"
+ },
+ {
+ "dpt":"14.066",
+ "name":"DPT_Value_Stress"
+ },
+ {
+ "dpt":"14.067",
+ "name":"DPT_Value_Surface_Tension"
+ },
+ {
+ "dpt":"14.068",
+ "name":"DPT_Value_Common_Temperature"
+ },
+ {
+ "dpt":"14.069",
+ "name":"DPT_Value_Absolute_Temperature"
+ },
+ {
+ "dpt":"14.070",
+ "name":"DPT_Value_TemperatureDifference"
+ },
+ {
+ "dpt":"14.071",
+ "name":"DPT_Value_Thermal_Capacity"
+ },
+ {
+ "dpt":"14.072",
+ "name":"DPT_Value_Thermal_Conductivity"
+ },
+ {
+ "dpt":"14.073",
+ "name":"DPT_Value_ThermoelectricPower"
+ },
+ {
+ "dpt":"14.074",
+ "name":"DPT_Value_Time"
+ },
+ {
+ "dpt":"14.075",
+ "name":"DPT_Value_Torque"
+ },
+ {
+ "dpt":"14.076",
+ "name":"DPT_Value_Volume"
+ },
+ {
+ "dpt":"14.077",
+ "name":"DPT_Value_Volume_Flux"
+ },
+ {
+ "dpt":"14.078",
+ "name":"DPT_Value_Weight"
+ },
+ {
+ "dpt":"14.079",
+ "name":"DPT_Value_Work"
+ },
+ {
+ "dpt":"15.000",
+ "name":"DPT_Access_Data"
+ },
+ {
+ "dpt":"16.000",
+ "name":"DPT_String_ASCII"
+ },
+ {
+ "dpt":"16.001",
+ "name":"DPT_String_8859_1"
+ },
+ {
+ "dpt":"17.001",
+ "name":"DPT_SceneNumber"
+ },
+ {
+ "dpt":"18.001",
+ "name":"DPT_SceneControl"
+ },
+ {
+ "dpt":"19.001",
+ "name":"DPT_DateTime"
+ },
+ {
+ "dpt":"20.001",
+ "name":"DPT_SCLOMode"
+ },
+ {
+ "dpt":"20.002",
+ "name":"DPT_BuildingMode"
+ },
+ {
+ "dpt":"20.003",
+ "name":"DPT_OccMode"
+ },
+ {
+ "dpt":"20.004",
+ "name":"DPT_Priority"
+ },
+ {
+ "dpt":"20.005",
+ "name":"DPT_LightApplicationMode"
+ },
+ {
+ "dpt":"20.006",
+ "name":"DPT_ApplicationArea"
+ },
+ {
+ "dpt":"20.007",
+ "name":"DPT_AlarmClassType"
+ },
+ {
+ "dpt":"20.008",
+ "name":"DPT_PSUMode"
+ },
+ {
+ "dpt":"20.011",
+ "name":"DPT_ErrorClass_System"
+ },
+ {
+ "dpt":"20.012",
+ "name":"DPT_ErrorClass_HVAC"
+ },
+ {
+ "dpt":"20.013",
+ "name":"DPT_Time_Delay"
+ },
+ {
+ "dpt":"20.014",
+ "name":"DPT_Beaufort_Wind_Force_Scale"
+ },
+ {
+ "dpt":"20.017",
+ "name":"DPT_SensorSelect"
+ },
+ {
+ "dpt":"20.100",
+ "name":"DPT_FuelType"
+ },
+ {
+ "dpt":"20.101",
+ "name":"DPT_BurnerType"
+ },
+ {
+ "dpt":"20.102",
+ "name":"DPT_HVACMode"
+ },
+ {
+ "dpt":"20.103",
+ "name":"DPT_DHWMode"
+ },
+ {
+ "dpt":"20.104",
+ "name":"DPT_LoadPriority"
+ },
+ {
+ "dpt":"20.105",
+ "name":"DPT_HVACContrMode"
+ },
+ {
+ "dpt":"20.106",
+ "name":"DPT_HVACEmergMode"
+ },
+ {
+ "dpt":"20.107",
+ "name":"DPT_ChangeoverMode"
+ },
+ {
+ "dpt":"20.108",
+ "name":"DPT_ValveMode"
+ },
+ {
+ "dpt":"20.109",
+ "name":"DPT_DamperMode"
+ },
+ {
+ "dpt":"20.110",
+ "name":"DPT_HeaterMode"
+ },
+ {
+ "dpt":"20.111",
+ "name":"DPT_FanMode"
+ },
+ {
+ "dpt":"20.112",
+ "name":"DPT_MasterSlaveMode"
+ },
+ {
+ "dpt":"20.113",
+ "name":"DPT_StatusRoomSetp"
+ },
+ {
+ "dpt":"20.600",
+ "name":"DPT_Behaviour_Lock_Unlock"
+ },
+ {
+ "dpt":"20.601",
+ "name":"DPT_Behaviour_Bus_Power_Up_Down"
+ },
+ {
+ "dpt":"20.1000",
+ "name":"DPT_CommMode"
+ },
+ {
+ "dpt":"20.1001",
+ "name":"DPT_AddInfoTypes"
+ },
+ {
+ "dpt":"20.1002",
+ "name":"DPT_RF_ModeSelect"
+ },
+ {
+ "dpt":"20.1003",
+ "name":"DPT_RF_FilterSelect"
+ },
+ {
+ "dpt":"21.001",
+ "name":"DPT_StatusGen"
+ },
+ {
+ "dpt":"21.002",
+ "name":"DPT_Device_Control"
+ },
+ {
+ "dpt":"21.100",
+ "name":"DPT_ForceSign"
+ },
+ {
+ "dpt":"21.101",
+ "name":"DPT_ForceSignCool"
+ },
+ {
+ "dpt":"21.102",
+ "name":"DPT_StatusRHC"
+ },
+ {
+ "dpt":"21.103",
+ "name":"DPT_StatusSDHWC"
+ },
+ {
+ "dpt":"21.104",
+ "name":"DPT_FuelTypeSet"
+ },
+ {
+ "dpt":"21.105",
+ "name":"DPT_StatusRCC"
+ },
+ {
+ "dpt":"21.106",
+ "name":"DPT_StatusAHU"
+ },
+ {
+ "dpt":"21.1000",
+ "name":"DPT_RF_ModeInfo"
+ },
+ {
+ "dpt":"21.1001",
+ "name":"DPT_RF_FilterInfo"
+ },
+ {
+ "dpt":"21.1010",
+ "name":"DPT_Channel_Activation_8"
+ },
+ {
+ "dpt":"22.100",
+ "name":"DPT_StatusDHWC"
+ },
+ {
+ "dpt":"22.101",
+ "name":"DPT_StatusRHCC"
+ },
+ {
+ "dpt":"22.1000",
+ "name":"DPT_Media"
+ },
+ {
+ "dpt":"22.1010",
+ "name":"DPT_Channel_Activation_16"
+ },
+ {
+ "dpt":"23.001",
+ "name":"DPT_OnOff_Action"
+ },
+ {
+ "dpt":"23.002",
+ "name":"DPT_Alarm_Reaction"
+ },
+ {
+ "dpt":"23.003",
+ "name":"DPT_UpDown_Action"
+ },
+ {
+ "dpt":"23.102",
+ "name":"DPT_HVAC_PB_Action"
+ },
+ {
+ "dpt":"24.001",
+ "name":"DPT_VarString_8859_1"
+ },
+ {
+ "dpt":"25.1000",
+ "name":"DPT_DoubleNibble"
+ },
+ {
+ "dpt":"26.001",
+ "name":"DPT_SceneInfo"
+ },
+ {
+ "dpt":"27.001",
+ "name":"DPT_CombinedInfoOnOff"
+ },
+ {
+ "dpt":"28.001",
+ "name":"DPT_UTF-8"
+ },
+ {
+ "dpt":"29.010",
+ "name":"DPT_ActiveEnergy_V64"
+ },
+ {
+ "dpt":"29.011",
+ "name":"DPT_ApparantEnergy_V64"
+ },
+ {
+ "dpt":"29.012",
+ "name":"DPT_ReactiveEnergy_V64"
+ },
+ {
+ "dpt":"30.1010",
+ "name":"DPT_Channel_Activation_24"
+ },
+ {
+ "dpt":"31.101",
+ "name":"DPT_PB_Action_HVAC_Extended"
+ },
+ {
+ "dpt":"200.100",
+ "name":"DPT_Heat/Cool_Z"
+ },
+ {
+ "dpt":"200.101",
+ "name":"DPT_BinaryValue_Z"
+ },
+ {
+ "dpt":"201.100",
+ "name":"DPT_HVACMode_Z"
+ },
+ {
+ "dpt":"201.102",
+ "name":"DPT_DHWMode_Z"
+ },
+ {
+ "dpt":"201.104",
+ "name":"DPT_HVACContrMode_Z"
+ },
+ {
+ "dpt":"201.105",
+ "name":"DPT_EnablH/Cstage_Z"
+ },
+ {
+ "dpt":"201.107",
+ "name":"DPT_BuildingMode_Z"
+ },
+ {
+ "dpt":"201.108",
+ "name":"DPT_OccMode_Z"
+ },
+ {
+ "dpt":"201.109",
+ "name":"DPT_HVACEmergMode_Z"
+ },
+ {
+ "dpt":"202.001",
+ "name":"DPT_RelValue_Z"
+ },
+ {
+ "dpt":"202.002",
+ "name":"DPT_UCountValue8_Z"
+ },
+ {
+ "dpt":"203.002",
+ "name":"DPT_TimePeriodMsec_Z"
+ },
+ {
+ "dpt":"203.003",
+ "name":"DPT_TimePeriod10Msec_Z"
+ },
+ {
+ "dpt":"203.004",
+ "name":"DPT_TimePeriod100Msec_Z"
+ },
+ {
+ "dpt":"203.005",
+ "name":"DPT_TimePeriodSec_Z"
+ },
+ {
+ "dpt":"203.006",
+ "name":"DPT_TimePeriodMin_Z"
+ },
+ {
+ "dpt":"203.007",
+ "name":"DPT_TimePeriodHrs_Z"
+ },
+ {
+ "dpt":"203.011",
+ "name":"DPT_UFlowRateLiter/h_Z"
+ },
+ {
+ "dpt":"203.012",
+ "name":"DPT_UCountValue16_Z"
+ },
+ {
+ "dpt":"203.013",
+ "name":"DPT_UElCurrent?A_Z"
+ },
+ {
+ "dpt":"203.014",
+ "name":"DPT_PowerKW_Z"
+ },
+ {
+ "dpt":"203.015",
+ "name":"DPT_AtmPressureAbs_Z"
+ },
+ {
+ "dpt":"203.017",
+ "name":"DPT_PercentU16_Z"
+ },
+ {
+ "dpt":"203.100",
+ "name":"DPT_HVACAirQual_Z"
+ },
+ {
+ "dpt":"203.101",
+ "name":"DPT_WindSpeed_Z"
+ },
+ {
+ "dpt":"203.102",
+ "name":"DPT_SunIntensity_Z"
+ },
+ {
+ "dpt":"203.104",
+ "name":"DPT_HVACAirFlowAbs_Z"
+ },
+ {
+ "dpt":"204.001",
+ "name":"DPT_RelSignedValue_Z"
+ },
+ {
+ "dpt":"205.002",
+ "name":"DPT_DeltaTimeMsec_Z"
+ },
+ {
+ "dpt":"205.003",
+ "name":"DPT_DeltaTime10Msec_Z"
+ },
+ {
+ "dpt":"205.004",
+ "name":"DPT_DeltaTime100Msec_Z"
+ },
+ {
+ "dpt":"205.005",
+ "name":"DPT_DeltaTimeSec_Z"
+ },
+ {
+ "dpt":"205.006",
+ "name":"DPT_DeltaTimeMin_Z"
+ },
+ {
+ "dpt":"205.007",
+ "name":"DPT_DeltaTimeHrs_Z"
+ },
+ {
+ "dpt":"205.100",
+ "name":"DPT_TempHVACAbs_Z"
+ },
+ {
+ "dpt":"205.101",
+ "name":"DPT_TempHVACRel_Z"
+ },
+ {
+ "dpt":"205.102",
+ "name":"DPT_HVACAirFlowRel_Z"
+ },
+ {
+ "dpt":"206.100",
+ "name":"DPT_HVACModeNext"
+ },
+ {
+ "dpt":"206.102",
+ "name":"DPT_DHWModeNext"
+ },
+ {
+ "dpt":"206.104",
+ "name":"DPT_OccModeNext"
+ },
+ {
+ "dpt":"206.105",
+ "name":"DPT_BuildingModeNext"
+ },
+ {
+ "dpt":"207.100",
+ "name":"DPT_StatusBUC"
+ },
+ {
+ "dpt":"207.101",
+ "name":"DPT_LockSign"
+ },
+ {
+ "dpt":"207.102",
+ "name":"DPT_ValueDemBOC"
+ },
+ {
+ "dpt":"207.104",
+ "name":"DPT_ActPosDemAbs"
+ },
+ {
+ "dpt":"207.105",
+ "name":"DPT_StatusAct"
+ },
+ {
+ "dpt":"209.100",
+ "name":"DPT_StatusHPM"
+ },
+ {
+ "dpt":"209.101",
+ "name":"DPT_TempRoomDemAbs"
+ },
+ {
+ "dpt":"209.102",
+ "name":"DPT_StatusCPM"
+ },
+ {
+ "dpt":"209.103",
+ "name":"DPT_StatusWTC"
+ },
+ {
+ "dpt":"210.100",
+ "name":"DPT_TempFlowWaterDemAbs"
+ },
+ {
+ "dpt":"211.100",
+ "name":"DPT_EnergyDemWater"
+ },
+ {
+ "dpt":"212.100",
+ "name":"DPT_TempRoomSetpSetShift[3]"
+ },
+ {
+ "dpt":"212.101",
+ "name":"DPT_TempRoomSetpSet[3]"
+ },
+ {
+ "dpt":"213.100",
+ "name":"DPT_TempRoomSetpSet[4]"
+ },
+ {
+ "dpt":"213.101",
+ "name":"DPT_TempDHWSetpSet[4]"
+ },
+ {
+ "dpt":"213.102",
+ "name":"DPT_TempRoomSetpSetShift[4]"
+ },
+...
[truncated message content] |
|
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; // conve...
[truncated message content] |
|
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 pro...
[truncated message content] |
|
From: <j-...@us...> - 2011-05-18 08:34:25
|
Revision: 338
http://openautomation.svn.sourceforge.net/openautomation/?rev=338&view=rev
Author: j-n-k
Date: 2011-05-18 08:34:17 +0000 (Wed, 18 May 2011)
Log Message:
-----------
added "align"-attribute to switch, trigger, multitrigger
Modified Paths:
--------------
CometVisu/trunk/documentation/widgets.htm
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/designs/structure_pure.js
Modified: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm 2011-05-15 13:31:30 UTC (rev 337)
+++ CometVisu/trunk/documentation/widgets.htm 2011-05-18 08:34:17 UTC (rev 338)
@@ -14,15 +14,15 @@
<o:DocumentProperties>
<o:Author>Jan N. Klug</o:Author>
<o:LastAuthor>Jan N. Klug</o:LastAuthor>
- <o:Revision>5</o:Revision>
+ <o:Revision>8</o:Revision>
<o:Created>2011-05-12T10:58:00Z</o:Created>
- <o:LastSaved>2011-05-13T08:43:00Z</o:LastSaved>
- <o:Pages>2</o:Pages>
- <o:Words>369</o:Words>
- <o:Characters>2328</o:Characters>
- <o:Lines>19</o:Lines>
+ <o:LastSaved>2011-05-14T07:38:00Z</o:LastSaved>
+ <o:Pages>3</o:Pages>
+ <o:Words>409</o:Words>
+ <o:Characters>2579</o:Characters>
+ <o:Lines>21</o:Lines>
<o:Paragraphs>5</o:Paragraphs>
- <o:CharactersWithSpaces>2692</o:CharactersWithSpaces>
+ <o:CharactersWithSpaces>2983</o:CharactersWithSpaces>
<o:Version>12.00</o:Version>
</o:DocumentProperties>
</xml><![endif]-->
@@ -497,7 +497,7 @@
mso-fareast-language:EN-US;}
</style>
<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="4098"/>
+ <o:shapedefaults v:ext="edit" spidmax="5122"/>
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext="edit">
<o:idmap v:ext="edit" data="1"/>
@@ -745,7 +745,7 @@
normal'>previously defined styling</p>
</td>
</tr>
- <tr style='mso-yfti-irow:2;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:2'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
@@ -767,6 +767,50 @@
normal'>previously defined mapping</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:3'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>on_value</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string (default: \x841\x93)</p>
+ </td>
+ </tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>off_value</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>string (default:\x930\x93)</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -805,7 +849,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -967,7 +1011,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1296,7 +1340,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1410,14 +1454,14 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>optional </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 0)</p>
</td>
</tr>
<tr style='mso-yfti-irow:4'>
@@ -1432,14 +1476,14 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>optional </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 100)</p>
</td>
</tr>
<tr style='mso-yfti-irow:5;mso-yfti-lastrow:yes'>
@@ -1461,7 +1505,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric (default: 0.5)</p>
</td>
</tr>
</table>
@@ -1502,7 +1546,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1664,7 +1708,7 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
@@ -1763,10 +1807,10 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
@@ -1785,9 +1829,31 @@
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal</p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -1880,21 +1946,21 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>src</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>URI</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -1902,45 +1968,67 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>width</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>height</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -1970,7 +2058,10 @@
<tr style='mso-yfti-irow:1'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'></td>
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
@@ -2030,21 +2121,21 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>src</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>required</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>URI</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -2052,45 +2143,67 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>width</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>height</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>numeric</p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>refresh</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>optional</p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>numeric</p>
+ </td>
+ </tr>
</table>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
@@ -2120,7 +2233,10 @@
<tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'></td>
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>label</p>
+ </td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
@@ -2143,7 +2259,7 @@
<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
@@ -2162,26 +2278,52 @@
normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
</td>
</tr>
+</table>
+
+<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
+
+<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
+ style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
+ mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
+ </td>
+ <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
+ border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
+ solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
+ </td>
+ </tr>
<tr style='mso-yfti-irow:1'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>src<o:p></o:p></p>
+ normal'>label</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>required<o:p></o:p></p>
+ normal'>optional</p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>URI<o:p></o:p></p>
+ normal'>string</p>
</td>
</tr>
<tr style='mso-yfti-irow:2'>
@@ -2189,48 +2331,70 @@
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>width<o:p></o:p></p>
+ normal'>address</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>required </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93r\x93</span></p>
</td>
</tr>
- <tr style='mso-yfti-irow:3;mso-yfti-lastrow:yes'>
+ <tr style='mso-yfti-irow:3'>
<td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>height<o:p></o:p></p>
+ normal'>address</p>
</td>
<td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional<o:p></o:p></p>
+ normal'>required </p>
</td>
<td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>decimal<o:p></o:p></p>
+ normal'>KNX group address w/ <span style='font-family:"Courier New"'>color=\x93g\x93</span></p>
</td>
</tr>
+ <tr style='mso-yfti-irow:4;mso-yfti-lastrow:yes'>
+ <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
+ border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
+ padding:0cm 5.4pt 0cm 5.4pt'>
+ <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
+ normal'>address</p>
+ </td>
+ <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
+ none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
+ mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
+ mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
+ ...
[truncated message content] |
|
From: <chr...@us...> - 2011-07-03 19:14:08
|
Revision: 381
http://openautomation.svn.sourceforge.net/openautomation/?rev=381&view=rev
Author: chris_ace
Date: 2011-07-03 19:14:00 +0000 (Sun, 03 Jul 2011)
Log Message:
-----------
cleaned up frameborder and transparency (removed MS proprietary allowtransparency again and changed frameborder to yes/no-list)
also added new attributes to documentation
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/documentation/widgets.htm
CometVisu/trunk/visu/designs/structure_pure.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-07-03 18:35:33 UTC (rev 380)
+++ CometVisu/trunk/ChangeLog 2011-07-03 19:14:00 UTC (rev 381)
@@ -1,7 +1,7 @@
HEAD
====
--
+- added frameborder and background to iframe
0.6.0-pre1
==========
Modified: CometVisu/trunk/documentation/widgets.htm
===================================================================
--- CometVisu/trunk/documentation/widgets.htm 2011-07-03 18:35:33 UTC (rev 380)
+++ CometVisu/trunk/documentation/widgets.htm 2011-07-03 19:14:00 UTC (rev 381)
@@ -1,2935 +1,2935 @@
-<html xmlns:v="urn:schemas-microsoft-com:vml"
-xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns:m="http://schemas.microsoft.com/office/2004/12/omml"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 12">
-<meta name=Originator content="Microsoft Word 12">
-<link rel=File-List href="widgets-Dateien/filelist.xml">
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Author>Jan N. Klug</o:Author>
- <o:LastAuthor>Jan N. Klug</o:LastAuthor>
- <o:Revision>8</o:Revision>
- <o:Created>2011-05-12T10:58:00Z</o:Created>
- <o:LastSaved>2011-05-14T07:38:00Z</o:LastSaved>
- <o:Pages>3</o:Pages>
- <o:Words>409</o:Words>
- <o:Characters>2579</o:Characters>
- <o:Lines>21</o:Lines>
- <o:Paragraphs>5</o:Paragraphs>
- <o:CharactersWithSpaces>2983</o:CharactersWithSpaces>
- <o:Version>12.00</o:Version>
- </o:DocumentProperties>
-</xml><![endif]-->
-<link rel=themeData href="widgets-Dateien/themedata.thmx">
-<link rel=colorSchemeMapping href="widgets-Dateien/colorschememapping.xml">
-<!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackMoves>false</w:TrackMoves>
- <w:TrackFormatting/>
- <w:HyphenationZone>21</w:HyphenationZone>
- <w:PunctuationKerning/>
- <w:ValidateAgainstSchemas/>
- <w:SaveIfXMLInvalid>false</w:SaveIfXMLInvalid>
- <w:IgnoreMixedContent>false</w:IgnoreMixedContent>
- <w:AlwaysShowPlaceholderText>false</w:AlwaysShowPlaceholderText>
- <w:DoNotPromoteQF/>
- <w:LidThemeOther>DE</w:LidThemeOther>
- <w:LidThemeAsian>X-NONE</w:LidThemeAsian>
- <w:LidThemeComplexScript>X-NONE</w:LidThemeComplexScript>
- <w:Compatibility>
- <w:BreakWrappedTables/>
- <w:SnapToGridInCell/>
- <w:WrapTextWithPunct/>
- <w:UseAsianBreakRules/>
- <w:DontGrowAutofit/>
- <w:SplitPgBreakAndParaMark/>
- <w:DontVertAlignCellWithSp/>
- <w:DontBreakConstrainedForcedTables/>
- <w:DontVertAlignInTxbx/>
- <w:Word11KerningPairs/>
- <w:CachedColBalance/>
- </w:Compatibility>
- <w:BrowserLevel>MicrosoftInternetExplorer4</w:BrowserLevel>
- <m:mathPr>
- <m:mathFont m:val="Cambria Math"/>
- <m:brkBin m:val="before"/>
- <m:brkBinSub m:val="--"/>
- <m:smallFrac m:val="off"/>
- <m:dispDef/>
- <m:lMargin m:val="0"/>
- <m:rMargin m:val="0"/>
- <m:defJc m:val="centerGroup"/>
- <m:wrapIndent m:val="1440"/>
- <m:intLim m:val="subSup"/>
- <m:naryLim m:val="undOvr"/>
- </m:mathPr></w:WordDocument>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:LatentStyles DefLockedState="false" DefUnhideWhenUsed="true"
- DefSemiHidden="true" DefQFormat="false" DefPriority="99"
- LatentStyleCount="267">
- <w:LsdException Locked="false" Priority="0" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Normal"/>
- <w:LsdException Locked="false" Priority="9" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="heading 1"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 2"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 3"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 4"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 5"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 6"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 7"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 8"/>
- <w:LsdException Locked="false" Priority="9" QFormat="true" Name="heading 9"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 1"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 2"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 3"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 4"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 5"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 6"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 7"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 8"/>
- <w:LsdException Locked="false" Priority="39" Name="toc 9"/>
- <w:LsdException Locked="false" Priority="35" QFormat="true" Name="caption"/>
- <w:LsdException Locked="false" Priority="10" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Title"/>
- <w:LsdException Locked="false" Priority="1" Name="Default Paragraph Font"/>
- <w:LsdException Locked="false" Priority="11" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Subtitle"/>
- <w:LsdException Locked="false" Priority="22" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Strong"/>
- <w:LsdException Locked="false" Priority="20" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Emphasis"/>
- <w:LsdException Locked="false" Priority="59" SemiHidden="false"
- UnhideWhenUsed="false" Name="Table Grid"/>
- <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Placeholder Text"/>
- <w:LsdException Locked="false" Priority="1" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="No Spacing"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 1"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 1"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 1"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 1"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 1"/>
- <w:LsdException Locked="false" UnhideWhenUsed="false" Name="Revision"/>
- <w:LsdException Locked="false" Priority="34" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="List Paragraph"/>
- <w:LsdException Locked="false" Priority="29" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Quote"/>
- <w:LsdException Locked="false" Priority="30" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Intense Quote"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 1"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 1"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 1"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 1"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 1"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 1"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 1"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 2"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 2"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 2"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 2"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 2"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 2"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 2"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 2"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 2"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 2"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 3"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 3"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 3"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 3"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 3"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 3"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 3"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 3"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 3"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 3"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 4"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 4"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 4"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 4"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 4"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 4"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 4"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 4"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 4"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 4"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 5"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 5"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 5"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 5"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 5"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 5"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 5"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 5"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 5"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 5"/>
- <w:LsdException Locked="false" Priority="60" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Shading Accent 6"/>
- <w:LsdException Locked="false" Priority="61" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light List Accent 6"/>
- <w:LsdException Locked="false" Priority="62" SemiHidden="false"
- UnhideWhenUsed="false" Name="Light Grid Accent 6"/>
- <w:LsdException Locked="false" Priority="63" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="64" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Shading 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="65" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="66" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium List 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="67" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 1 Accent 6"/>
- <w:LsdException Locked="false" Priority="68" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 2 Accent 6"/>
- <w:LsdException Locked="false" Priority="69" SemiHidden="false"
- UnhideWhenUsed="false" Name="Medium Grid 3 Accent 6"/>
- <w:LsdException Locked="false" Priority="70" SemiHidden="false"
- UnhideWhenUsed="false" Name="Dark List Accent 6"/>
- <w:LsdException Locked="false" Priority="71" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Shading Accent 6"/>
- <w:LsdException Locked="false" Priority="72" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful List Accent 6"/>
- <w:LsdException Locked="false" Priority="73" SemiHidden="false"
- UnhideWhenUsed="false" Name="Colorful Grid Accent 6"/>
- <w:LsdException Locked="false" Priority="19" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Subtle Emphasis"/>
- <w:LsdException Locked="false" Priority="21" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Intense Emphasis"/>
- <w:LsdException Locked="false" Priority="31" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Subtle Reference"/>
- <w:LsdException Locked="false" Priority="32" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Intense Reference"/>
- <w:LsdException Locked="false" Priority="33" SemiHidden="false"
- UnhideWhenUsed="false" QFormat="true" Name="Book Title"/>
- <w:LsdException Locked="false" Priority="37" Name="Bibliography"/>
- <w:LsdException Locked="false" Priority="39" QFormat="true" Name="TOC Heading"/>
- </w:LatentStyles>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
- @font-face
- {font-family:"Cambria Math";
- panose-1:2 4 5 3 5 4 6 3 2 4;
- mso-font-charset:0;
- mso-generic-font-family:roman;
- mso-font-pitch:variable;
- mso-font-signature:-536870145 1107305727 0 0 415 0;}
-@font-face
- {font-family:Cambria;
- panose-1:2 4 5 3 5 4 6 3 2 4;
- mso-font-charset:0;
- mso-generic-font-family:roman;
- mso-font-pitch:variable;
- mso-font-signature:-536870145 1073743103 0 0 415 0;}
-@font-face
- {font-family:Calibri;
- panose-1:2 15 5 2 2 2 4 3 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:-520092929 1073786111 9 0 415 0;}
- /* Style Definitions */
- p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-style-parent:"";
- margin-top:0cm;
- margin-right:0cm;
- margin-bottom:10.0pt;
- margin-left:0cm;
- line-height:115%;
- mso-pagination:widow-orphan;
- font-size:11.0pt;
- font-family:"Calibri","sans-serif";
- mso-ascii-font-family:Calibri;
- mso-ascii-theme-font:minor-latin;
- mso-fareast-font-family:Calibri;
- mso-fareast-theme-font:minor-latin;
- mso-hansi-font-family:Calibri;
- mso-hansi-theme-font:minor-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:minor-bidi;
- mso-fareast-language:EN-US;}
-h1
- {mso-style-priority:9;
- mso-style-unhide:no;
- mso-style-qformat:yes;
- mso-style-link:"\xDCberschrift 1 Zchn";
- mso-style-next:Standard;
- margin-top:24.0pt;
- margin-right:0cm;
- margin-bottom:0cm;
- margin-left:0cm;
- margin-bottom:.0001pt;
- line-height:115%;
- mso-pagination:widow-orphan lines-together;
- page-break-after:avoid;
- mso-outline-level:1;
- font-size:14.0pt;
- font-family:"Cambria","serif";
- mso-ascii-font-family:Cambria;
- mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:"Times New Roman";
- mso-fareast-theme-font:major-fareast;
- mso-hansi-font-family:Cambria;
- mso-hansi-theme-font:major-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:major-bidi;
- color:#365F91;
- mso-themecolor:accent1;
- mso-themeshade:191;
- mso-font-kerning:0pt;
- mso-fareast-language:EN-US;}
-span.berschrift1Zchn
- {mso-style-name:"\xDCberschrift 1 Zchn";
- mso-style-priority:9;
- mso-style-unhide:no;
- mso-style-locked:yes;
- mso-style-link:"\xDCberschrift 1";
- mso-ansi-font-size:14.0pt;
- mso-bidi-font-size:14.0pt;
- font-family:"Cambria","serif";
- mso-ascii-font-family:Cambria;
- mso-ascii-theme-font:major-latin;
- mso-fareast-font-family:"Times New Roman";
- mso-fareast-theme-font:major-fareast;
- mso-hansi-font-family:Cambria;
- mso-hansi-theme-font:major-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:major-bidi;
- color:#365F91;
- mso-themecolor:accent1;
- mso-themeshade:191;
- font-weight:bold;}
-.MsoChpDefault
- {mso-style-type:export-only;
- mso-default-props:yes;
- font-size:10.0pt;
- mso-ansi-font-size:10.0pt;
- mso-bidi-font-size:10.0pt;
- mso-ascii-font-family:Calibri;
- mso-ascii-theme-font:minor-latin;
- mso-fareast-font-family:Calibri;
- mso-fareast-theme-font:minor-latin;
- mso-hansi-font-family:Calibri;
- mso-hansi-theme-font:minor-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:minor-bidi;
- mso-fareast-language:EN-US;}
-@page WordSection1
- {size:595.3pt 841.9pt;
- margin:70.85pt 70.85pt 2.0cm 70.85pt;
- mso-header-margin:35.4pt;
- mso-footer-margin:35.4pt;
- mso-paper-source:0;}
-div.WordSection1
- {page:WordSection1;}
--->
-</style>
-<!--[if gte mso 10]>
-<style>
- /* Style Definitions */
- table.MsoNormalTable
- {mso-style-name:"Normale Tabelle";
- mso-tstyle-rowband-size:0;
- mso-tstyle-colband-size:0;
- mso-style-noshow:yes;
- mso-style-priority:99;
- mso-style-qformat:yes;
- mso-style-parent:"";
- mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
- mso-para-margin:0cm;
- mso-para-margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:10.0pt;
- font-family:"Calibri","sans-serif";
- mso-ascii-font-family:Calibri;
- mso-ascii-theme-font:minor-latin;
- mso-hansi-font-family:Calibri;
- mso-hansi-theme-font:minor-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:minor-bidi;
- mso-fareast-language:EN-US;}
-table.MsoTableGrid
- {mso-style-name:Tabellengitternetz;
- mso-tstyle-rowband-size:0;
- mso-tstyle-colband-size:0;
- mso-style-priority:59;
- mso-style-unhide:no;
- border:solid windowtext 1.0pt;
- mso-border-alt:solid windowtext .5pt;
- mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
- mso-border-insideh:.5pt solid windowtext;
- mso-border-insidev:.5pt solid windowtext;
- mso-para-margin:0cm;
- mso-para-margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:11.0pt;
- font-family:"Calibri","sans-serif";
- mso-ascii-font-family:Calibri;
- mso-ascii-theme-font:minor-latin;
- mso-hansi-font-family:Calibri;
- mso-hansi-theme-font:minor-latin;
- mso-bidi-font-family:"Times New Roman";
- mso-bidi-theme-font:minor-bidi;
- mso-fareast-language:EN-US;}
-</style>
-<![endif]--><!--[if gte mso 9]><xml>
- <o:shapedefaults v:ext="edit" spidmax="5122"/>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <o:shapelayout v:ext="edit">
- <o:idmap v:ext="edit" data="1"/>
- </o:shapelayout></xml><![endif]-->
-</head>
-
-<body lang=DE style='tab-interval:35.4pt'>
-
-<div class=WordSection1>
-
-<h1 style='margin-bottom:10.0pt'>text</h1>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Attribute<o:p></o:p></b></p>
- </td>
- <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
- </td>
- <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
- </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
- border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>align</p>
- </td>
- <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
- </td>
- <td width=390 valign=top style='width:234.1pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><span style='font-family:"Courier New"'>left</span>, <span
- style='font-family:"Courier New"'>right</span>, <span style='font-family:
- "Courier New"'>center</span></p>
- </td>
- </tr>
-</table>
-
-<p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt'><o:p> </o:p></p>
-
-<table class=MsoTableGrid border=1 cellspacing=0 cellpadding=0
- style='border-collapse:collapse;border:none;mso-border-alt:solid windowtext .5pt;
- mso-yfti-tbllook:1184;mso-padding-alt:0cm 5.4pt 0cm 5.4pt'>
- <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
- <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Content<o:p></o:p></b></p>
- </td>
- <td width=177 valign=top style='width:106.3pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Use<o:p></o:p></b></p>
- </td>
- <td width=390 valign=top style='width:234.1pt;border:solid windowtext 1.0pt;
- border-left:none;mso-border-left-alt:solid windowtext .5pt;mso-border-alt:
- solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><b style='mso-bidi-font-weight:normal'>Value<o:p></o:p></b></p>
- </td>
- </tr>
- <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
- <td width=200 valign=top style='width:120.2pt;border:solid windowtext 1.0pt;
- border-top:none;mso-border-top-alt:solid windowtext .5pt;mso-border-alt:solid windowtext .5pt;
- padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'><o:p> </o:p></p>
- </td>
- <td width=177 valign=top style='width:106.3pt;border-top:none;border-left:
- none;border-bottom:solid windowtext 1.0pt;border-right:solid windowtext 1.0pt;
- mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:solid windowtext .5pt;
- mso-border-alt:solid windowtext .5pt;padding:0cm 5.4pt 0cm 5.4pt'>
- <p class=MsoNormal style='margin-bottom:0cm;margin-bottom:.0001pt;line-height:
- normal'>optional</p>
- </td>
- <td width=390 valign=top style=...
[truncated message content] |
|
From: <ma...@us...> - 2011-11-06 18:56:18
|
Revision: 506
http://openautomation.svn.sourceforge.net/openautomation/?rev=506&view=rev
Author: mayerch
Date: 2011-11-06 18:56:12 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Office work...
Modified Paths:
--------------
CometVisu/trunk/AUTHORS
CometVisu/trunk/ChangeLog
Modified: CometVisu/trunk/AUTHORS
===================================================================
--- CometVisu/trunk/AUTHORS 2011-11-06 17:16:35 UTC (rev 505)
+++ CometVisu/trunk/AUTHORS 2011-11-06 18:56:12 UTC (rev 506)
@@ -2,7 +2,10 @@
other developers.
The list of contributors is:
-Julian Hartmann - julian.hartmann (at) gmail (dot) com
-Michael Markstaller - mm (at) elabnet (dot) de
-Christian Mayer - CometVisu (at) ChristianMayer (dot) de
-Jan N. Klug - jan.n.klug (at) rub (dot) de
+Julian Hartmann - netzkind - julian.hartmann (at) gmail (dot) com
+Jan N. Klug - j-n-k - jan.n.klug (at) rub (dot) de
+Michael Markstaller - makki1 - mm (at) elabnet (dot) de
+Christian Mayer - mayerch - CometVisu (at) ChristianMayer (dot) de
+Axel - panzaeron - panzaeron (at) users (dot) sourceforge (dot) net
+Christian - chris_ace - chris_ace (at) users (dot) sourceforge (dot) net
+David - daviid5 - daviid5 (at) users (dot) sourceforge (dot) net
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2011-11-06 17:16:35 UTC (rev 505)
+++ CometVisu/trunk/ChangeLog 2011-11-06 18:56:12 UTC (rev 506)
@@ -1,7 +1,11 @@
HEAD
====
--
+- Fix rendering problem in discreet_slim
+- Fix Bug #3175343
+- Fix Bug in infotrigger (min/max clipping)
+- Compatability improvement for iPad
+- Improvements to default config and widget demo config
0.6.0-RC2
=========
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2012-04-03 22:18:24
|
Revision: 742
http://openautomation.svn.sourceforge.net/openautomation/?rev=742&view=rev
Author: mayerch
Date: 2012-04-03 22:18:18 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Preparation for cleaner file structure and automated build script:
* initial makefile that can reducde the multiple source files (e.g. for the widgets) into one to speed up network loading
Added Paths:
-----------
CometVisu/trunk/Makefile
CometVisu/trunk/VERSION
Added: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile (rev 0)
+++ CometVisu/trunk/Makefile 2012-04-03 22:18:18 UTC (rev 742)
@@ -0,0 +1,54 @@
+PROJECT = "CometVisu"
+BUILD_DIR = build
+TARGET_DIR = release
+JS_ENGINE ?= `which node nodejs 2>/dev/null`
+LINT = ${JS_ENGINE} ${BUILD_DIR}/jslint.js
+
+VERSION = `cat VERSION`
+YUIDOCPATH = /home/cm/devel/yuidoc
+
+SRC = visu/designs/structure_pure.js
+
+STRUCTURE_PURE = visu/structure/pure
+STRUCTURE_PURE_SRC = \
+ ${STRUCTURE_PURE}/_common.js\
+ ${STRUCTURE_PURE}/break.js\
+ ${STRUCTURE_PURE}/group.js\
+ ${STRUCTURE_PURE}/iframe.js\
+ ${STRUCTURE_PURE}/image.js\
+ ${STRUCTURE_PURE}/imagetrigger.js\
+ ${STRUCTURE_PURE}/include.js\
+ ${STRUCTURE_PURE}/info.js\
+ ${STRUCTURE_PURE}/infotrigger.js\
+ ${STRUCTURE_PURE}/line.js\
+ ${STRUCTURE_PURE}/multitrigger.js\
+ ${STRUCTURE_PURE}/page.js\
+ ${STRUCTURE_PURE}/slide.js\
+ ${STRUCTURE_PURE}/switch.js\
+ ${STRUCTURE_PURE}/text.js\
+ ${STRUCTURE_PURE}/toggle.js\
+ ${STRUCTURE_PURE}/trigger.js\
+ ${STRUCTURE_PURE}/unknown.js\
+ ${STRUCTURE_PURE}/video.js
+
+docs:
+ ${YUIDOCPATH}/bin/yuidoc.py visu/lib visu/designs -p docs/parser -o docs -t build/template\
+ -v ${VERSION} -C "The CometVisu developers (please consult the AUTHORS file)" --showprivate -m ${PROJECT}\
+ -u "http://cometvisu.org/"
+
+lint:
+ ${LINT} ${SRC}
+
+visu/designs/structure_pure.js: $(STRUCTURE_PURE_SRC)
+ cat $^ > visu/designs/structure_pure.jss
+ cp visu/index.html visu/index.min.html
+ for SRC_FILE in $^; do \
+ SRC2_FILE=`echo $$SRC_FILE | sed 's_visu/__'`; \
+ sed "s#.*<script src=\"$$SRC2_FILE\" type=\"text/javascript\"></script>.*##" -i visu/index.min.html; \
+ done
+ sed 's#<!-- Load the widgets: start -->#<script src="designs/structure_pure.js" type="text/javascript"></script>#' -i visu/index.min.html
+
+build: $(SRC)
+ echo $^
+
+.PHONY: lint docs build
Added: CometVisu/trunk/VERSION
===================================================================
--- CometVisu/trunk/VERSION (rev 0)
+++ CometVisu/trunk/VERSION 2012-04-03 22:18:18 UTC (rev 742)
@@ -0,0 +1 @@
+SVN
\ 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: <ha...@us...> - 2012-10-11 10:57:32
|
Revision: 1046
http://openautomation.svn.sourceforge.net/openautomation/?rev=1046&view=rev
Author: hausl
Date: 2012-10-11 10:57:25 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
New plugin strftime added for formatted date and time texts
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/visu_config.xsd
Added Paths:
-----------
CometVisu/trunk/visu/plugins/strftime/
CometVisu/trunk/visu/plugins/strftime/strftime.css
CometVisu/trunk/visu/plugins/strftime/structure_plugin.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-10-10 19:43:37 UTC (rev 1045)
+++ CometVisu/trunk/ChangeLog 2012-10-11 10:57:25 UTC (rev 1046)
@@ -1,6 +1,7 @@
HEAD
====
+- New plugin: strftime
- New plugin: clock
- New plugin: rsslog
- New plugin: upnpcontroller
Added: CometVisu/trunk/visu/plugins/strftime/strftime.css
===================================================================
--- CometVisu/trunk/visu/plugins/strftime/strftime.css (rev 0)
+++ CometVisu/trunk/visu/plugins/strftime/strftime.css 2012-10-11 10:57:25 UTC (rev 1046)
@@ -0,0 +1,3 @@
+.strftime {
+ white-space: nowrap;
+}
Property changes on: CometVisu/trunk/visu/plugins/strftime/strftime.css
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: CometVisu/trunk/visu/plugins/strftime/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/strftime/structure_plugin.js (rev 0)
+++ CometVisu/trunk/visu/plugins/strftime/structure_plugin.js 2012-10-11 10:57:25 UTC (rev 1046)
@@ -0,0 +1,88 @@
+/* structure_plugin.js (c) 2012 by Michael Hausl [mi...@ha...]
+ *
+ * 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 3 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.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+/**
+ * This plugins integrates formated date and clock strings into CometVisu based
+ * on strftime.
+ *
+ * Thanks to Michael Markstaller for implementing the jqclock as reference.
+ */
+
+$('head').append('<link rel="stylesheet" href="plugins/strftime/strftime.css" type="text/css" />');
+
+VisuDesign_Custom.prototype.addCreator("strftime", {
+ create : function(page, path) {
+ var $p = $(page);
+ function uniqid() {
+ var newDate = new Date;
+ return newDate.getTime();
+ }
+ var id = "strftime_" + uniqid();
+
+ var ret_val = $('<div class="widget clearfix text strftime"/>');
+ ret_val.setWidgetLayout($p);
+
+ var actor = $('<div id="' + id + '"></div>');
+ ret_val.append(actor);
+
+ var locale = $p.attr('lang');
+ var format = '%c';
+ if ($p.attr('format')) {
+ format = $p.attr('format');
+ }
+
+ // extend locales by German and French
+ Date.ext.locales['de'] = {
+ a: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
+ A: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
+ b: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
+ B: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
+ c: '%a %d %b %Y %T %Z',
+ p: ['', ''],
+ P: ['', ''],
+ x: '%d.%m.%Y',
+ X: '%T'
+ };
+ Date.ext.locales['fr'] = {
+ a: ['dim', 'lun', 'mar', 'mer', 'jeu', 'ven', 'sam'],
+ A: ['dimanche', 'lundi', 'mardi', 'mercredi', 'jeudi', 'vendredi', 'samedi'],
+ b: ['jan', 'fév', 'mar', 'avr', 'mai', 'jun', 'jui', 'aoû', 'sep', 'oct', 'nov', 'déc'],
+ B: ['janvier', 'février', 'mars', 'avril', 'mai', 'juin', 'juillet', 'août', 'septembre', 'octobre', 'novembre', 'décembre'],
+ c: '%a %d %b %Y %T %Z',
+ p: ['', ''],
+ P: ['', ''],
+ x: '%d.%m.%Y',
+ X: '%T'
+ };
+
+ f = function() {
+ var d = new Date();
+ d.locale = locale;
+ var iso = d.strftime(format);
+ $("#" + id).html(iso);
+ window.setTimeout(f, 1000);
+ };
+ f();
+
+ return ret_val;
+ },
+ attributes : {
+ lang : {type : "list" , required : false, list : {en : "en", de : "de", fr : "fr"}},
+ format : {type : "string", required : false},
+ },
+ content : false
+});
Property changes on: CometVisu/trunk/visu/plugins/strftime/structure_plugin.js
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-10-10 19:43:37 UTC (rev 1045)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-10-11 10:57:25 UTC (rev 1046)
@@ -220,6 +220,7 @@
<xsd:element name="rss" type="rss" />
<xsd:element name="rsslog" type="rsslog" />
<xsd:element name="jqclock" type="jqclock" />
+ <xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
<xsd:element name="layout" type="layout" />
@@ -276,6 +277,7 @@
<xsd:element name="rss" type="rss" />
<xsd:element name="rsslog" type="rsslog" />
<xsd:element name="jqclock" type="jqclock" />
+ <xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
<xsd:element name="group" type="group" />
@@ -317,6 +319,7 @@
<xsd:element name="gweather" type="gweather" />
<xsd:element name="rss" type="rss" />
<xsd:element name="jqclock" type="jqclock" />
+ <xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
</xsd:choice>
@@ -674,6 +677,19 @@
<xsd:attribute name="date" type="xsd:string" use="optional" />
</xsd:complexType>
+ <xsd:complexType name="strftime">
+ <xsd:attribute name="lang" use="optional">
+ <xsd:simpleType>
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="en" />
+ <xsd:enumeration value="de" />
+ <xsd:enumeration value="fr" />
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:attribute>
+ <xsd:attribute name="format" type="xsd:string" use="optional" />
+ </xsd:complexType>
+
<xsd:complexType name="upnpcontroller">
<xsd:attribute name="label" type="xsd:string" use="required" />
<xsd:attribute name="player_ip_addr" type="xsd:string" use="required" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2012-11-07 19:32:38
|
Revision: 1101
http://openautomation.svn.sourceforge.net/openautomation/?rev=1101&view=rev
Author: hausl
Date: 2012-11-07 19:32:31 +0000 (Wed, 07 Nov 2012)
Log Message:
-----------
Removal of the jqclock plugin due to redundancy (strftime plugin offers more flexibility)
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/designs/pitchblack/basic.css
CometVisu/trunk/visu/visu_config.xsd
Removed Paths:
-------------
CometVisu/trunk/visu/plugins/jqclock/jqclock.css
CometVisu/trunk/visu/plugins/jqclock/jqclock.min.js
CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/ChangeLog 2012-11-07 19:32:31 UTC (rev 1101)
@@ -2,6 +2,7 @@
====
- New plugin: strftime
+- Obsolete plugin removed: jqclock
- New plugin: clock
- New plugin: rsslog
- New plugin: upnpcontroller
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-11-07 19:32:31 UTC (rev 1101)
@@ -726,8 +726,6 @@
width: 90%;
}
.rowspan { overflow:none; }
-.jqclock .clockdate { float: left; }
-.jqclock .clocktime { min-width: 4em; display: block; float: left; margin: 0 0 0 0.4em; }
.strftime { font-family: Helvetica, Arial, sans-serif; font-size: 5mm; }
/* START: alignment of widgets */
Modified: CometVisu/trunk/visu/designs/pitchblack/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/designs/pitchblack/basic.css 2012-11-07 19:32:31 UTC (rev 1101)
@@ -144,7 +144,7 @@
font-size: 1.25em;
}
-.rsslogRow, div#jqclock_head, .footer, .footer * {
+.rsslogRow, .footer, .footer * {
font-size:80%;
}
Deleted: CometVisu/trunk/visu/plugins/jqclock/jqclock.css
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/jqclock.css 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/plugins/jqclock/jqclock.css 2012-11-07 19:32:31 UTC (rev 1101)
@@ -1,36 +0,0 @@
-.jqclock {
- float:right;
- white-space: nowrap;
-/*
- text-align:center;
- background: LightYellow;
- border: 1px Black solid;
- padding: 10px;
- margin:20px;
-*/
-}
-.clockdate {
- white-space: nowrap;
-/*
- color: DarkRed;
- margin-bottom: 10px;
- font-size: 18px;
- display: block;
-*/
-}
-.clocktime {
- white-space: nowrap;
-/*
- border: 2px
- inset White;
- background: Black;
- padding: 5px;
- font-size: 14px;
- font-family: "Courier";
- color: LightGreen;
- display: block;
-*/
- margin: 10px;
-}
-
-
Deleted: CometVisu/trunk/visu/plugins/jqclock/jqclock.min.js
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/jqclock.min.js 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/plugins/jqclock/jqclock.min.js 2012-11-07 19:32:31 UTC (rev 1101)
@@ -1 +0,0 @@
-(function($){$.clock={version:"2.0.1",locale:{}};t=[];$.fn.clock=function(d){var c={it:{weekdays:["Domenica","Lunedì","Martedì","Mercoledì","Giovedì","Venerdì","Sabato"],months:["Gennaio","Febbraio","Marzo","Aprile","Maggio","Giugno","Luglio","Agosto","Settembre","Ottobre","Novembre","Dicembre"]},en:{weekdays:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],months:["January","February","March","April","May","June","July","August","September","October","November","December"]},es:{weekdays:["Domingo","Lunes","Martes","Miércoles","Jueves","Viernes","Sábado"],months:["Enero","Febrero","Marzo","Abril","May","junio","Julio","Agosto","Septiembre","Octubre","Noviembre","Diciembre"]},de:{weekdays:["Sonntag","Montag","Dienstag","Mittwoch","Donnerstag","Freitag","Samstag"],months:["Januar","Februar","März","April","Mai","Juni","Juli","August","September","Oktober","November","Dezember"]},fr:{weekdays:["Dimanche","Lundi","Mardi","Mercredi","Jeudi","Vendredi","Samedi"],months:["Janvier","Février","Mars","Avril","May","Juin","Juillet","Août","Septembre","Octobre","Novembre","Décembre"]},ru:{weekdays:["Воскресенье","Понедельник","Вторник","Среда","Четверг","Пятница","Суббота"],months:["Январь","Февраль","Март","Апрель","Май","Июнь","Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь"]}};return this.each(function(){$.extend(c,$.clock.locale);d=d||{};d.timestamp=d.timestamp||"z";y=new Date().getTime();d.sysdiff=0;if(d.timestamp!="z"){d.sysdiff=d.timestamp-y}d.langSet=d.langSet||"en";d.format=d.format||((d.langSet!="en")?"24":"12");d.calendar=d.calendar||"true";if(!$(this).hasClass("jqclock")){$(this).addClass("jqclock")}var e=function(g){if(g<10){g="0"+g}return g},f=function(j,n){var r=$(j).attr("id");if(n=="destroy"){clearTimeout(t[r])}else{m=new Date(new Date().getTime()+n.sysdiff);var p=m.getHours(),l=m.getMinutes(),v=m.getSeconds(),u=m.getDay(),i=m.getDate(),k=m.getMonth(),q=m.getFullYear(),o="",z="",w=n.langSet;if(n.format=="12"){o=" AM";if(p>11){o=" PM"}if(p>12){p=p-12}if(p==0){p=12}}p=e(p);l=e(l);v=e(v);if(n.calendar!="false"){z=((w=="en")?"<span class='clockdate'>"+c[w].weekdays[u]+", "+c[w].months[k]+" "+i+", "+q+"</span>":"<span class='clockdate'>"+c[w].weekdays[u]+", "+i+" "+c[w].months[k]+" "+q+"</span>")}$(j).html(z+"<span class='clocktime'>"+p+":"+l+":"+v+o+"</span>");t[r]=setTimeout(function(){f($(j),n)},1000)}};f($(this),d)})};return this})(jQuery);
Deleted: CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/plugins/jqclock/structure_plugin.js 2012-11-07 19:32:31 UTC (rev 1101)
@@ -1,60 +0,0 @@
-/* structure_plugin.js (c) 2011 by Michael Markstaller [de...@wi...]
- *
- * 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 3 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.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
-*/
-
-/**
- * This plugins integrates date/clock into CometVisu.
- */
-
-$('head').append('<script type=\"text/javascript\" src=\"plugins/jqclock/jqclock.min.js\" charset=\"UTF-8\"></script>');
-$('head').append('<link rel="stylesheet" href="plugins/jqclock/jqclock.css" type="text/css" />');
-
-VisuDesign_Custom.prototype.addCreator("jqclock", {
- create: function( page, path ) {
- var $p = $(page);
- function uniqid() {
- var newDate = new Date;
- return newDate.getTime();
- }
- var id = "jqclock_" + uniqid();
-
- var ret_val = $('<div class="widget clearfix jqclock" />');
- ret_val.setWidgetLayout($p);
-
- var label = '<div class="label">' + page.textContent + '</div>';
- var actor = $("<div class=\"actor\"><div class=\"jqclock_inline\" id=\"" + id + "\"></div></div>");
- var jqclock = $("#"+id,actor);
-
- if ($p.attr("width")) {
- jqclock.css("width", $p.attr("width"));
- }
- if ($p.attr("height")) {
- jqclock.css("height", $p.attr("height"));
- }
-
- //start the clock in statusbar - if any
- $("div#jqclock_status").clock({"langSet":$("div#jqclock_status").attr('lang'),"calendar":$("div#jqclock_status").attr('date')});
-
- window.setTimeout(function() {
- //start myself after 1 sec? a quirk?
- $("#"+id).clock({"langSet":$p.attr("lang"), "calendar":$p.attr("date")});
- }, 1000);
-
- ret_val.append(label).append(actor);
- return ret_val;
- }
-});
-
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-11-07 12:16:57 UTC (rev 1100)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-11-07 19:32:31 UTC (rev 1101)
@@ -321,7 +321,6 @@
<xsd:element name="gweather" type="gweather" />
<xsd:element name="rss" type="rss" />
<xsd:element name="rsslog" type="rsslog" />
- <xsd:element name="jqclock" type="jqclock" />
<xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
@@ -378,7 +377,6 @@
<xsd:element name="gweather" type="gweather" />
<xsd:element name="rss" type="rss" />
<xsd:element name="rsslog" type="rsslog" />
- <xsd:element name="jqclock" type="jqclock" />
<xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
@@ -421,7 +419,6 @@
<xsd:element name="diagram" type="diagram" />
<xsd:element name="gweather" type="gweather" />
<xsd:element name="rss" type="rss" />
- <xsd:element name="jqclock" type="jqclock" />
<xsd:element name="strftime" type="strftime" />
<xsd:element name="upnpcontroller" type="upnpcontroller" />
<xsd:element name="page" type="page" />
@@ -772,17 +769,6 @@
<xsd:attribute name="filter" type="xsd:string" use="optional" />
</xsd:complexType>
- <xsd:complexType name="jqclock">
- <xsd:choice maxOccurs="unbounded" minOccurs="1">
- <xsd:element name="label" type="label" maxOccurs="1" />
- <xsd:element name="layout" type="layout" minOccurs="0" maxOccurs="1" />
- </xsd:choice>
- <xsd:attribute name="width" type="dimension" use="optional" />
- <xsd:attribute name="height" type="dimension" use="optional" />
- <xsd:attribute ref="lang" use="required" />
- <xsd:attribute name="date" type="xsd:boolean" use="optional" />
- </xsd:complexType>
-
<xsd:complexType name="strftime">
<xsd:attribute name="lang" use="optional">
<xsd:simpleType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ha...@us...> - 2012-12-08 14:35:48
|
Revision: 1190
http://openautomation.svn.sourceforge.net/openautomation/?rev=1190&view=rev
Author: hausl
Date: 2012-12-08 14:35:42 +0000 (Sat, 08 Dec 2012)
Log Message:
-----------
possibility to add individual icons (author: hausl)
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/visu/lib/iconhandler.js
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/visu_config.xsd
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-12-07 21:19:41 UTC (rev 1189)
+++ CometVisu/trunk/ChangeLog 2012-12-08 14:35:42 UTC (rev 1190)
@@ -1,6 +1,7 @@
HEAD
====
+- New feature: individual icons can be added in the meta area
- New plugin: strftime
- Obsolete plugin removed: jqclock
- New plugin: clock
Modified: CometVisu/trunk/visu/lib/iconhandler.js
===================================================================
--- CometVisu/trunk/visu/lib/iconhandler.js 2012-12-07 21:19:41 UTC (rev 1189)
+++ CometVisu/trunk/visu/lib/iconhandler.js 2012-12-08 14:35:42 UTC (rev 1190)
@@ -91,13 +91,14 @@
var uri = arguments[1];
var type = arguments[2] || '*';
var flavour = arguments[3] || '*';
+ var style = arguments[4];
if( ! db[ name ] ) db[ name ] = {};
if( ! db[ name ][ type ] ) db[ name ][ type ] = {};
- db[ name ][ type ][ flavour ] = { uri: uri };
+ db[ name ][ type ][ flavour ] = { uri: uri, style: style };
}
-
+
/**
* Get the icon information for a name.
* @method get
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-12-07 21:19:41 UTC (rev 1189)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-12-08 14:35:42 UTC (rev 1190)
@@ -403,6 +403,18 @@
};
});
+ // then the icons
+ $('meta > icons icon-definition', xml).each(
+ function(i) {
+ var $this = $(this);
+ var name = $this.attr('name');
+ var uri = $this.attr('uri');
+ var style = $this.attr('style');
+ var type = $this.attr('type');
+ var flavour = $this.attr('flavour');
+ icons.insert(name, uri, type, flavour, style);
+ });
+
// then the mappings
$('meta > mappings mapping', xml).each(
function(i) {
Modified: CometVisu/trunk/visu/visu_config.xsd
===================================================================
--- CometVisu/trunk/visu/visu_config.xsd 2012-12-07 21:19:41 UTC (rev 1189)
+++ CometVisu/trunk/visu/visu_config.xsd 2012-12-08 14:35:42 UTC (rev 1190)
@@ -250,6 +250,7 @@
<xsd:complexType name="meta">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="plugins" type="plugins" />
+ <xsd:element name="icons" type="icons" />
<xsd:element name="mappings" type="mappings" />
<xsd:element name="stylings" type="stylings" />
<xsd:element name="statusbar" type="statusbar" />
@@ -266,6 +267,20 @@
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
+ <xsd:complexType name="icons">
+ <xsd:choice minOccurs="0" maxOccurs="unbounded">
+ <xsd:element name="icon-definition" type="icon-definition" />
+ </xsd:choice>
+ </xsd:complexType>
+
+ <xsd:complexType name="icon-definition">
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ <xsd:attribute name="uri" type="xsd:string" use="required" />
+ <xsd:attribute name="style" type="xsd:string" use="optional" />
+ <xsd:attribute name="type" type="xsd:string" use="optional" />
+ <xsd:attribute name="flavour" type="xsd:string" use="optional" />
+ </xsd:complexType>
+
<xsd:complexType name="mappings">
<xsd:choice minOccurs="0" maxOccurs="unbounded">
<xsd:element name="mapping" type="mapping" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <net...@us...> - 2012-12-25 22:29:38
|
Revision: 1247
http://openautomation.svn.sourceforge.net/openautomation/?rev=1247&view=rev
Author: netzkind
Date: 2012-12-25 22:29:23 +0000 (Tue, 25 Dec 2012)
Log Message:
-----------
finished milestone 3; please see editor/DEVELOPMENT.txt for details; anyways, this should already be usable; saving is enabled
Modified Paths:
--------------
CometVisu/trunk/editor-gfx/Buttons_Visu_sprite.psd
CometVisu/trunk/visu/editor/DEVELOPMENT.txt
CometVisu/trunk/visu/editor/index.html
CometVisu/trunk/visu/editor/init.js
CometVisu/trunk/visu/editor/lib/Configuration.js
CometVisu/trunk/visu/editor/lib/Editor.css
CometVisu/trunk/visu/editor/lib/Editor.js
CometVisu/trunk/visu/editor/lib/Messages.js
CometVisu/trunk/visu/editor/lib/Schema.js
CometVisu/trunk/visu/editor/lib/editor_sprite.png
CometVisu/trunk/visu/visu_config_demo.xml
Added Paths:
-----------
CometVisu/trunk/visu/editor/bin/
CometVisu/trunk/visu/editor/bin/save_config.php
CometVisu/trunk/visu/editor/dataproviders/
CometVisu/trunk/visu/editor/dataproviders/DataProviderConfig.js
CometVisu/trunk/visu/editor/dataproviders/dpt_list.json
CometVisu/trunk/visu/editor/dataproviders/list_all_addresses.php
CometVisu/trunk/visu/editor/dataproviders/list_all_rrds.php
CometVisu/trunk/visu/editor/dependencies/
CometVisu/trunk/visu/editor/dependencies/json2.js
CometVisu/trunk/visu/editor/lib/ActiveInput.js
CometVisu/trunk/visu/editor/lib/DataProvider.js
CometVisu/trunk/visu/editor/lib/ListenerEvent.js
Modified: CometVisu/trunk/editor-gfx/Buttons_Visu_sprite.psd
===================================================================
(Binary files differ)
Modified: CometVisu/trunk/visu/editor/DEVELOPMENT.txt
===================================================================
--- CometVisu/trunk/visu/editor/DEVELOPMENT.txt 2012-12-25 09:52:55 UTC (rev 1246)
+++ CometVisu/trunk/visu/editor/DEVELOPMENT.txt 2012-12-25 22:29:23 UTC (rev 1247)
@@ -2,7 +2,6 @@
* loading the XSD is done in Javascript. The Schema-Loader knows a certain set an structure of an XSD. If "unknown"
XSD-features are being used in the schema, the Schema-Loader may not know about them, and the editor will thus fail.
* the Schema care a little for bounds. It does, however, not support 'multi-dimensional'-bounds.
-* has no f'ing clue about mixed items - seriously, how are you supposed to display a mixed element in a tree?
* user-feedback is done using window.alert() - this works accross all devices and browsers, has no ux-issues on small
screens, and enforces the users attention.
* XSD is fucked up. minOccurs on elements in a choice are ignored if said choice is bounded otherwise
@@ -19,17 +18,19 @@
- node-attributes can be edited
- node children can be added, removed
-* MS3 - week 49/50 2012
- - nodes have copy & paste, move.
+* MS3 - week 52 2012
+ - nodes have copy&paste, move.
- configuration can be saved
- attributes like rrd, addr can be selected from a list; said list is loaded from the server
- - attributes like styling, mapping can be selected from a dynamic list; list is based on actual configuration
+ - attributes like styling, mapping can be selected from a dynamic list; list is based on current configuration
-* MS4 - week 52 2012
+* MS4 - early 2013
+ - better check bounds of configuration, including multi-dimensional bounds, sequences?
- preview for a selected node without the need of replacing the configuration on the server
=== TODO ===
+
* MS1:
- done
@@ -37,17 +38,13 @@
- done
* MS3:
- - frontend: have copy&paste for nodes incl. children
- - frontend: have move for nodes incl. children (drag&drop?; mind touch-devices!)
- - frontend: save configuration
- - backend (save the xml; php)
- - cross-reference: have select-lists for mapping, stylings, ... defined by the config itself
- - allow for multi-dimensional bounds, as well as sequence?
+ - done
* MS4:
+ - allow for multi-dimensional bounds, as well as sequence?
- frontend: preview node incl. children
=== IDEAS ===
* read xsd:annotation and xsd:documentation including xml:lang for tooltips/...
-* allow for mixed nodes (see http://stackoverflow.com/questions/937640/how-to-access-xml-text-node-in-jquery)
+* transparently exchange whitespaces with for text-nodes to make sure the user gets what he entered ...
Added: CometVisu/trunk/visu/editor/bin/save_config.php
===================================================================
--- CometVisu/trunk/visu/editor/bin/save_config.php (rev 0)
+++ CometVisu/trunk/visu/editor/bin/save_config.php 2012-12-25 22:29:23 UTC (rev 1247)
@@ -0,0 +1,155 @@
+<?php
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Save a serialized representation of a configuration to its file.
+ * Serialization is done by means of JSON.
+ *
+ *
+ * LICENSE: 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 3
+ * 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, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @category editor
+ * @package CometVisu
+ * @author Julian Makowski (julian at makowskis dot de)
+ * @copyright 2012 Julian Makowski
+ * @license GPLv3 or later, http://opensource.org/licenses/gpl-license.php
+ * @version SVN: $Id$
+ * @link http://cometvisu.de
+ * @since 2012-12-12
+ */
+
+define('CONFIG_FILENAME', '../../visu_config%s.xml');
+
+// get everything the user has provided ...
+$strJson = (true === isset($_POST['data'])) ? $_POST['data'] : null;
+$strConfig = (true === isset($_POST['config'])) ? $_POST['config'] : null;
+
+$strConfigSuffix = preg_replace('/^visu_config_?(.*?)\.xml$/', '$1', $strConfig);
+
+// clean-up filename, we want no security-holes. work with a whitelist.
+$strConfigCleaned = preg_replace("/[^\-\_0-9da-z]/i", "", $strConfigSuffix);
+
+// generate the configurations filename
+$strConfigFilename = sprintf(CONFIG_FILENAME, $strConfigCleaned);
+// .. as a fully qualified filename
+$strConfigFQFilename = realpath($strConfigFilename);
+
+if (false === is_writeable($strConfigFQFilename)) {
+ exitWithResponse(false, 'config-file is not writeable by webserver-process; please chmod/chown config-file \'' . $strConfigFQFilename . '\'.');
+}
+
+// bail out if no json/configuration-data was provided
+if (true === empty($strJson)) {
+ exitWithResponse(false, 'no configuration-content given');
+}
+
+// decode json
+$arrData = json_decode(stripslashes($strJson), true);
+
+try {
+ /** die alten Mappings und stylings übernehmen */
+ $objDOM = new DOMDocument('1.0', 'UTF-8');
+ $objDOM->formatOutput = true;
+
+
+ foreach ($arrData as $arrRootNodeData) {
+ $objDOM->appendChild(createDOMFromData($objDOM, $arrRootNodeData));
+ }
+
+
+ // stupid hacking. create the xml twice to receive nice newlines and indentation ...
+ $strXML = $objDOM->saveXML();
+ $objXML = new DOMDocument();
+ $objXML->preserveWhiteSpace = false;
+ $objXML->formatOutput = true;
+ $objXML->loadXML($strXML);
+
+ // save the XML to its configuration file
+ $handle = fopen($strConfigFQFilename, "w");
+ fputs($handle, $objXML->saveXML());
+ fclose($handle);
+} catch (Exception $e) {
+ exitWithResponse(false, 'error: ' . $e->getMessage());
+}
+
+exitWithResponse(true, 'all good');
+
+/**
+ * create the DOM from a node
+ *
+ * @param object $objMasterDOM master-DOM
+ * @param array $arrConfig the configuration received from the editor, or a part of it
+ * @returns object DOM-object
+ * @throws InvalidArgumentException
+ */
+function createDOMFromData($objMasterDOM, $arrConfig) {
+
+ if (false === isset($arrConfig['nodeName'])) {
+ throw new InvalidArgumentException('node has no name, ' . var_export($arrConfig, true));
+ }
+
+ if ($arrConfig['nodeName'] == '#text') {
+ // this is a masqueraded text-only node
+ $objXMLElement = $objMasterDOM->createTextNode($arrConfig['nodeValue']);
+ return $objXMLElement;
+ }
+
+ // create a new DOM-Element
+ $objXMLElement = $objMasterDOM->createElement($arrConfig['nodeName']);
+
+ if (false === empty($arrConfig['attributes'])) {
+ // add all of our attributes
+ foreach ($arrConfig['attributes'] as $strName => $mixValue) {
+ $objXMLElement->setAttribute($strName, $mixValue);
+ }
+ }
+
+ if (false === empty($arrConfig['children'])) {
+ // create and add new nodes for all of our children
+ foreach ($arrConfig['children'] as $arrChildData) {
+ $objXMLElement->appendChild(createDOMFromData($objMasterDOM, $arrChildData));
+ }
+ }
+
+
+ if (false === empty($arrConfig['nodeValue'])) {
+ // set the node value, if any
+ $objCDATA = $objMasterDOM->createTextNode($arrConfig['nodeValue']);
+ $objXMLElement->appendChild($objCDATA);
+ }
+
+
+ return $objXMLElement;
+}
+
+/**
+ * create and send a response.
+ * This function will issue an exit command!
+ *
+ * @param boolean $boolSuccess was the operating successful?
+ * @param string $strMessage a message, if any
+ */
+function exitWithResponse($boolSuccess, $strMessage = '') {
+ header('Content-type: application/json');
+ $arrResponse = array(
+ 'success' => (bool)$boolSuccess,
+ 'message' => (string)$strMessage
+ );
+
+ print json_encode($arrResponse);
+ exit;
+}
+
+?>
+
Added: CometVisu/trunk/visu/editor/dataproviders/DataProviderConfig.js
===================================================================
--- CometVisu/trunk/visu/editor/dataproviders/DataProviderConfig.js (rev 0)
+++ CometVisu/trunk/visu/editor/dataproviders/DataProviderConfig.js 2012-12-25 22:29:23 UTC (rev 1247)
@@ -0,0 +1,100 @@
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
+
+/**
+ * Provide a configuration/list of available data-providers for attributes.
+ *
+ * May be used for any attribute which is defined in the schema/xsd and referenced by a globally defined type
+ *
+ *
+ * LICENSE: 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 3
+ * 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, see <http://opensource.org/licenses/gpl-license.php>;.
+ *
+ * @category editor
+ * @package CometVisu
+ * @author Julian Makowski (julian at makowskis dot de)
+ * @copyright 2012 Julian Makowski
+ * @license GPLv3 or later, http://opensource.org/licenses/gpl-license.php
+ * @version SVN: $Id$
+ * @link http://cometvisu.de
+ * @since 2012-10-17
+ */
+
+var DataProviderConfig = {
+ 'elementValues': {
+ 'address': {
+ url: 'editor/dataproviders/list_all_addresses.php',
+ cache: true,
+ userInputAllowed: true,
+ grouped: true,
+ },
+ },
+ 'attributes': {
+ 'rrd': {
+ url: 'editor/dataproviders/list_all_rrds.php',
+ cache: true,
+ userInputAllowed: true,
+ },
+
+ 'ga': {
+ url: 'editor/dataproviders/list_all_addresses.php',
+ cache: true,
+ userInputAllowed: true,
+ grouped: true,
+ },
+ 'transform': {
+ url: 'editor/dataproviders/dpt_list.json',
+ cache: true,
+ userInputAllowed: false,
+ },
+ 'styling': {
+ live: function() {
+ var stylings = [];
+ // find all current stylings and their names
+ $('#config').find('.element > .name.nodeType_styling .nameValue').each(function () {
+ var text = $(this).text();
+
+ // create an object for this styling
+ var styling = {value: text, label: text};
+
+ // push it to the stack
+ stylings.push(styling);
+ });
+
+ // and off we go.
+ return stylings;
+ },
+ cache: false,
+ userInputAllowed: false,
+ },
+ 'mapping': {
+ live: function() {
+ var stylings = [];
+ // find all current mappings and their names
+ $('#config').find('.element > .name.nodeType_mapping .nameValue').each(function () {
+ var text = $(this).text();
+
+ // create an object for this styling
+ var styling = {value: text, label: text};
+
+ // push it to the stack
+ stylings.push(styling);
+ });
+
+ // and off we go.
+ return stylings;
+ },
+ cache: false,
+ userInputAllowed: false,
+ },
+ },
+};
Added: CometVisu/trunk/visu/editor/dataproviders/dpt_list.json
===================================================================
--- CometVisu/trunk/visu/editor/dataproviders/dpt_list.json (rev 0)
+++ CometVisu/trunk/visu/editor/dataproviders/dpt_list.json 2012-12-25 22:29:23 UTC (rev 1247)
@@ -0,0 +1 @@
+[{"value":"DPT:1.001","label":"DPT_Switch"},{"value":"DPT:1.002","label":"DPT_Bool"},{"value":"DPT:1.003","label":"DPT_Enable"},{"value":"DPT:1.004","label":"DPT_Ramp"},{"value":"DPT:1.005","label":"DPT_Alarm"},{"value":"DPT:1.006","label":"DPT_BinaryValue"},{"value":"DPT:1.007","label":"DPT_Step"},{"value":"DPT:1.008","label":"DPT_UpDown"},{"value":"DPT:1.009","label":"DPT_OpenClose"},{"value":"DPT:1.010","label":"DPT_Start"},{"value":"DPT:1.011","label":"DPT_State"},{"value":"DPT:1.012","label":"DPT_Invert"},{"value":"DPT:1.013","label":"DPT_DimSendStyle"},{"value":"DPT:1.014","label":"DPT_InputSource"},{"value":"DPT:1.015","label":"DPT_Reset"},{"value":"DPT:1.016","label":"DPT_Ack"},{"value":"DPT:1.017","label":"DPT_Trigger"},{"value":"DPT:1.018","label":"DPT_Occupancy"},{"value":"DPT:1.019","label":"DPT_Window_Door"},{"value":"DPT:1.021","label":"DPT_LogicalFunction"},{"value":"DPT:1.022","label":"DPT_Scene_AB"},{"value":"DPT:1.023","label":"DPT_ShutterBlinds_Mode"},{"value":"DPT:1.100","label":"DPT_Heat\/Cool"},{"value":"DPT:2.001","label":"DPT_Switch_Control"},{"value":"DPT:2.002","label":"DPT_Bool_Control"},{"value":"DPT:2.003","label":"DPT_Enable_Control"},{"value":"DPT:2.004","label":"DPT_Ramp_Control"},{"value":"DPT:2.005","label":"DPT_Alarm_Control"},{"value":"DPT:2.006","label":"DPT_BinaryValue_Control"},{"value":"DPT:2.007","label":"DPT_Step_Control"},{"value":"DPT:2.008","label":"DPT_Direction1_Control"},{"value":"DPT:2.009","label":"DPT_Direction2_Control"},{"value":"DPT:2.010","label":"DPT_Start_Control"},{"value":"DPT:2.011","label":"DPT_State_Control"},{"value":"DPT:2.012","label":"DPT_Invert_Control"},{"value":"DPT:3.007","label":"DPT_Control_Dimming"},{"value":"DPT:3.008","label":"DPT_Control_Blinds"},{"value":"DPT:4.001","label":"DPT_Char_ASCII"},{"value":"DPT:4.002","label":"DPT_Char_8859_1"},{"value":"DPT:5.001","label":"DPT_Scaling"},{"value":"DPT:5.003","label":"DPT_Angle"},{"value":"DPT:5.004","label":"DPT_Percent_U8"},{"value":"DPT:5.005","label":"DPT_DecimalFactor"},{"value":"DPT:5.006","label":"DPT_Tariff"},{"value":"DPT:5.010","label":"DPT_Value_1_Ucount"},{"value":"DPT:6.001","label":"DPT_Percent_V8"},{"value":"DPT:6.010","label":"DPT_Value_1_Count"},{"value":"DPT:6.020","label":"DPT_Status_Mode3"},{"value":"DPT:7.001","label":"DPT_Value_2_Ucount"},{"value":"DPT:7.002","label":"DPT_TimePeriodMsec"},{"value":"DPT:7.003","label":"DPT_TimePeriod10MSec"},{"value":"DPT:7.004","label":"DPT_TimePeriod100MSec"},{"value":"DPT:7.005","label":"DPT_TimePeriodSec"},{"value":"DPT:7.006","label":"DPT_TimePeriodMin"},{"value":"DPT:7.007","label":"DPT_TimePeriodHrs"},{"value":"DPT:7.010","label":"DPT_PropDataType"},{"value":"DPT:7.011","label":"DPT_Length_mm"},{"value":"DPT:7.012","label":"DPT_UElCurrentmA"},{"value":"DPT:7.013","label":"DPT_Brightness"},{"value":"DPT:8.001","label":"DPT_Value_2_Count"},{"value":"DPT:8.002","label":"DPT_DeltaTimeMsec"},{"value":"DPT:8.003","label":"DPT_DeltaTime10MSec"},{"value":"DPT:8.004","label":"DPT_DeltaTime100MSec"},{"value":"DPT:8.005","label":"DPT_DeltaTimeSec"},{"value":"DPT:8.006","label":"DPT_DeltaTimeMin"},{"value":"DPT:8.007","label":"DPT_DeltaTimeHrs"},{"value":"DPT:8.010","label":"DPT_Percent_V16"},{"value":"DPT:8.011","label":"DPT_Rotation_Angle"},{"value":"DPT:9.001","label":"DPT_Value_Temp"},{"value":"DPT:9.002","label":"DPT_Value_Tempd"},{"value":"DPT:9.003","label":"DPT_Value_Tempa"},{"value":"DPT:9.004","label":"DPT_Value_Lux"},{"value":"DPT:9.005","label":"DPT_Value_Wsp"},{"value":"DPT:9.006","label":"DPT_Value_Pres"},{"value":"DPT:9.007","label":"DPT_Value_Humidity"},{"value":"DPT:9.008","label":"DPT_Value_AirQuality"},{"value":"DPT:9.010","label":"DPT_Value_Time1"},{"value":"DPT:9.011","label":"DPT_Value_Time2"},{"value":"DPT:9.020","label":"DPT_Value_Volt"},{"value":"DPT:9.021","label":"DPT_Value_Curr"},{"value":"DPT:9.022","label":"DPT_PowerDensity"},{"value":"DPT:9.023","label":"DPT_KelvinPerPercent"},{"value":"DPT:9.024","label":"DPT_Power"},{"value":"DPT:9.025","label":"DPT_Value_Volume_Flow"},{"value":"DPT:9.026","label":"DPT_Rain_Amount"},{"value":"DPT:9.027","label":"DPT_Value_Temp_F"},{"value":"DPT:9.028","label":"DPT_Value_Wsp_kmh"},{"value":"DPT:10.001","label":"DPT_TimeOfDay"},{"value":"DPT:11.001","label":"DPT_Date"},{"value":"DPT:12.001","label":"DPT_Value_4_Ucount"},{"value":"DPT:13.001","label":"DPT_Value_4_Count"},{"value":"DPT:13.010","label":"DPT_ActiveEnergy"},{"value":"DPT:13.011","label":"DPT_ApparantEnergy"},{"value":"DPT:13.012","label":"DPT_ReactiveEnergy"},{"value":"DPT:13.013","label":"DPT_ActiveEnergy_kWh"},{"value":"DPT:13.014","label":"DPT_ApparantEnergy_kVAh"},{"value":"DPT:13.015","label":"DPT_ReactiveEnergy_kVARh"},{"value":"DPT:13.100","label":"DPT_LongDeltaTimeSec"},{"value":"DPT:14.000","label":"DPT_Value_Acceleration"},{"value":"DPT:14.001","label":"DPT_Value_Acceleration_Angular"},{"value":"DPT:14.002","label":"DPT_Value_Activation_Energy"},{"value":"DPT:14.003","label":"DPT_Value_Activity"},{"value":"DPT:14.004","label":"DPT_Value_Mol"},{"value":"DPT:14.005","label":"DPT_Value_Amplitude"},{"value":"DPT:14.006","label":"DPT_Value_AngleRad"},{"value":"DPT:14.007","label":"DPT_Value_AngleDeg"},{"value":"DPT:14.008","label":"DPT_Value_Angular_Momentum"},{"value":"DPT:14.009","label":"DPT_Value_Angular_Velocity"},{"value":"DPT:14.010","label":"DPT_Value_Area"},{"value":"DPT:14.011","label":"DPT_Value_Capacitance"},{"value":"DPT:14.012","label":"DPT_Value_Charge_DensitySurface"},{"value":"DPT:14.013","label":"DPT_Value_Charge_DensityVolume"},{"value":"DPT:14.014","label":"DPT_Value_Compressibility"},{"value":"DPT:14.015","label":"DPT_Value_Conductance"},{"value":"DPT:14.016","label":"DPT_Value_Electrical_Conductivity"},{"value":"DPT:14.017","label":"DPT_Value_Density"},{"value":"DPT:14.018","label":"DPT_Value_Electric_Charge"},{"value":"DPT:14.019","label":"DPT_Value_Electric_Current"},{"value":"DPT:14.020","label":"DPT_Value_Electric_CurrentDensity"},{"value":"DPT:14.021","label":"DPT_Value_Electric_DipoleMoment"},{"value":"DPT:14.022","label":"DPT_Value_Electric_Displacement"},{"value":"DPT:14.023","label":"DPT_Value_Electric_FieldStrength"},{"value":"DPT:14.024","label":"DPT_Value_Electric_Flux"},{"value":"DPT:14.025","label":"DPT_Value_Electric_FluxDensity"},{"value":"DPT:14.026","label":"DPT_Value_Electric_Polarization"},{"value":"DPT:14.027","label":"DPT_Value_Electric_Potential"},{"value":"DPT:14.028","label":"DPT_Value_Electric_PotentialDifference"},{"value":"DPT:14.029","label":"DPT_Value_ElectromagneticMoment"},{"value":"DPT:14.030","label":"DPT_Value_Electromotive_Force"},{"value":"DPT:14.031","label":"DPT_Value_Energy"},{"value":"DPT:14.032","label":"DPT_Value_Force"},{"value":"DPT:14.033","label":"DPT_Value_Frequency"},{"value":"DPT:14.034","label":"DPT_Value_Angular_Frequency"},{"value":"DPT:14.035","label":"DPT_Value_Heat_Capacity"},{"value":"DPT:14.036","label":"DPT_Value_Heat_FlowRate"},{"value":"DPT:14.037","label":"DPT_Value_Heat_Quantity"},{"value":"DPT:14.038","label":"DPT_Value_Impedance"},{"value":"DPT:14.039","label":"DPT_Value_Length"},{"value":"DPT:14.040","label":"DPT_Value_Light_Quantity"},{"value":"DPT:14.041","label":"DPT_Value_Luminance"},{"value":"DPT:14.042","label":"DPT_Value_Luminous_Flux"},{"value":"DPT:14.043","label":"DPT_Value_Luminous_Intensity"},{"value":"DPT:14.044","label":"DPT_Value_Magnetic_FieldStrength"},{"value":"DPT:14.045","label":"DPT_Value_Magnetic_Flux"},{"value":"DPT:14.046","label":"DPT_Value_Magnetic_FluxDensity"},{"value":"DPT:14.047","label":"DPT_Value_Magnetic_Moment"},{"value":"DPT:14.048","label":"DPT_Value_Magnetic_Polarization"},{"value":"DPT:14.049","label":"DPT_Value_Magnetization"},{"value":"DPT:14.050","label":"DPT_Value_MagnetomotiveForce"},{"value":"DPT:14.051","label":"DPT_Value_Mass"},{"value":"DPT:14.052","label":"DPT_Value_MassFlux"},{"value":"DPT:14.053","label":"DPT_Value_Momentum"},{"value":"DPT:14.054","label":"DPT_Value_Phase_AngleRad"},{"value":"DPT:14.055","label":"DPT_Value_Phase_AngleDeg"},{"value":"DPT:14.056","label":"DPT_Value_Power"},{"value":"DPT:14.057","label":"DPT_Value_Power_Factor"},{"value":"DPT:14.058","label":"DPT_Value_Pressure"},{"value":"DPT:14.059","label":"DPT_Value_Reactance"},{"value":"DPT:14.060","label":"DPT_Value_Resistance"},{"value":"DPT:14.061","label":"DPT_Value_Resistivity"},{"value":"DPT:14.062","label":"DPT_Value_SelfInductance"},{"value":"DPT:14.063","label":"DPT_Value_SolidAngle"},{"value":"DPT:14.064","label":"DPT_Value_Sound_Intensity"},{"value":"DPT:14.065","label":"DPT_Value_Speed"},{"value":"DPT:14.066","label":"DPT_Value_Stress"},{"value":"DPT:14.067","label":"DPT_Value_Surface_Tension"},{"value":"DPT:14.068","label":"DPT_Value_Common_Temperature"},{"value":"DPT:14.069","label":"DPT_Value_Absolute_Temperature"},{"value":"DPT:14.070","label":"DPT_Value_TemperatureDifference"},{"value":"DPT:14.071","label":"DPT_Value_Thermal_Capacity"},{"value":"DPT:14.072","label":"DPT_Value_Thermal_Conductivity"},{"value":"DPT:14.073","label":"DPT_Value_ThermoelectricPower"},{"value":"DPT:14.074","label":"DPT_Value_Time"},{"value":"DPT:14.075","label":"DPT_Value_Torque"},{"value":"DPT:14.076","label":"DPT_Value_Volume"},{"value":"DPT:14.077","label":"DPT_Value_Volume_Flux"},{"value":"DPT:14.078","label":"DPT_Value_Weight"},{"value":"DPT:14.079","label":"DPT_Value_Work"},{"value":"DPT:15.000","label":"DPT_Access_Data"},{"value":"DPT:16.000","label":"DPT_String_ASCII"},{"value":"DPT:16.001","label":"DPT_String_8859_1"},{"value":"DPT:17.001","label":"DPT_SceneNumber"},{"value":"DPT:18.001","label":"DPT_SceneControl"},{"value":"DPT:19.001","label":"DPT_DateTime"},{"value":"DPT:20.001","label":"DPT_SCLOMode"},{"value":"DPT:20.002","label":"DPT_BuildingMode"},{"value":"DPT:20.003","label":"DPT_OccMode"},{"value":"DPT:20.004","label":"DPT_Priority"},{"value":"DPT:20.005","label":"DPT_LightApplicationMode"},{"value":"DPT:20.006","label":"DPT_ApplicationArea"},{"value":"DPT:20.007","label":"DPT_AlarmClassType"},{"value":"DPT:20.008","label":"DPT_PSUMode"},{"value":"DPT:20.011","label":"DPT_ErrorClass_System"},{"value":"DPT:20.012","label":"DPT_ErrorClass_HVAC"},{"value":"DPT:20.013","label":"DPT_Time_Delay"},{"value":"DPT:20.014","label":"DPT_Beaufort_Wind_Force_Scale"},{"value":"DPT:20.017","label":"DPT_SensorSelect"},{"value":"DPT:20.100","label":"DPT_FuelType"},{"value":"DPT:20.101","label":"DPT_BurnerType"},{"value":"DPT:20.102","label":"DPT_HVACMode"},{"value":"DPT:20.103","label":"DPT_DHWMode"},{"value":"DPT:20.104","label":"DPT_LoadPriority"},{"value":"DPT:20.105","label":"DPT_HVACContrMode"},{"value":"DPT:20.106","label":"DPT_HVACEmergMode"},{"value":"DPT:20.107","label":"DPT_ChangeoverMode"},{"value":"DPT:20.108","label":"DPT_ValveMode"},{"value":"DPT:20.109","label":"DPT_DamperMode"},{"value":"DPT:20.110","label":"DPT_HeaterMode"},{"value":"DPT:20.111","label":"DPT_FanMode"},{"value":"DPT:20.112","label":"DPT_MasterSlaveMode"},{"value":"DPT:20.113","label":"DPT_StatusRoomSetp"},{"value":"DPT:20.600","label":"DPT_Behaviour_Lock_Unlock"},{"value":"DPT:20.601","label":"DPT_Behaviour_Bus_Power_Up_Down"},{"value":"DPT:20.1000","label":"DPT_CommMode"},{"value":"DPT:20.1001","label":"DPT_AddInfoTypes"},{"value":"DPT:20.1002","label":"DPT_RF_ModeSelect"},{"value":"DPT:20.1003","label":"DPT_RF_FilterSelect"},{"value":"DPT:21.001","label":"DPT_StatusGen"},{"value":"DPT:21.002","label":"DPT_Device_Control"},{"value":"DPT:21.100","label":"DPT_ForceSign"},{"value":"DPT:21.101","label":"DPT_ForceSignCool"},{"value":"DPT:21.102","label":"DPT_StatusRHC"},{"value":"DPT:21.103","label":"DPT_StatusSDHWC"},{"value":"DPT:21.104","label":"DPT_FuelTypeSet"},{"value":"DPT:21.105","label":"DPT_StatusRCC"},{"value":"DPT:21.106","label":"DPT_StatusAHU"},{"value":"DPT:21.1000","label":"DPT_RF_ModeInfo"},{"value":"DPT:21.1001","label":"DPT_RF_FilterInfo"},{"value":"DPT:21.1010","label":"DPT_Channel_Activation_8"},{"value":"DPT:22.100","label":"DPT_StatusDHWC"},{"value":"DPT:22.101","label":"DPT_StatusRHCC"},{"value":"DPT:22.1000","label":"DPT_Media"},{"value":"DPT:22.1010","label":"DPT_Channel_Activation_16"},{"value":"DPT:23.001","label":"DPT_OnOff_Action"},{"value":"DPT:23.002","label":"DPT_Alarm_Reaction"},{"value":"DPT:23.003","label":"DPT_UpDown_Action"},{"value":"DPT:23.102","label":"DPT_HVAC_PB_Action"},{"value":"DPT:24.001","label":"DPT_VarString_8859_1"},{"value":"DPT:25.1000","label":"DPT_DoubleNibble"},{"value":"DPT:26.001","label":"DPT_SceneInfo"},{"value":"DPT:27.001","label":"DPT_CombinedInfoOnOff"},{"value":"DPT:28.001","label":"DPT_UTF-8"},{"value":"DPT:29.010","label":"DPT_ActiveEnergy_V64"},{"value":"DPT:29.011","label":"DPT_ApparantEnergy_V64"},{"value":"DPT:29.012","label":"DPT_ReactiveEnergy_V64"},{"value":"DPT:30.1010","label":"DPT_Channel_Activation_24"},{"value":"DPT:31.101","label":"DPT_PB_Action_HVAC_Extended"},{"value":"DPT:200.100","label":"DPT_Heat\/Cool_Z"},{"value":"DPT:200.101","label":"DPT_BinaryValue_Z"},{"value":"DPT:201.100","label":"DPT_HVACMode_Z"},{"value":"DPT:201.102","label":"DPT_DHWMode_Z"},{"value":"DPT:201.104","label":"DPT_HVACContrMode_Z"},{"value":"DPT:201.105","label":"DPT_EnablH\/Cstage_Z"},{"value":"DPT:201.107","label":"DPT_BuildingMode_Z"},{"value":"DPT:201.108","label":"DPT_OccMode_Z"},{"value":"DPT:201.109","label":"DPT_HVACEmergMode_Z"},{"value":"DPT:202.001","label":"DPT_RelValue_Z"},{"value":"DPT:202.002","label":"DPT_UCountValue8_Z"},{"value":"DPT:203.002","label":"DPT_TimePeriodMsec_Z"},{"value":"DPT:203.003","label":"DPT_TimePeriod10Msec_Z"},{"value":"DPT:203.004","label":"DPT_TimePeriod100Msec_Z"},{"value":"DPT:203.005","label":"DPT_TimePeriodSec_Z"},{"value":"DPT:203.006","label":"DPT_TimePeriodMin_Z"},{"value":"DPT:203.007","label":"DPT_TimePeriodHrs_Z"},{"value":"DPT:203.011","label":"DPT_UFlowRateLiter\/h_Z"},{"value":"DPT:203.012","label":"DPT_UCountValue16_Z"},{"value":"DPT:203.013","label":"DPT_UElCurrent?A_Z"},{"value":"DPT:203.014","label":"DPT_PowerKW_Z"},{"value":"DPT:203.015","label":"DPT_AtmPressureAbs_Z"},{"value":"DPT:203.017","label":"DPT_PercentU16_Z"},{"value":"DPT:203.100","label":"DPT_HVACAirQual_Z"},{"value":"DPT:203.101","label":"DPT_WindSpeed_Z"},{"value":"DPT:203.102","label":"DPT_SunIntensity_Z"},{"value":"DPT:203.104","label":"DPT_HVACAirFlowAbs_Z"},{"value":"DPT:204.001","label":"DPT_RelSignedValue_Z"},{"value":"DPT:205.002","label":"DPT_DeltaTimeMsec_Z"},{"value":"DPT:205.003","label":"DPT_DeltaTime10Msec_Z"},{"value":"DPT:205.004","label":"DPT_DeltaTime100Msec_Z"},{"value":"DPT:205.005","label":"DPT_DeltaTimeSec_Z"},{"value":"DPT:205.006","label":"DPT_DeltaTimeMin_Z"},{"value":"DPT:205.007","label":"DPT_DeltaTimeHrs_Z"},{"value":"DPT:205.100","label":"DPT_TempHVACAbs_Z"},{"value":"DPT:205.101","label":"DPT_TempHVACRel_Z"},{"value":"DPT:205.102","label":"DPT_HVACAirFlowRel_Z"},{"value":"DPT:206.100","label":"DPT_HVACModeNext"},{"value":"DPT:206.102","label":"DPT_DHWModeNext"},{"value":"DPT:206.104","label":"DPT_OccModeNext"},{"value":"DPT:206.105","label":"DPT_BuildingModeNext"},{"value":"DPT:207.100","label":"DPT_StatusBUC"},{"value":"DPT:207.101","label":"DPT_LockSign"},{"value":"DPT:207.102","label":"DPT_ValueDemBOC"},{"value":"DPT:207.104","label":"DPT_ActPosDemAbs"},{"value":"DPT:207.105","label":"DPT_StatusAct"},{"value":"DPT:209.100","label":"DPT_StatusHPM"},{"value":"DPT:209.101","label":"DPT_TempRoomDemAbs"},{"value":"DPT:209.102","label":"DPT_StatusCPM"},{"value":"DPT:209.103","label":"DPT_StatusWTC"},{"value":"DPT:210.100","label":"DPT_TempFlowWaterDemAbs"},{"value":"DPT:211.100","label":"DPT_EnergyDemWater"},{"v...
[truncated message content] |
|
From: <net...@us...> - 2012-12-26 08:38:14
|
Revision: 1250
http://openautomation.svn.sourceforge.net/openautomation/?rev=1250&view=rev
Author: netzkind
Date: 2012-12-26 08:38:07 +0000 (Wed, 26 Dec 2012)
Log Message:
-----------
widget 'iframe' is now 'web'; xsd is already up to speed.
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/Makefile
CometVisu/trunk/visu/designs/metal/basic.css
CometVisu/trunk/visu/index.html
Added Paths:
-----------
CometVisu/trunk/visu/structure/pure/web.js
Removed Paths:
-------------
CometVisu/trunk/visu/structure/pure/iframe.js
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/ChangeLog 2012-12-26 08:38:07 UTC (rev 1250)
@@ -71,6 +71,7 @@
- lots of little bugfixes and improvements
- Editor: old WYSIWYG-editor was removed due to existing and forseeable compatibility issues
<Changes up to Revision 1243 included>
+- iframe-widget was renamed to web
0.6.2
Modified: CometVisu/trunk/Makefile
===================================================================
--- CometVisu/trunk/Makefile 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/Makefile 2012-12-26 08:38:07 UTC (rev 1250)
@@ -14,7 +14,7 @@
${STRUCTURE_PURE}/_common.js\
${STRUCTURE_PURE}/break.js\
${STRUCTURE_PURE}/group.js\
- ${STRUCTURE_PURE}/iframe.js\
+ ${STRUCTURE_PURE}/web.js\
${STRUCTURE_PURE}/image.js\
${STRUCTURE_PURE}/imagetrigger.js\
${STRUCTURE_PURE}/include.js\
Modified: CometVisu/trunk/visu/designs/metal/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/metal/basic.css 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/designs/metal/basic.css 2012-12-26 08:38:07 UTC (rev 1250)
@@ -111,7 +111,7 @@
background-image: -o-linear-gradient(#444444, #2d2d2d); /* Opera 11.10+ */
background-image: linear-gradient(#444444, #2d2d2d);
}
-.widget.iframe
+.widget.web
{
border: none;
background-image: none;
@@ -624,7 +624,7 @@
div#demo_3 {
background-color: #1d1d1d;
}
-.iframe .actor { width: 98%; }
+.web .actor { width: 98%; }
#navbarTop .navbar .widget_container, #navbarBottom .navbar .widget_container {
width: auto;
Modified: CometVisu/trunk/visu/index.html
===================================================================
--- CometVisu/trunk/visu/index.html 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/index.html 2012-12-26 08:38:07 UTC (rev 1250)
@@ -28,7 +28,7 @@
<script src="structure/pure/break.js" type="text/javascript"></script>
<script src="structure/pure/group.js" type="text/javascript"></script>
<script src="structure/pure/rgb.js" type="text/javascript"></script>
- <script src="structure/pure/iframe.js" type="text/javascript"></script>
+ <script src="structure/pure/web.js" type="text/javascript"></script>
<script src="structure/pure/image.js" type="text/javascript"></script>
<script src="structure/pure/imagetrigger.js" type="text/javascript"></script>
<script src="structure/pure/include.js" type="text/javascript"></script>
Deleted: CometVisu/trunk/visu/structure/pure/iframe.js
===================================================================
--- CometVisu/trunk/visu/structure/pure/iframe.js 2012-12-25 23:52:36 UTC (rev 1249)
+++ CometVisu/trunk/visu/structure/pure/iframe.js 2012-12-26 08:38:07 UTC (rev 1250)
@@ -1,46 +0,0 @@
-/* iframe.js (c) 2012 by Christian Mayer [CometVisu at ChristianMayer dot de]
- *
- * 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 3 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.,
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
- */
-
-basicdesign.addCreator('iframe', {
- create: function( element, path, flavour, type ) {
- var $e = $(element);
- var layout = $e.children('layout')[0];
- var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
- var ret_val = $('<div class="widget iframe" ' + style + '/>');
- ret_val.setWidgetLayout($e);
- if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
- if( flavour ) ret_val.addClass( 'flavour_' + flavour );
- ret_val.append( extractLabel( $e.find('label')[0] ) );
- var iframeStyle = '';
- if( $e.attr('width' ) ) {
- iframeStyle += 'width:' + $e.attr('width' ) + ';';
- } else { // default width is 100% of widget space (fix bug #3175343 part 1)
- iframeStyle += 'width: 100%;';
- }
- if( $e.attr('height') ) iframeStyle += 'height:' + $e.attr('height') + ';';
- if( $e.attr('frameborder') == 'false' ) style += 'border: 0px ;';
- if( $e.attr('background') ) iframeStyle += 'background-color:' + $e.attr('background') + ';';
- if( iframeStyle != '' ) iframeStyle = 'style="' + iframeStyle + '"';
- var actor = '<div class="actor"><iframe src="' +$e.attr('src') + '" ' + iframeStyle + '></iframe></div>';
-
- var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
- ret_val.append( $(actor).data( {
- 'refresh': refresh
- } ).each(setupRefreshAction) ); // abuse "each" to call in context...
- return ret_val;
- }
-});
\ No newline at end of file
Copied: CometVisu/trunk/visu/structure/pure/web.js (from rev 1248, CometVisu/trunk/visu/structure/pure/iframe.js)
===================================================================
--- CometVisu/trunk/visu/structure/pure/web.js (rev 0)
+++ CometVisu/trunk/visu/structure/pure/web.js 2012-12-26 08:38:07 UTC (rev 1250)
@@ -0,0 +1,46 @@
+/* web.js (c) 2012 by Christian Mayer [CometVisu at ChristianMayer dot de]
+ *
+ * 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 3 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.,
+ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ */
+
+basicdesign.addCreator('web', {
+ create: function( element, path, flavour, type ) {
+ var $e = $(element);
+ var layout = $e.children('layout')[0];
+ var style = layout ? 'style="' + extractLayout( layout, type ) + '"' : '';
+ var ret_val = $('<div class="widget web" ' + style + '/>');
+ ret_val.setWidgetLayout($e);
+ if( $e.attr('flavour') ) flavour = $e.attr('flavour');// sub design choice
+ if( flavour ) ret_val.addClass( 'flavour_' + flavour );
+ ret_val.append( extractLabel( $e.find('label')[0] ) );
+ var webStyle = '';
+ if( $e.attr('width' ) ) {
+ webStyle += 'width:' + $e.attr('width' ) + ';';
+ } else { // default width is 100% of widget space (fix bug #3175343 part 1)
+ webStyle += 'width: 100%;';
+ }
+ if( $e.attr('height') ) webStyle += 'height:' + $e.attr('height') + ';';
+ if( $e.attr('frameborder') == 'false' ) style += 'border: 0px ;';
+ if( $e.attr('background') ) webStyle += 'background-color:' + $e.attr('background') + ';';
+ if( webStyle != '' ) webStyle = 'style="' + webStyle + '"';
+ var actor = '<div class="actor"><iframe src="' +$e.attr('src') + '" ' + webStyle + '></iframe></div>';
+
+ var refresh = $e.attr('refresh') ? $e.attr('refresh')*1000 : 0;
+ ret_val.append( $(actor).data( {
+ 'refresh': refresh
+ } ).each(setupRefreshAction) ); // abuse "each" to call in context...
+ return ret_val;
+ }
+});
\ 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: <ha...@us...> - 2013-07-21 19:36:47
|
Revision: 1823
http://sourceforge.net/p/openautomation/code/1823
Author: hausl
Date: 2013-07-21 19:36:44 +0000 (Sun, 21 Jul 2013)
Log Message:
-----------
fix for config files with wrong file encoding.
Modified Paths:
--------------
CometVisu/trunk/AUTHORS
CometVisu/trunk/src/cometvisu.appcache
CometVisu/trunk/src/lib/templateengine.js
Modified: CometVisu/trunk/AUTHORS
===================================================================
--- CometVisu/trunk/AUTHORS 2013-07-21 14:50:24 UTC (rev 1822)
+++ CometVisu/trunk/AUTHORS 2013-07-21 19:36:44 UTC (rev 1823)
@@ -10,4 +10,5 @@
Axel Otterstätter - panzaeron - Mr.O (at) gmx (dot) de
Christian - chris_ace - chris_ace (at) users (dot) sourceforge (dot) net
David - daviid5 - daviid5 (at) users (dot) sourceforge (dot) net
-Tobias Bräutigam - peuter - tbraeutigam (at) gmail (dot) com
\ No newline at end of file
+Tobias Bräutigam - peuter - tbraeutigam (at) gmail (dot) com
+Michael Hausl - hausl - michael (at) hausl (dot) com
Modified: CometVisu/trunk/src/cometvisu.appcache
===================================================================
--- CometVisu/trunk/src/cometvisu.appcache 2013-07-21 14:50:24 UTC (rev 1822)
+++ CometVisu/trunk/src/cometvisu.appcache 2013-07-21 19:36:44 UTC (rev 1823)
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Version SVN:20130716-2039
+# Version SVN:20130721-2135
CACHE:
index.html
Modified: CometVisu/trunk/src/lib/templateengine.js
===================================================================
--- CometVisu/trunk/src/lib/templateengine.js 2013-07-21 14:50:24 UTC (rev 1822)
+++ CometVisu/trunk/src/lib/templateengine.js 2013-07-21 19:36:44 UTC (rev 1823)
@@ -24,20 +24,29 @@
if( templateEngine.visu ) templateEngine.visu.stop();
});
$(document).ready(function() {
+ function configError(textStatus) {
+ var message = 'Config-File Error! ';
+ switch (textStatus) {
+ case 'parsererror':
+ message += '<br />Invalid config file!<br /><a href="check_config.php?config=' + templateEngine.configSuffix + '">Please check!</a>';
+ }
+ $('#loading').html(message);
+ };
// get the data once the page was loaded
$.ajax({
url : 'config/visu_config'+ (templateEngine.configSuffix ? '_' + templateEngine.configSuffix : '') + '.xml',
cache : !templateEngine.forceReload,
- success : templateEngine.parseXML,
- error : function(jqXHR, textStatus, errorThrown) {
- var message = 'Config-File Error! ';
- switch (textStatus) {
- case 'parsererror':
- message += '<br />Invalid config file!<br /><a href="check_config.php?config='
- + templateEngine.configSuffix + '">Please check!</a>';
+ success : function(xml) {
+ if (!xml || !xml.documentElement || xml.getElementsByTagName( "parsererror" ).length) {
+ configError("parsererror");
}
- $('#loading').html(message);
+ else {
+ templateEngine.parseXML(xml);
+ }
},
+ error : function(jqXHR, textStatus, errorThrown) {
+ configError(textStatus);
+ },
dataType : 'xml'
});
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2013-11-17 21:30:30
|
Revision: 2025
http://sourceforge.net/p/openautomation/code/2025
Author: mayerch
Date: 2013-11-17 21:30:27 +0000 (Sun, 17 Nov 2013)
Log Message:
-----------
Last preparations for 0.8.0
Modified Paths:
--------------
CometVisu/trunk/ChangeLog
CometVisu/trunk/INSTALL
CometVisu/trunk/README
Modified: CometVisu/trunk/ChangeLog
===================================================================
--- CometVisu/trunk/ChangeLog 2013-11-15 22:58:27 UTC (rev 2024)
+++ CometVisu/trunk/ChangeLog 2013-11-17 21:30:27 UTC (rev 2025)
@@ -1,3 +1,8 @@
+0.8.0
+=====
+
+Basically the same as the 0.8.0-RC5
+
0.8.0-RC5
=========
Modified: CometVisu/trunk/INSTALL
===================================================================
--- CometVisu/trunk/INSTALL 2013-11-15 22:58:27 UTC (rev 2024)
+++ CometVisu/trunk/INSTALL 2013-11-17 21:30:27 UTC (rev 2025)
@@ -31,4 +31,13 @@
It will give everyone write permissions - so it's probably too permissive
for a shared server, but assuming the typical useage of the WireGate it
- should be fine.
\ No newline at end of file
+ should be fine.
+
+NOTE:
+=====
+
+Please allways also refer the online documentation at
+
+ http://www.cometvisu.org/
+
+as it will contain the latest informations.
\ No newline at end of file
Modified: CometVisu/trunk/README
===================================================================
--- CometVisu/trunk/README 2013-11-15 22:58:27 UTC (rev 2024)
+++ CometVisu/trunk/README 2013-11-17 21:30:27 UTC (rev 2025)
@@ -22,3 +22,16 @@
eibread/write-cgi are part of a modified eibd-clients package here:
http://repo.wiregate.de/wiregate/pool/main/e/
(source: bcusdk)
+
+NOTE:
+=====
+
+Please allways also refer the online documentation at
+
+ http://www.cometvisu.org/
+
+as it will contain the latest informations.
+
+To discuss with the developers you can use the mailing list that is
+provided at the SourceForge project page or use the KNX User Forum
+at http://knx-user-forum.de/cometvisu/ (spoken languages are German and English)
\ 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: <ha...@us...> - 2015-01-04 20:48:10
|
Revision: 2308
http://sourceforge.net/p/openautomation/code/2308
Author: hausl
Date: 2015-01-04 20:48:09 +0000 (Sun, 04 Jan 2015)
Log Message:
-----------
diagram plugin: add attribute "resolution" to rrd definitions to allow custom resolution values
Modified Paths:
--------------
CometVisu/trunk/src/cometvisu.appcache
CometVisu/trunk/src/plugins/diagram/structure_plugin.js
CometVisu/trunk/src/visu_config.xsd
Property Changed:
----------------
CometVisu/trunk/
Index: CometVisu/trunk
===================================================================
--- CometVisu/trunk 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk 2015-01-04 20:48:09 UTC (rev 2308)
Property changes on: CometVisu/trunk
___________________________________________________________________
Modified: svn:ignore
## -1,2 +1,4 ##
release
docs
+
+.project
Modified: CometVisu/trunk/src/cometvisu.appcache
===================================================================
--- CometVisu/trunk/src/cometvisu.appcache 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/cometvisu.appcache 2015-01-04 20:48:09 UTC (rev 2308)
@@ -1,5 +1,5 @@
CACHE MANIFEST
-# Version SVN:20141231-1532
+# Version SVN:20150104-2130
CACHE:
index.html
Modified: CometVisu/trunk/src/plugins/diagram/structure_plugin.js
===================================================================
--- CometVisu/trunk/src/plugins/diagram/structure_plugin.js 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/plugins/diagram/structure_plugin.js 2015-01-04 20:48:09 UTC (rev 2308)
@@ -205,7 +205,8 @@
fill : (this.getAttribute("fill") || "false") == "true",
scaling : parseFloat(this.getAttribute('scaling')) || 1.,
dsIndex : this.getAttribute('datasourceIndex') || 0,
- cFunc : this.getAttribute('consolidationFunction') || "AVERAGE"
+ cFunc : this.getAttribute('consolidationFunction') || "AVERAGE",
+ resol : parseInt(this.getAttribute('resolution')),
};
if (retVal.rrd[retVal.rrdnum].dsIndex < 0) {
retVal.rrd[retVal.rrdnum].dsIndex = 0;
@@ -367,7 +368,7 @@
// get all rrd data
$.each(config.content.rrd, function(index, rrd) {
$.ajax({
- url: templateEngine.visu.urlPrefix+"rrdfetch?rrd=" + rrd.src + ".rrd&ds=" + rrd.cFunc + "&start=" + series.start + "&end=" + series.end + "&res=" + series.res,
+ url: templateEngine.visu.urlPrefix+"rrdfetch?rrd=" + rrd.src + ".rrd&ds=" + rrd.cFunc + "&start=" + series.start + "&end=" + series.end + "&res=" + (rrd.resol ? rrd.resol : series.res),
dataType: "json",
type: "GET",
context: this,
Modified: CometVisu/trunk/src/visu_config.xsd
===================================================================
--- CometVisu/trunk/src/visu_config.xsd 2015-01-03 23:14:21 UTC (rev 2307)
+++ CometVisu/trunk/src/visu_config.xsd 2015-01-04 20:48:09 UTC (rev 2308)
@@ -1268,6 +1268,12 @@
<xsd:documentation xml:lang="de">Auswählen einer der verfügbaren Consolidation Functions des RRDTools (http://rrdtool.org).</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
+ <xsd:attribute name="resolution" type="xsd:integer" use="optional">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">The standard resolution for retrieving data from the RRD file can be overriden with a custom value in seconds.</xsd:documentation>
+ <xsd:documentation xml:lang="de">Die Standard-Auflösung für die Daten aus der RRD-Datei kann überschrieben werden mit einem eigenen Sekunden-Wert.</xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
</xsd:extension>
</xsd:simpleContent>
</xsd:complexType>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X