cpee 2.0.15 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e90f25cd35d31ccd0b61aad184473dffa96f6a2e0fa7c986ce533c1d1338f9d3
-  data.tar.gz: 432f503b20812d156b31130a93fcddd3feedecc712c2590abc403a119d2554a2
+  metadata.gz: 4c2b0fc3e70d0f49877aea179e123e807cadfa5af37040267519e5a0ff1ec1e4
+  data.tar.gz: 82f1906f306514d813d0a0f91945dd641152aaec603035eaeecec6955e46f343
 SHA512:
-  metadata.gz: 3ff0adbb47bf043234b024f63b78209655d6676be80f9f0407e6f7e44e722ef680910a7286a792ec81d663c378208b409238f2c684b02c8152d9bf6c68f81cf9
-  data.tar.gz: 5d1dd6bc94d93a6c41aa3c355e6eb812f6004e3f8f978610210266b24d13ec805b130d37f4f119faa45e64e4d581f7f5b27a02560163a62af3fcd76eaf1c7063
+  metadata.gz: fcffe281651210b16ef430eecdad77f92e0ac4406672bd555c8fb08e206e218eb496473cb1e1046eb0c643bceaf7cc6172b82a3fa65413f95eaab7ef5218f69e
+  data.tar.gz: 7b0aa6519e115d11727427446bcacdb2a6dab4400a62eb323527ce89f4310cdde342ef23f30ec95601c92bfccd22284cb20b34ee3916d07e96fdf85c5908f387

data/cockpit/css/wfadaptor.css

@@ -346,6 +346,23 @@ svg text.label {
   font-family:Arial;
 }
 
+svg text.smaller {
+  font-size:12px;
+  font-style:normal;
+  font-variant:normal;
+  font-weight:bold;
+  font-stretch:normal;
+  text-align:center;
+  line-height:125%;
+  writing-mode:horizontal-tb;
+  text-anchor:middle;
+  color: var(--wfadaptor-base);
+  fill: var(--wfadaptor-base);
+  fill-opacity:1;
+  stroke:none;
+  font-family:Arial;
+}
+
 #arrow {
   stroke: var(--wfadaptor-base);
   stroke-width: 2;

data/cockpit/js/instance.js

@@ -442,6 +442,9 @@ function monitor_instance_values(val) {// {{{
         var text = $(" > attributes > info",res).text() + " (" + url.replace(/\/$/,'').split(/[\\/]/).pop() + ")";
         $('#title').text(text);
         document.title = text;
+        if ($('body').attr('current-save')) {
+          $('body').attr('current-save-dir',$(" > attributes > design_dir",res).text());
+        }
         if ($('body').attr('current-logs')) {
           var uuid = $(" > attributes > uuid",res).text();
           $("#current-log").show();
@@ -834,6 +837,7 @@ function get_testset(deferred) {// {{{
       $('testset > transformation',testset).remove();
       $('testset > dsl',testset).remove();
       $('testset > dslx',testset).remove();
+      $('testset > attributes > uuid',testset).remove();
       testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
       var name =  $('testset > attributes > info',testset).text();
       $('[xmlns]',testset).each((idx,ele) => {
@@ -884,9 +888,7 @@ function save_svgfile() {// {{{
         type: "GET",
         url: url + "/properties/attributes/info/",
         success: function(res){
-          var name = $(res.documentElement).text();
-
-          $('#savesvgfile').attr('download',name + '.svg');
+          $('#savesvgfile').attr('download',res + '.svg');
           $('#savesvgfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
           document.getElementById('savesvgfile').click();
         },
@@ -909,6 +911,7 @@ async function set_testset(testset,exec) {// {{{
   tset.append($("testset > attributes",testset));
   tset.append($("testset > description",testset));
   tset.append($("testset > transformation",testset));
+  $('testset > attributes > info',tset).remove();
 
   promises.push(
     $.ajax({

data/cockpit/js/model.js

@@ -22,7 +22,7 @@ $(document).ready(function() {
     var def = new $.Deferred();
     def.done(function(name,testset) {
       $.ajax({
-        url: $('body').attr('current-save') + name + '.xml',
+        url: $('body').attr('current-save') + ($('body').attr('current-save-dir') ? ($('body').attr('current-save-dir') + '/').replace(/\/+/,'/') : '') + name + '.xml',
         type: 'PUT',
         contentType: 'application/xml',
         data: testset.serializePrettyXML(),

data/cockpit/templates/UR-VUE 2020.xml

@@ -1,4 +1,4 @@
-<testset>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
   <handlerwrapper>DefaultHandlerWrapper</handlerwrapper>
   <handlers>
     <handler url="http://tango.wst.univie.ac.at:9332">
@@ -18,7 +18,7 @@
     <grip_and_place>http-put://ryloth.wst.univie.ac.at:9329/move/grip_and_place</grip_and_place>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>
     <wait>http://gruppe.wst.univie.ac.at/~mangler/services/timeout.php</wait>
-    <adjust>http://cpee.org/~demo/cpee-cockpit/templates/UR-VUE%202020%20Manual%20Adjust.xml</adjust>
+    <adjust>https://cpee.org/flow/templates/UR-VUE%202020%20Manual%20Adjust.xml</adjust>
   </endpoints>
   <attributes>
     <resource>ur51</resource>

data/cockpit/themes/compact/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/compact/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/compact/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/default/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/default/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/default/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/diana/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/diana/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/diana/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/extended/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/extended/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/extended/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/model/rngs/call.rng

@@ -8,6 +8,11 @@
       <value id="sensor">Read From Sensor</value>
       <value id="human">Human Task</value>
       <value id="subprocess">Subprocess</value>
+      <value id="robot">Robot Task</value>
+      <value id="robot_subprocess">Robot Subprocess</value>
+      <value id="plc">PLC</value>
+      <value id="send">Send Message</value>
+      <value id="receive">Receive Message</value>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">
@@ -59,4 +64,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/model/rngs/callmanipulate.rng

@@ -8,6 +8,11 @@
       <value id="sensor">Read From Sensor</value>
       <value id="human">Human Task</value>
       <value id="subprocess">Subprocess</value>
+      <value id="robot">Robot Task</value>
+      <value id="robot_subprocess">Robot Subprocess</value>
+      <value id="plc">PLC</value>
+      <value id="send">Send Message</value>
+      <value id="receive">Receive Message</value>
     </choice>
   </attribute>
   <element name="parameters" rngui:header="Properties">
@@ -64,4 +69,4 @@
       </element>
     </element>
   </element>
-</element>
+</element>

data/cockpit/themes/model/theme.js

@@ -241,7 +241,7 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var ret;
         if ($('> url',$(node).children('parameters').children('arguments')).length > 0) {
-          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="blank_" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
+          ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') + ' <a target="_blank" href="' + $('> url',$(node).children('parameters').children('arguments')).text() + '"></a>' } ];
         } else {
           ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }

data/cockpit/themes/packed/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/packed/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/packed/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/preset/rngs/closed_loop.rng

@@ -1,7 +1,4 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" name="closed_loop" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://cpee.org/ns/description/1.0">
-  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
-    <data type="float" rngui:label="Hz"/>
-  </attribute>
   <attribute name="overrun" rngui:label="Interval duration overrun">
     <choice>
       <value>wait</value>
@@ -26,6 +23,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_measuring">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
     </element>
   </element>
   <element rngui:ignore="true" name="closed_loop_control">
+    <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+      <data type="float" rngui:label="Hz"/>
+    </attribute>
     <element name="_expected" rngui:header="Values Expected to Change">
       <zeroOrMore rngui:label="Add Value">
         <element name="change">

data/cockpit/themes/preset/rngs/closed_loop_control.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_control" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="change">

data/cockpit/themes/preset/rngs/closed_loop_measuring.rng

@@ -1,4 +1,7 @@
 <element xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org" rngui:version="1.2" ns="http://cpee.org/ns/description/1.0" name="closed_loop_measuring" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
+    <data type="float" rngui:label="Hz"/>
+  </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">

data/cockpit/themes/preset/theme.js

@@ -217,7 +217,7 @@ function WFAdaptorManifestation(adaptor) {
     self.adaptor.illustrator.get_elements().removeClass('selected');
     self.adaptor.illustrator.get_labels().removeClass('selected');
 
-    if (e && e.ctrlKey) {
+    if (e && (e.ctrlKey || e.metaKey)) {
       if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
       var tab = $('#dat_details');
           tab.empty();

data/cpee.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.0.15"
+  s.version          = "2.0.20"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."
 
   s.description      = "see http://cpee.org"
 
-  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
+  s.files            = Dir['{example/**/*,server/**/*,tools/**/*,tools/archive,lib/**/*,cockpit/**/*,cockpit/themes/*/*/*,contrib/logo*,contrib/Screen*}'] - Dir['{server/instances/**/*,cockpit/js_libs/**/*,server/redis*}'] + %w(COPYING FEATURES.md INSTALL.md Rakefile cpee.gemspec README.md AUTHORS)
   s.require_path     = 'lib'
   s.extra_rdoc_files = ['README.md']
   s.bindir           = 'tools'