cpee 2.0.16 → 2.0.17

Sign up to get free protection for your applications and to get access to all the features.
Files changed (27) hide show
  1. checksums.yaml +4 -4
  2. data/cockpit/js/instance.js +4 -3
  3. data/cockpit/themes/compact/rngs/closed_loop.rng +6 -3
  4. data/cockpit/themes/compact/rngs/closed_loop_control.rng +3 -0
  5. data/cockpit/themes/compact/rngs/closed_loop_measuring.rng +3 -0
  6. data/cockpit/themes/default/rngs/closed_loop.rng +6 -3
  7. data/cockpit/themes/default/rngs/closed_loop_control.rng +3 -0
  8. data/cockpit/themes/default/rngs/closed_loop_measuring.rng +3 -0
  9. data/cockpit/themes/diana/rngs/closed_loop.rng +6 -3
  10. data/cockpit/themes/diana/rngs/closed_loop_control.rng +3 -0
  11. data/cockpit/themes/diana/rngs/closed_loop_measuring.rng +3 -0
  12. data/cockpit/themes/extended/rngs/closed_loop.rng +6 -3
  13. data/cockpit/themes/extended/rngs/closed_loop_control.rng +3 -0
  14. data/cockpit/themes/extended/rngs/closed_loop_measuring.rng +3 -0
  15. data/cockpit/themes/model/rngs/call.rng +5 -1
  16. data/cockpit/themes/model/rngs/callmanipulate.rng +5 -1
  17. data/cockpit/themes/packed/rngs/closed_loop.rng +6 -3
  18. data/cockpit/themes/packed/rngs/closed_loop_control.rng +3 -0
  19. data/cockpit/themes/packed/rngs/closed_loop_measuring.rng +3 -0
  20. data/cockpit/themes/preset/rngs/closed_loop.rng +6 -3
  21. data/cockpit/themes/preset/rngs/closed_loop_control.rng +3 -0
  22. data/cockpit/themes/preset/rngs/closed_loop_measuring.rng +3 -0
  23. data/cockpit/themes/preset/theme.js +1 -1
  24. data/cpee.gemspec +1 -1
  25. data/server/handlerwrappers/default.rb +16 -16
  26. data/tools/server/{server.rb → cpee} +0 -0
  27. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: bcc2914034c068617935d34e6fbef9702d4707465e1b5643be0d94ed9a6ff81d
4
- data.tar.gz: 569ac606a86cac5d9cc1026c79362f61125c3938a821ac2dab19263b21cb0291
3
+ metadata.gz: a15f029ff447eb99a7b77d2fc248aa2835f08e9c4af0319446c80b0298d37ef3
4
+ data.tar.gz: 921405e63cb9295060f4e5948bfeb5b3a524816a0bb9a148558443f8c2ffec27
5
5
  SHA512:
6
- metadata.gz: deee6aa33e4038728143d3f120d418327220f741ef2c0bd1fc87b80a7b2e75d430a075605f386b3af7747e2af0852993d24027cd4702a0b679534c2809befd45
7
- data.tar.gz: a5bb1384576ee78ac6074e192bc989fb1166185c95fc1bcaac506ae597db6576ebc68586c8b2614cf282049f7b2701a974079c56d2d5ff1c10d8b4c826a36b17
6
+ metadata.gz: 0e04e6c704be4aaf48a3788256a2d48ee86eeaa60aa144bacfab4ba733039846489c11ab3d58698686e00cc05d716fc9a43b02aefe290dd8f1817cc8f8586a47
7
+ data.tar.gz: c3d153e31a81fc418555988d56deb515ebc63a68c9f5141fb715cc58c1513746f86f178411847e750fa8e69e969094a752679139d0ef21d3dd032c57cb363569
data/cockpit/js/instance.js CHANGED
@@ -837,6 +837,8 @@ function get_testset(deferred) {// {{{
837
837
  $('testset > transformation',testset).remove();
838
838
  $('testset > dsl',testset).remove();
839
839
  $('testset > dslx',testset).remove();
840
+ $('testset > attributes > uuid',testset).remove();
841
+ $('testset > attributes > theme',testset).remove();
840
842
  testset.append($X('<transformation xmlns="http://cpee.org/ns/properties/2.0"><description type="copy"/><dataelements type="none"/><endpoints type="none"/></transformation>'));
841
843
  var name = $('testset > attributes > info',testset).text();
842
844
  $('[xmlns]',testset).each((idx,ele) => {
@@ -887,9 +889,7 @@ function save_svgfile() {// {{{
887
889
  type: "GET",
888
890
  url: url + "/properties/attributes/info/",
889
891
  success: function(res){
890
- var name = $(res.documentElement).text();
891
-
892
- $('#savesvgfile').attr('download',name + '.svg');
892
+ $('#savesvgfile').attr('download',res + '.svg');
893
893
  $('#savesvgfile').attr('href','data:application/xml;charset=utf-8;base64,' + $B64(gc.serializeXML()));
894
894
  document.getElementById('savesvgfile').click();
895
895
  },
@@ -912,6 +912,7 @@ async function set_testset(testset,exec) {// {{{
912
912
  tset.append($("testset > attributes",testset));
913
913
  tset.append($("testset > description",testset));
914
914
  tset.append($("testset > transformation",testset));
915
+ $('testset > attributes > info',tset).remove();
915
916
 
916
917
  promises.push(
917
918
  $.ajax({
data/cockpit/themes/compact/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/compact/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/compact/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/default/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/default/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/default/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/diana/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/diana/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/diana/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/extended/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/extended/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/extended/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/model/rngs/call.rng CHANGED
@@ -8,6 +8,10 @@
8
8
  <value id="sensor">Read From Sensor</value>
9
9
  <value id="human">Human Task</value>
10
10
  <value id="subprocess">Subprocess</value>
11
+ <value id="robot">Robot</value>
12
+ <value id="plc">PLC</value>
13
+ <value id="send">Send Message</value>
14
+ <value id="receive">Receive Message</value>
11
15
  </choice>
12
16
  </attribute>
13
17
  <element name="parameters" rngui:header="Properties">
@@ -59,4 +63,4 @@
59
63
  </element>
60
64
  </element>
61
65
  </element>
62
- </element>
66
+ </element>
data/cockpit/themes/model/rngs/callmanipulate.rng CHANGED
@@ -8,6 +8,10 @@
8
8
  <value id="sensor">Read From Sensor</value>
9
9
  <value id="human">Human Task</value>
10
10
  <value id="subprocess">Subprocess</value>
11
+ <value id="robot">Robot</value>
12
+ <value id="plc">PLC</value>
13
+ <value id="send">Send Message</value>
14
+ <value id="receive">Receive Message</value>
11
15
  </choice>
12
16
  </attribute>
13
17
  <element name="parameters" rngui:header="Properties">
@@ -64,4 +68,4 @@
64
68
  </element>
65
69
  </element>
66
70
  </element>
67
- </element>
71
+ </element>
data/cockpit/themes/packed/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/packed/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/packed/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/preset/rngs/closed_loop.rng CHANGED
@@ -1,7 +1,4 @@
1
1
  <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">
2
- <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
- <data type="float" rngui:label="Hz"/>
4
- </attribute>
5
2
  <attribute name="overrun" rngui:label="Interval duration overrun">
6
3
  <choice>
7
4
  <value>wait</value>
@@ -26,6 +23,9 @@
26
23
  </element>
27
24
  </element>
28
25
  <element rngui:ignore="true" name="closed_loop_measuring">
26
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
27
+ <data type="float" rngui:label="Hz"/>
28
+ </attribute>
29
29
  <element name="_expected" rngui:header="Values Expected to Change">
30
30
  <zeroOrMore rngui:label="Add Value">
31
31
  <element name="value" rngui:label="Value">
@@ -35,6 +35,9 @@
35
35
  </element>
36
36
  </element>
37
37
  <element rngui:ignore="true" name="closed_loop_control">
38
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
39
+ <data type="float" rngui:label="Hz"/>
40
+ </attribute>
38
41
  <element name="_expected" rngui:header="Values Expected to Change">
39
42
  <zeroOrMore rngui:label="Add Value">
40
43
  <element name="change">
data/cockpit/themes/preset/rngs/closed_loop_control.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="change">
data/cockpit/themes/preset/rngs/closed_loop_measuring.rng CHANGED
@@ -1,4 +1,7 @@
1
1
  <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">
2
+ <attribute name="frequency" rngui:label="Interval frequency in Hz" rngui:default="0.1">
3
+ <data type="float" rngui:label="Hz"/>
4
+ </attribute>
2
5
  <element name="_expected" rngui:header="Values Expected to Change">
3
6
  <zeroOrMore rngui:label="Add Value">
4
7
  <element name="value" rngui:label="Value">
data/cockpit/themes/preset/theme.js CHANGED
@@ -217,7 +217,7 @@ function WFAdaptorManifestation(adaptor) {
217
217
  self.adaptor.illustrator.get_elements().removeClass('selected');
218
218
  self.adaptor.illustrator.get_labels().removeClass('selected');
219
219
 
220
- if (e && e.ctrlKey) {
220
+ if (e && (e.ctrlKey || e.metaKey)) {
221
221
  if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
222
222
  var tab = $('#dat_details');
223
223
  tab.empty();
data/cpee.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = "cpee"
3
- s.version = "2.0.16"
3
+ s.version = "2.0.17"
4
4
  s.platform = Gem::Platform::RUBY
5
5
  s.license = "LGPL-3.0"
6
6
  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."
data/server/handlerwrappers/default.rb CHANGED
@@ -109,7 +109,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
109
109
 
110
110
  client = Riddl::Client.new(tendpoint)
111
111
 
112
- @controller.callback(self,callback,:activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position)
112
+ @controller.callback(self,callback,:'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
113
113
  @handler_passthrough = callback
114
114
 
115
115
  status, result, headers = client.request type => params
@@ -120,10 +120,10 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
120
120
  callback([ Riddl::Parameter::Complex.new('error','application/json',StringIO.new(JSON::generate({ 'status' => status, 'error' => c }))) ], headers)
121
121
  else
122
122
  if headers['CPEE_INSTANTIATION']
123
- @controller.notify("task/instantiation", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
123
+ @controller.notify("task/instantiation", :'activity-uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => CPEE::ValueHelper.parse(headers['CPEE_INSTANTIATION']))
124
124
  end
125
125
  if headers['CPEE_EVENT']
126
- @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
126
+ @controller.notify("task/#{headers['CPEE_EVENT'].gsub(/[^\w_-]/,'')}", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint)
127
127
  end
128
128
  if headers['CPEE_CALLBACK'] && headers['CPEE_CALLBACK'] == 'true' && result.any?
129
129
  headers['CPEE_UPDATE'] = true
@@ -142,11 +142,11 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
142
142
  @sensors = parameters.dig(:stream,:sensors)
143
143
  @aggregators = parameters.dig(:stream,:aggregators)
144
144
  @costs = parameters.dig(:stream,:costs)
145
- @controller.notify("activity/calling", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
145
+ @controller.notify("activity/calling", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :passthrough => passthrough, :endpoint => @handler_endpoint, :parameters => parameters)
146
146
  if passthrough.to_s.empty?
147
147
  proto_curl parameters
148
148
  else
149
- @controller.callback(self,passthrough,:activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position)
149
+ @controller.callback(self,passthrough,:'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position)
150
150
  @handler_passthrough = passthrough
151
151
  end
152
152
  end # }}}
@@ -175,33 +175,33 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
175
175
  end # }}}
176
176
 
177
177
  def inform_activity_done # {{{
178
- @controller.notify("activity/done", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
178
+ @controller.notify("activity/done", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
179
179
  end # }}}
180
180
  def inform_activity_manipulate # {{{
181
- @controller.notify("activity/manipulating", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
181
+ @controller.notify("activity/manipulating", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position)
182
182
  end # }}}
183
183
  def inform_activity_failed(err) # {{{
184
184
  puts err.message
185
185
  puts err.backtrace
186
- @controller.notify("activity/failed", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
186
+ @controller.notify("activity/failed", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :message => err.message, :line => err.backtrace[0].match(/(.*?):(\d+):/)[2], :where => err.backtrace[0].match(/(.*?):(\d+):/)[1])
187
187
  end # }}}
188
188
  def inform_manipulate_change(status,changed_dataelements,changed_endpoints,dataelements,endpoints) # {{{
189
189
  unless status.nil?
190
- @controller.notify("status/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
190
+ @controller.notify("status/change", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :id => status.id, :message => status.message)
191
191
  end
192
192
  unless changed_dataelements.nil?
193
- @controller.notify("dataelements/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
193
+ @controller.notify("dataelements/change", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_dataelements, :values => dataelements)
194
194
  end
195
195
  unless changed_endpoints.nil?
196
- @controller.notify("endpoints/change", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
196
+ @controller.notify("endpoints/change", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :label => @label, :activity => @handler_position, :changed => changed_endpoints, :values => endpoints)
197
197
  end
198
198
  end # }}}
199
199
 
200
200
  def vote_sync_after # {{{
201
- @controller.vote("activity/syncing_after", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label)
201
+ @controller.vote("activity/syncing_after", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label)
202
202
  end # }}}
203
203
  def vote_sync_before(parameters=nil) # {{{
204
- @controller.vote("activity/syncing_before", :activity_uuid => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
204
+ @controller.vote("activity/syncing_before", :'activity_uuid' => @handler_activity_uuid, :endpoint => @handler_endpoint, :activity => @handler_position, :label => @label, :parameters => parameters)
205
205
  end # }}}
206
206
 
207
207
  def simplify_result(result)
@@ -260,13 +260,13 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
260
260
  end
261
261
 
262
262
  def callback(result=nil,options={})
263
- @controller.notify("activity/receiving", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
263
+ @controller.notify("activity/receiving", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :received => structurize_result(result), :sensors => @sensors, :aggregators => @aggregators, :costs => @costs)
264
264
  result = simplify_result(result)
265
265
  @handler_returnValue = result
266
266
  @handler_returnOptions = options
267
267
  if options['CPEE_UPDATE']
268
268
  if options['CPEE_UPDATE_STATUS']
269
- @controller.notify("activity/status", :activity_uuid => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
269
+ @controller.notify("activity/status", :'activity_uuid' => @handler_activity_uuid, :label => @label, :activity => @handler_position, :endpoint => @handler_endpoint, :status => options['CPEE_UPDATE_STATUS'])
270
270
  end
271
271
  @handler_continue.continue WEEL::Signal::Again
272
272
  else
@@ -290,7 +290,7 @@ class DefaultHandlerWrapper < WEEL::HandlerWrapperBase
290
290
  pp "#{type} - #{nesting} - #{tid} - #{parent} - #{parameters.inspect}"
291
291
 
292
292
  @controller.vote("simulating/step",
293
- :activity_uuid => @handler_activity_uuid,
293
+ :'activity_uuid' => @handler_activity_uuid,
294
294
  :label => @label,
295
295
  :activity => tid,
296
296
  :endpoint => @handler_endpoint,
data/tools/server/{server.rb → cpee} RENAMED
File without changes
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cpee
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.16
4
+ version: 2.0.17
5
5
  platform: ruby
6
6
  authors:
7
7
  - Juergen eTM Mangler
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: tools
12
12
  cert_chain: []
13
- date: 2020-11-13 00:00:00.000000000 Z
13
+ date: 2020-11-19 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: riddl
@@ -607,9 +607,9 @@ files:
607
607
  - server/server.conf
608
608
  - server/server.rb
609
609
  - tools/cpee
610
+ - tools/server/cpee
610
611
  - tools/server/resources/notifications/logging/subscription.xml
611
612
  - tools/server/resources/properties.init
612
- - tools/server/server.rb
613
613
  homepage: http://cpee.org/
614
614
  licenses:
615
615
  - LGPL-3.0