cpee 2.1.29 → 2.1.50

data/cockpit/themes/model/symbols/start_event.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="cline stand"/>
+  <rect x="7" y="10" width="16" height="11" class="black" style="fill: none"/>
+  <path d="m 7,10 8,6 8,-6" class="black" style="fill: none"/>
+</svg>

data/cockpit/themes/model/symbols/test.svg

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   class="clickable"
+   version="1.1"
+   id="svg10"
+   sodipodi:docname="test.svg"
+   inkscape:version="1.0.2 (e86c870879, 2021-01-15)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2062"
+     inkscape:window-height="1298"
+     id="namedview12"
+     showgrid="false"
+     inkscape:zoom="35.146667"
+     inkscape:cx="13.036699"
+     inkscape:cy="13.350011"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg10" />
+  <rect
+     transform="rotate(45,14,12)"
+     x="7"
+     y="3"
+     width="21"
+     height="21"
+     class="cline hfill stand"
+     id="rect2"
+     style="fill:#3465a4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle4" />
+  <circle
+     cx="15.5"
+     cy="15.5"
+     r="7"
+     class="stand"
+     id="circle6" />
+  <path
+     d="m 15.500001,11.435193 3.825246,2.779205 -1.461114,4.496849 h -4.728265 l -1.461115,-4.496849 z"
+     class="stand"
+     id="path8"
+     style="fill:#ef2929;stroke-width:1" />
+</svg>

data/cockpit/themes/model/theme.js

@@ -93,7 +93,7 @@ function WFAdaptorManifestation(adaptor) {
 
     nodes = JSON.parse(nodes);
     $(nodes).each(function(key,str) {
-      nodes[key] = $X(str);;
+      nodes[key] = $X(str);
     });
 
     var check1 = [];
@@ -176,14 +176,44 @@ function WFAdaptorManifestation(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon =  self.elements[xml_node.get(0).tagName].illustrator.svg.clone();
-      icon.children('.rfill').addClass('menu');
+      icon.find('.rfill').addClass('menu');
+      icon.find('.hfill').addClass('menu');
       menu['Delete'] = [{
         'label': 'Remove Element',
-        'function_call': function(selector,target,selected){ self.adaptor.description.remove(selector,target); self.adaptor.illustrator.get_label_by_svg_id(selected).addClass('selected'); },
+        'function_call': function(selector,target,selected){
+          del_ui_pos(target)
+          self.adaptor.description.remove(selector,target);
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        },
         'menu_icon': icon,
         'type': undefined,
         'params': [null, xml_node, self.selected()]
       }];
+      var nodes = localStorage.getItem('marked');
+      nodes = JSON.parse(nodes);
+      if (nodes && nodes.length > 0) {
+        var icond =  self.resources['delete'].clone();
+        icond.children('.standfat').addClass('menu');
+        menu['Delete'].push({
+          'label': 'Remove Marked Elements',
+          'function_call': function(){
+            $(nodes).each(function(key,str) {
+              nodes[key] = $X(str);
+            });
+            $(nodes).each(function(key,node){
+              var target = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+              del_ui_pos(target)
+              self.adaptor.description.remove(null,target);
+              localStorage.removeItem('marked');
+              localStorage.removeItem('marked_from');
+            });
+          },
+          'menu_icon': icond,
+          'type': undefined,
+          'params': []
+        })
+      }
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon =  self.elements.callmanipulate.illustrator.svg.clone();
@@ -199,6 +229,18 @@ function WFAdaptorManifestation(adaptor) {
     new CustomMenu(e).contextmenu(menu);
   } //}}}
 
+  function positionHandling(svgid) {
+    var xml_node = self.adaptor.description.get_node_by_svg_id(svgid);
+    var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
+    if (vtarget.length > 0) {
+      if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
+        del_ui_pos(xml_node);
+      } else {
+        add_ui_pos(xml_node);
+      }
+    }
+  }
+
   // Events
   this.events.touchend = function(svgid, e) { // {{{
     clearTimeout(self.presstimer);
@@ -210,6 +252,7 @@ function WFAdaptorManifestation(adaptor) {
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
     if(e.button == 0) {  // left-click
     } else if(e.button == 1) { // middle-click
+      positionHandling(svgid);
     } else if(e.button == 2) { // right-click
       contextMenuHandling(svgid,e,child,sibling);
     }
@@ -242,6 +285,8 @@ function WFAdaptorManifestation(adaptor) {
           localStorage.removeItem('marked_from');
         }
       }
+    } else if (e && (e.shiftKey)) {
+      positionHandling(svgid);
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');
@@ -275,6 +320,7 @@ function WFAdaptorManifestation(adaptor) {
 
   // other resources
   this.resources.arrow =  self.adaptor.theme_dir + 'symbols/arrow.svg';
+  this.resources.delete =  self.adaptor.theme_dir + 'symbols/delete.svg';
 
   // Primitive Elements
   this.elements.call = { /*{{{*/
@@ -292,7 +338,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
-        if($('code', node).length > 0) {
+        if($('> code', node).length > 0) {
           return 'callmanipulate';
         } else {
           return 'call';

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

@@ -27,6 +27,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>
@@ -34,92 +42,6 @@
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
-      <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
-
-        <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
-          <zeroOrMore rngui:label="Add Probe">
-            <element name="probe">
-              <element name="name" rngui:label="Label">
-                <data type="string" rngui:label="Label"/>
-              </element>
-              <element name="extractor_type" rngui:label="Extractor Type">
-                <choice>
-                  <value id='code'>Code</value>
-                  <value id='service'>Service</value>
-                </choice>
-              </element>
-              <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
-                <text rngui:label="Code"/>
-              </element>
-              <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
-                <data type="string" rngui:label="Service Url"/>
-              </element>
-              <element name="extractor_params" rngui:label="Extractor Service Arguments:">
-                <zeroOrMore rngui:label="Create Argument Pairs">
-                  <element rngui:label="Name">
-                    <anyName/>
-                    <data type="string" rngui:label="Value / Json"/>
-                  </element>
-                </zeroOrMore>
-              </element>
-              <element name="visualizer_url" rngui:label="Visualizer Url">
-                <data type="string" rngui:label="Service Url"/>
-              </element>
-              <element name="visualizer_params" rngui:label="Visualizer Arguments">
-                <zeroOrMore rngui:label="Create Argument Pairs">
-                  <element rngui:label="Name">
-                    <anyName/>
-                    <data type="string" rngui:label="Value / Json"/>
-                  </element>
-                </zeroOrMore>
-              </element>
-            </element>
-          </zeroOrMore>
-        </element>
-
-        <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
-          <zeroOrMore rngui:label="Add Impact Profile">
-            <element name="ip">
-              <element name="name" rngui:label="Label">
-                <data type="string" rngui:label="Label"/>
-              </element>
-              <element name="target" rngui:label="Target Value">
-                <data type="string" rngui:label="Value"/>
-              </element>
-              <element name="ifs" rngui:header="Impact Factors">
-                <zeroOrMore rngui:label="Add Impact Factor">
-                  <element name="if">
-                    <element name="ivs" rngui:header="Impact Values">
-                      <zeroOrMore rngui:label="Add Impact Value ">
-                        <element name="iv">
-                          <element name="extractor_url" rngui:label="Extractor Url">
-                            <data type="string" rngui:label="Service Url + Parameters"/>
-                          </element>
-                          <element name="aggregator_url" rngui:label="Aggregator Url">
-                            <data type="string" rngui:label="Service Url + Parameters"/>
-                          </element>
-                        </element>
-                      </zeroOrMore>
-                    </element>
-                    <element name="aggregator_url" rngui:label="Impact Function Url">
-                      <data type="string" rngui:label="Service Url + Parameters"/>
-                    </element>
-                  </element>
-                </zeroOrMore>
-              </element>
-              <element name="vfunc_url" rngui:label="Violation Function Url">
-                <data type="string" rngui:label="Service Url + Parameters"/>
-              </element>
-            </element>
-          </zeroOrMore>
-        </element>
-
-      </element>
-      <element name="report" rngui:header="Reporting" rngui:fold="closed">
-        <element name="url" rngui:label='HTML Snippet'>
-          <data type="string" rngui:label="url to report snippet"/>
-        </element>
-      </element>
       <element name="explanations" rngui:header="Explanations">
         <zeroOrMore rngui:label="Add Explanation">
           <element name="explanation">
@@ -149,12 +71,131 @@
         </zeroOrMore>
       </element>
     </element>
+    <element name="_shifting" rngui:header="Log Time Shifting" rngui:fold="closed_conditional">
+      <element name="_shifting_type" rngui:label="Type">
+        <choice>
+          <value>Duration</value>
+          <value>Ends</value>
+        </choice>
+      </element>
+      <optional>
+        <element name="_shifting_expression" rngui:label="Expression">
+          <data type="string" rngui:label="e.g.: same day, 16:00; 2 and a half weeks"/>
+        </element>
+      </optional>
+    </element>
+    <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
+        <zeroOrMore rngui:label="Add Probe">
+          <element name="probe">
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
+            </element>
+            <element name="extractor_type" rngui:label="Extractor Type">
+              <choice>
+                <value id='intrinsic'>Intrinsic</value>
+                <value id='extrinsic'>Extrinsic</value>
+                <value id='separate'>Separate</value>
+              </choice>
+            </element>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
+              <text rngui:label="Code"/>
+            </element>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="extractor_params" rngui:label="Extractor Service Arguments:">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="visualizer_url" rngui:label="Visualizer Url">
+              <data type="string" rngui:label="Service Url"/>
+            </element>
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
+              <zeroOrMore rngui:label="Create Argument Pairs">
+                <element rngui:label="Name">
+                  <anyName/>
+                  <data type="string" rngui:label="Value / Json"/>
+                </element>
+              </zeroOrMore>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+      <element name="ips" rngui:header="Impact Profiles" rngui:fold="closed">
+        <zeroOrMore rngui:label="Add Impact Profile">
+          <element name="ip">
+            <element name="name" rngui:label="Label">
+              <data type="string" rngui:label="Label"/>
+            </element>
+            <element name="target" rngui:label="Target Value">
+              <data type="string" rngui:label="Value"/>
+            </element>
+            <element name="ifs" rngui:header="Impact Factors">
+              <zeroOrMore rngui:label="Add Impact Factor">
+                <element name="if">
+                  <element name="ivs" rngui:header="Impact Values">
+                    <zeroOrMore rngui:label="Add Impact Value ">
+                      <element name="iv">
+                        <element name="extractor_url" rngui:label="Extractor Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="extractor_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Extractor Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                        <element name="aggregator_url" rngui:label="Aggregator Url">
+                          <data type="string" rngui:label="Service Url + Parameters"/>
+                        </element>
+                        <element name="aggregator_params" rngui:header="Extractor Arguments">
+                          <zeroOrMore rngui:label="Create Aggregator Argument Pairs">
+                            <element rngui:label="Name">
+                              <anyName/>
+                              <data type="string" rngui:label="Value / Json"/>
+                            </element>
+                          </zeroOrMore>
+                        </element>
+                      </element>
+                    </zeroOrMore>
+                  </element>
+                  <element name="aggregator_url" rngui:label="Impact Function Url">
+                    <data type="string" rngui:label="Service Url + Parameters"/>
+                  </element>
+                </element>
+              </zeroOrMore>
+            </element>
+            <element name="vfunc_url" rngui:label="Violation Function Url">
+              <data type="string" rngui:label="Service Url + Parameters"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
+
+    </element>
+    <element name="report" rngui:header="Reporting" rngui:fold="closed">
+      <element name="url" rngui:label='HTML Snippet'>
+        <data type="string" rngui:label="url to report snippet"/>
+      </element>
+    </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">
         <text rngui:wrap="true" rngui:label="Notes"/>
       </element>
     </element>
   </element>
+
   <element name="documentation" rngui:header="Documentation">
     <element name="input" rngui:header="Input Arguments" rngui:fold="closed">
       <zeroOrMore rngui:label="Create Argument">

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

@@ -50,6 +50,14 @@
     </element>
   </element>
   <element name="annotations" rngui:header="Annotations">
+    <element name="_generic" rngui:header="Generic" rngui:fold="closed">
+      <zeroOrMore rngui:label="Create Annotation Pair">
+        <element rngui:label="Name" rngui:labeltype="xml">
+          <anyName/>
+          <data type="string" rngui:label="Value"/>
+        </element>
+      </zeroOrMore>
+    </element>
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
       <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
         <data type="float" rngui:label="[0,1]"/>
@@ -86,24 +94,41 @@
         </zeroOrMore>
       </element>
     </element>
+    <element name="_shifting" rngui:header="Log Time Shifting" rngui:fold="closed_conditional">
+      <element name="_shifting_type" rngui:label="Type">
+        <choice>
+          <value>Duration</value>
+          <value>Ends</value>
+        </choice>
+      </element>
+      <optional>
+        <element name="_shifting_expression" rngui:label="Expression">
+          <data type="string" rngui:label="e.g.: same day, 16:00; 2 and a half weeks"/>
+        </element>
+      </optional>
+    </element>
     <element name="_context_data_analysis" rngui:header="Context Data Analysis" rngui:hint="All data returned from the endpoint implementing this task as well as arbitray external data streams can be consumed and transformed in data probes. All probes can be the basis for impact factors. Please go to start to define instance data probes.">
 
-      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed">
+      <element name="probes" rngui:header="Data Probes - Context Data Extraction" rngui:fold="closed_conditional">
         <zeroOrMore rngui:label="Add Probe">
           <element name="probe">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
+            <element name="id" rngui:label="ID">
+              <data type="string" rngui:label="ID"/>
+            </element>
+            <element name="source" rngui:label="Source">
+              <data type="string" rngui:label="Where does the sensor value come from?"/>
             </element>
             <element name="extractor_type" rngui:label="Extractor Type">
               <choice>
-                <value id='code'>Code</value>
-                <value id='service'>Service</value>
+                <value id='intrinsic'>Intrinsic</value>
+                <value id='extrinsic'>Extrinsic</value>
+                <value id='separate'>Separate</value>
               </choice>
             </element>
-            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For extrinsic data'>
+            <element name="extractor_code" rngui:label="Extractor Code" rngui:hint='For intrinsic &amp; extrinsic data'>
               <text rngui:label="Code"/>
             </element>
-            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For extrinsic &amp; discrete data'>
+            <element name="extractor_url" rngui:label="Extractor Service" rngui:hint='For separate data'>
               <data type="string" rngui:label="Service Url"/>
             </element>
             <element name="extractor_params" rngui:label="Extractor Service Arguments:">

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

@@ -1,6 +1,6 @@
 <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 name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
   <element name="_expected" rngui:header="Values Expected to Change">
     <zeroOrMore rngui:label="Add Value">

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

@@ -1,8 +1,8 @@
 <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 name="ctime" rngui:label="Cycle time in ms" rngui:default="100">
+    <data type="integer" rngui:label="ms"/>
   </attribute>
-  <element name="_expected" rngui:header="Values Expected to Change">
+  <element name="_expected" rngui:header="Measured Values">
     <zeroOrMore rngui:label="Add Value">
       <element name="value" rngui:label="Value">
         <data type="string" rngui:label="a dataelement"/>