cpee 2.0.20 → 2.0.25

data/cockpit/themes/{diana → control}/theme.js

@@ -49,6 +49,16 @@ function WFAdaptorManifestation(adaptor) {
     });
     return svgid;
   }; //}}}
+  //{{{ Return the json for all marked tasks
+  this.marked_text = function(){
+    var nodes = [];
+    var markymark = _.uniq(self.marked());
+    $(markymark).each(function(key,svgid){
+      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+      nodes.push($(node).serializePrettyXML());
+    });
+    return JSON.stringify(nodes);
+  }; //}}}
   //{{{ Render the details from rng (right hand side of graph tab)
   this.update_details = function(svgid){
     var tab  = $('#dat_details');
@@ -76,35 +86,46 @@ function WFAdaptorManifestation(adaptor) {
   }; //}}}
 
   function copyOrMove(menu,group,xml_node,mode) { //{{{
-    var markymark = _.uniq(self.marked());
+    var nodes = localStorage.getItem('marked');
+
+    if (typeof(nodes) != "string") { return; }
+
+    nodes = JSON.parse(nodes);
+    $(nodes).each(function(key,str) {
+      nodes[key] = $X(str);;
+    });
+
     var check1 = [];
     var check2 = [];
-    $(markymark).each(function(key,svgid){
-      var node = self.adaptor.description.get_node_by_svg_id(svgid);
+    $(nodes).each(function(key,node){
       check1.push($(node).attr('svg-type'));
     });
     $(group).each(function(key,value){
       check2.push(value.type);
     });
 
-    if (markymark.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
-      var nodes = [];
-      $(markymark).each(function(key,svgid){
-        var node = self.adaptor.description.get_node_by_svg_id(svgid);
-        nodes.unshift(node);
-      });
-
+    if (nodes.length > 0 && _.uniq(check1).length == _.intersection(check1,check2).length) {
+      if (myid == localStorage.getItem('marked_from')) {
+        $(nodes).each(function(key,node){
+          nodes[key] = self.adaptor.description.get_node_by_svg_id($(node).attr('svg-id'));
+        });
+      }
+      nodes.reverse();
       var iconm =  self.resources['arrow'].clone();
       var iconc =  self.resources['arrow'].clone();
       iconm.children('.rfill').addClass('menu');
+      if (myid == localStorage.getItem('marked_from')) {
+        menu.push(
+          {
+            'label': '<em>Move Marked Elements</em>',
+            'function_call': mode,
+            'menu_icon': iconm,
+            'type': undefined,
+            'params': [nodes, xml_node]
+          }
+        );
+      }
       menu.push(
-        {
-          'label': '<em>Move Marked Elements</em>',
-          'function_call': mode,
-          'menu_icon': iconm,
-          'type': undefined,
-          'params': [nodes, xml_node]
-        },
         {
           'label': '<em>Copy Marked Elements</em>',
           'function_call': mode,
@@ -217,16 +238,26 @@ 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();
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').toggleClass('marked');
+        var vt = vtarget.parents('g.element[element-id]');
+            vt.toggleClass('marked');
+        if (vt.hasClass('marked')) {
+          localStorage.setItem('marked',self.marked_text());
+          localStorage.setItem('marked_from',myid);
+        } else {
+          localStorage.removeItem('marked');
+          localStorage.removeItem('marked_from');
+        }
       }
     } else {
       self.adaptor.illustrator.get_elements().removeClass('marked');
+      localStorage.removeItem('marked');
+      localStorage.removeItem('marked_from');
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
@@ -866,7 +897,7 @@ function WFAdaptorManifestation(adaptor) {
       },
       'label': function(node){
         var avg = $('> _probability_avg',$(node).children('_probability')).text();
-        var ret = [ { column: 'Label', value: 'f = ' + $(node).attr('frequency') + ' Hz (' + $(node).attr('overrun') + ')' } ];
+        var ret = [ { column: 'Label', value: $(node).attr('overrun') } ];
         if (avg != '') {
           ret.push({ column: 'Average', value: avg + '%' });
         }
@@ -921,8 +952,17 @@ function WFAdaptorManifestation(adaptor) {
         return false;
       },
       'label': function(node){
-        var vals = $('> value',$(node).children('_expected')).text();
-        var ret = [ { column: 'Label', value: 'measure ' + vals } ];
+        var vals = [];
+        $('> value',$(node).children('_expected')).each((k,v) => {
+          vals.push($(v).text());
+        });
+        var valtext = '';
+        if (vals.length > 0) {
+          valtext = ' (' + vals.join(', ') + ')';
+        } else {
+          valtext = '';
+        }
+        var ret = [ { column: 'Label', value: 'measure: f = ' + $(node).attr('frequency') + ' Hz' + valtext } ];
         return ret;
       },
       'svg': self.adaptor.theme_dir + 'symbols/closed_loop_measuring.svg'
@@ -998,7 +1038,13 @@ function WFAdaptorManifestation(adaptor) {
         $('> change > value',$(node).children('_expected')).each((k,v) => {
           vals.push($(v).text());
         });
-        var ret = [ { column: 'Label', value: 'control ' + vals.join(', ') } ];
+        var valtext = '';
+        if (vals.length > 0) {
+          valtext = ' (' + vals.join(', ') + ')';
+        } else {
+          valtext = '';
+        }
+        var ret = [ { column: 'Label', value: 'control: f = ' + $(node).attr('frequency') + ' Hz' + valtext } ];
         return ret;
       },
       'svg': self.adaptor.theme_dir + 'symbols/closed_loop_control.svg'
@@ -1019,6 +1065,11 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
+        {'label': 'Control',
+         'function_call': func,
+         'menu_icon': self.elements.closed_loop_control.illustrator.svg.clone(),
+         'type': 'closed_loop_control',
+         'params': [self.adaptor.description.elements.closed_loop_control, node]},
         {'label': 'Script',
          'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
@@ -1039,11 +1090,6 @@ function WFAdaptorManifestation(adaptor) {
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Closed Loop',
-         'function_call': func,
-         'menu_icon': self.elements.closed_loop.illustrator.svg.clone(),
-         'type': 'closed_loop',
-         'params': [self.adaptor.description.elements.closed_loop, node]},
         {'label': 'Stop',
          'function_call': func,
          'menu_icon': self.elements.stop.illustrator.svg.clone(),

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

@@ -26,7 +26,8 @@
       </zeroOrMore>
     </element>
     <element name="stream" rngui:header="Data Stream Handling" rngui:fold="closed">
-      <element name="sensors" rngui:header="Sensors" rngui:fold="closed">
+
+      <element name="sensors" rngui:header="Sensor Data Streams" rngui:fold="closed">
         <zeroOrMore rngui:label="Add Sensor">
           <element name="sensor">
             <element name="name" rngui:label="Label">
@@ -35,13 +36,18 @@
             <element name="extractor_url" rngui:label="Extractor Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="extractor_arg" rngui:label="Extractor Argument">
-              <data type="string" rngui:label="Value / Json"/>
+            <element name="extractor_params" rngui:label="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="visualizer_url" rngui:label="Visualizer Url">
               <data type="string" rngui:label="Service Url"/>
             </element>
-            <element name="visualizer_params" rngui:header="Visualizer Arguments">
+            <element name="visualizer_params" rngui:label="Visualizer Arguments">
               <zeroOrMore rngui:label="Create Visualizer Argument Pairs">
                 <element rngui:label="Name">
                   <anyName/>
@@ -52,44 +58,46 @@
           </element>
         </zeroOrMore>
       </element>
-      <element name="aggregators" rngui:header="Aggregators" rngui:fold="closed">
-        <zeroOrMore rngui:label="Add Aggregator">
-          <element name="aggregator">
-            <element name="name" rngui:label="Label">
-              <data type="string" rngui:label="Label"/>
-            </element>
-            <element name="aggregator_url" rngui:label="Aggregator Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="aggregator_arg" rngui:label="Aggregator Argument">
-              <data type="string" rngui:label="Value / Json"/>
-            </element>
-          </element>
-        </zeroOrMore>
-      </element>
-      <element name="costs" rngui:header="Costs" rngui:fold="closed">
-        <zeroOrMore rngui:label="Create Cost Factor">
-          <element name="cost_factor">
+
+      <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="vfunc_url" rngui:label="Violation Function Url">
-              <data type="string" rngui:label="Service Url"/>
-            </element>
-            <element name="vfunc_arg" rngui:label="Violation Function Argument">
-              <data type="string" rngui:label="Service Url"/>
+            <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="vcost" rngui:label="Violation Cost">
-              <data type="string" rngui:label="Value"/>
+            <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 Annotation" rngui:fold="closed">
+    <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>
@@ -97,21 +105,40 @@
   </element>
   <element name="annotations" rngui:header="Annotations">
     <element name="_timing" rngui:header="Timing" rngui:fold="closed">
-      <element name="_timing_wait" rngui:label="&#x3C9; - Wait">
-        <data type="float" rngui:label="[0,1]" rngui:default="0.5"/>
-      </element>
-      <element name="_timing_threshold" rngui:label="&#x3BA; - Threshold">
-        <data type="float" rngui:label="[0,3,n]" rngui:default="3"/>
-      </element>
-      <element name="_timing_min" rngui:label="Min in min">
-        <data type="float" rngui:label="Minutes"/>
-      </element>
-      <element name="_timing_max" rngui:label="Max in min">
-        <data type="float" rngui:label="Minutes"/>
+      <element name="_timing_weight" rngui:label="&#x3C9; - Weight">
+        <data type="float" rngui:label="[0,1]"/>
       </element>
       <element name="_timing_avg" rngui:label="Avg in min">
         <data type="float" rngui:label="Minutes"/>
       </element>
+      <element name="explanations" rngui:header="Explanations">
+        <zeroOrMore rngui:label="Add Explanation">
+          <element name="explanation">
+            <element name="type" rngui:label="Type">
+              <choice>
+                <value>&gt;</value>
+                <value>&lt;</value>
+              </choice>
+            </element>
+            <element name="deviation" rngui:label="Deviation">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="behaviour" rngui:label="Behaviour">
+              <choice>
+                <value>Immediately</value>
+                <value>Wait until next</value>
+                <value>Use grace period value</value>
+              </choice>
+            </element>
+            <element name="grace" rngui:label="Grace Period" rngui:default="0.0">
+              <data type="float" rngui:label="Minutes"/>
+            </element>
+            <element name="text" rngui:label="Explanation">
+              <data type="string" rngui:label="Patterns"/>
+            </element>
+          </element>
+        </zeroOrMore>
+      </element>
     </element>
     <element name="_notes" rngui:header="Notes" rngui:fold="closed">
       <element name="_notes_general" rngui:label="General">
@@ -119,4 +146,29 @@
       </element>
     </element>
   </element>
+  <element name="input" rngui:header="Input Arguments Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Argument">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="output" rngui:header="Output Elements Documentation" rngui:fold="closed">
+    <zeroOrMore rngui:label="Create Element">
+      <element name="item" rngui:label="Description">
+        <attribute name="label" rngui:label="Name">
+          <data type="string"/>
+        </attribute>
+        <text rngui:wrap="true" rngui:label="What does it do?"/>
+      </element>
+    </zeroOrMore>
+  </element>
+  <element name="implementation" rngui:header="Implementation Documentation" rngui:fold="closed">
+    <element name="description" rngui:label="Description">
+      <text rngui:wrap="true" rngui:label="What is supposed to happen?"/>
+    </element>
+  </element>
 </element>