cpee 1.4.30 → 1.4.31

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

@@ -8,4 +8,15 @@
   <attribute name="condition" rngui:label="Condition">
     <data type="string" rngui:label="Condition"/>
   </attribute>
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label='Min times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+    <element name="_probability_max" rngui:label='Max times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+    <element name="_probability_avg" rngui:label='Avg times'>
+      <data type='nonNegativeInteger' rngui:label='Times'/>
+    </element>
+  </element>
 </element>

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

@@ -1 +1,22 @@
-<element rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org"/>
+<element rngui:version="1.2" name="otherwise" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://relaxng.org/ns/structure/1.0" xmlns:rngui="http://rngui.org">
+  <element name="_probability" rngui:mark="true" rngui:header="Execution Probability">
+    <element name="_probability_min" rngui:label='Min in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_max" rngui:label='Max in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+    <element name="_probability_avg" rngui:label='Avg in %'>
+      <data type='integer' rngui:label='Percent 0-100'>
+        <param name="minInclusive">1</param>
+        <param name="maxInclusive">100</param>
+      </data>
+    </element>
+  </element>
+</element>

data/cockpit/themes/default/symbols/alternative.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="standwithout"/>
-  <text transform="translate(15,20)" class="htext cfill normal">{..}</text>
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
 </svg>

data/cockpit/themes/default/symbols/complex.svg

@@ -0,0 +1,8 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
+  <line x1="10.5" y1="20.5" x2="20.5" y2="10.5" class="stand"/>
+  <line x1="10.5" y1="10.5" x2="20.5" y2="20.5" class="stand"/>
+  <line x1="8.5" y1="15.5" x2="22.5" y2="15.5" class="stand"/>
+  <line x1="15.5" y1="8.5" x2="15.5" y2="22.5" class="stand"/>
+</svg>
+

data/cockpit/themes/default/symbols/end.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="standfat"/>
+</svg>

data/cockpit/themes/default/symbols/event_end.svg

@@ -0,0 +1,3 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <circle cx="15" cy="15" r="14" class="rfill hfill cline standfat"/>
+</svg>

data/cockpit/themes/default/symbols/parallel_branch.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="cline hfill stand"/>
-  <text transform="translate(15,20)" class="small">|||</text>
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
 </svg>

data/cockpit/themes/default/symbols/parallel_branch_event.svg

@@ -0,0 +1,14 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="1" y="3" width="24" height="24" rx="4" class="hfill rfill cline stand"/>
+
+  <circle cx="24" cy="15" r="10" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <circle cx="24" cy="15" r="7" class="cline rfill stand" style="stroke-dasharray: 1,3"/>
+  <line x1="24" y1="11" x2="20" y2="18" class="stand"/>
+  <line x1="20" y1="18" x2="28" y2="18" class="stand"/>
+  <line x1="28" y1="18" x2="24" y2="11" class="stand"/>
+
+  <circle cx="55.5" cy="15" r="14" class="cline hfill rfill stand"/>
+  <line x1="55.5" y1="11" x2="51.5" y2="18" class="stand"/>
+  <line x1="51.5" y1="18" x2="59.5" y2="18" class="stand"/>
+  <line x1="59.5" y1="18" x2="55.5" y2="11" class="stand"/>
+</svg>

data/cockpit/themes/default/symbols/parallel_branch_normal.svg

@@ -0,0 +1,5 @@
+<svg class="clickable" xmlns="http://www.w3.org/2000/svg">
+  <rect x="11" y="6" width="9" height="18" rx="0" class="hline white"/>
+  <path class="cline hfill stand" d="M 11,5 C  2,9  2,21 11,25 M 20,5 C 29,9 29,21 20,25" style="stroke-dasharray:1,4;"/>
+  <line x1="15.6" y1="4" x2="15.6" y2="27" class="ourline"/>
+</svg>

data/cockpit/themes/default/theme.js

@@ -8,8 +8,6 @@ function WFAdaptorManifestation(adaptor) {
   this.compact = false;
   this.endpoints = {};
 
-  this.noarrow = ['alternative', 'otherwise'];
-
   //{{{ transform the details data to description parts based on rng
   this.source = function(base,opts) {
     if (base[0].namespaceURI == "http://relaxng.org/ns/structure/1.0") {
@@ -34,11 +32,11 @@ function WFAdaptorManifestation(adaptor) {
       return base;
     }
   }; //}}}
-  //{{{ Return the svgid for the clicked task
-  this.clicked = function(){
+  //{{{ Return the svgid for the selected task
+  this.selected = function(){
     var svgid = 'unknown';
     _.each(self.adaptor.illustrator.get_elements(),function(value,key) {
-      if ($(value).hasClass('clicked')) {
+      if ($(value).hasClass('selected')) {
         svgid = $(value).attr('element-id');
       }
     });
@@ -189,12 +187,15 @@ function WFAdaptorManifestation(adaptor) {
     }
     return false;
   } // }}}
+  this.events.suppress = function(svgid, e, child, sibling) { // {{{
+    return false;
+  } // }}}
   this.events.click = function(svgid, e) { // {{{
     if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
 
-    self.adaptor.illustrator.get_elements().removeClass('clicked');
+    self.adaptor.illustrator.get_elements().removeClass('selected');
 
     if (e && e.ctrlKey) {
       if (save['state'] != "ready" && save['state'] != "stopped") { return false; }
@@ -209,7 +210,7 @@ function WFAdaptorManifestation(adaptor) {
 
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
-        vtarget.parents('g.element[element-id]').addClass('clicked');
+        vtarget.parents('g.element[element-id]').addClass('selected');
       }
 
       self.update_details(svgid);
@@ -237,7 +238,28 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes': 'this',
       'label': function(node){
-        return $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'');
+        var ep = self.endpoints[$(node).attr('endpoint')];
+        var eplen = 1;
+        if (ep != undefined && ep[0] == '[') {
+          try {
+            eplen = JSON.parse(ep).length;
+          } catch(e) {
+            eplen = 1;
+          }
+        } else {
+          eplen = 1;
+        }
+        var avg = $('> _timing_avg',$(node).children('_timing')).text();
+        var lnd = $(node).attr('endpoint');
+        var ret = [ { column: 'Label', value: $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'') } ];
+        if (lnd != '') {
+          ret.push({ column: 'Resource', value: lnd });
+          ret.push({ column: 'R#', value: eplen });
+        }
+        if (avg != '') {
+          ret.push({ column: 'Average', value: avg + 'min' });
+        }
+        return ret;
       },
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'resolve_symbol': function(node) {
@@ -274,9 +296,9 @@ function WFAdaptorManifestation(adaptor) {
       'label': function(node){
         var lab = $(node).attr('label');
         if (lab) {
-          return lab.replace(/^['"]/,'').replace(/['"]$/,'');
+          return [ { column: 'Label', value: lab.replace(/^['"]/,'').replace(/['"]$/,'') } ];
         }  else {
-          return "";
+          return [];
         }
       },
       'svg': self.adaptor.theme_dir + 'symbols/manipulate.svg'
@@ -332,8 +354,81 @@ function WFAdaptorManifestation(adaptor) {
       return [];
     }, //}}}
     'adaptor': {//{{{
-      'mousedown': function (node,e) { self.events.mousedown(node,e,false,true); },
+      'mousedown': function (node,e) { self.events.mousedown(node,e,false,false); },
+    }//}}}
+  }; /*}}}*/
+  this.elements.end = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/end.svg'
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.suppress();
+      }
+    }//}}}
+  }; /*}}}*/
+  this.elements.event_end = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/event_end.svg'
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.suppress();
+      },
       'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.choose_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'exclusive') {
+          return 'choose_exclusive_finish';
+        } else {
+          return 'choose_inclusive_finish';
+        }
+      },
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.mousedown(node,e,true,true);
+      },
+      'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
+    }//}}}
+  }; /*}}}*/
+  this.elements.parallel_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg',
+      'resolve_symbol': function(node) {
+        if($(node).attr('wait') == '-1') {
+          return 'parallel_simple';
+        } else {
+          return 'parallel_complex';
+        }
+      },
+    }, //}}}
+    'adaptor': {//{{{
+      'mousedown': function (node,e) {
+        self.events.mousedown(node,e,true,true);
+      },
+      'click': self.events.click,
+      'dblclick': self.events.dblclick,
+      'mouseover': self.events.mouseover,
+      'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
 
@@ -341,9 +436,10 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.choose = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' },
+      'label': function(node){ return [ { column: 'Label', value: $(node).attr('mode') == 'exclusive' ? 'exclusive' : 'inclusive' } ]; },
       'endnodes': 'aggregate',
       'closeblock': false,
+      'closing_symbol': 'choose_finish',
       'expansion': function(node) {
         return 'horizontal';
       },
@@ -403,8 +499,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.otherwise = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
+      'label': function(node){
+        var avg = $('> _probability_avg',$(node).children('_probability')).text();
+        return (avg == '' ? [] : [ {}, {}, {}, {}, { column: 'Average', value: avg + '%' } ]);
+      },
       'endnodes': 'passthrough',
       'closeblock': false,
+      'noarrow': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -481,8 +582,16 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.alternative = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return $(node).attr('condition')},
+      'label': function(node){
+        var avg = $('> _probability_avg',$(node).children('_probability')).text();
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        if (avg != '') {
+          ret.push({}, {}, {}, {},{ column: 'Average', value: avg + '%' });
+        }
+        return ret;
+      },
       'endnodes': 'passthrough',
+      'noarrow': true,
       'closeblock':false,
       'expansion': function(node) {
         return 'vertical';
@@ -564,7 +673,14 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){return  $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') },
+      'label': function(node){
+        var avg = $('> _probability_avg',$(node).children('_probability')).text();
+        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
+        if (avg != '') {
+          ret.push({ column: 'Average', value: avg + '⨉' });
+        }
+        return ret;
+      },
       'endnodes': 'this',
       'closeblock': true,
       'expansion': function(node) {
@@ -652,9 +768,9 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes': 'this',
+      'endnodes': 'aggregate',
       'closeblock': false,
-      'border': true,
+      'closing_symbol': 'parallel_finish',
       'expansion': function(node) {
         // check if any sibling other than 'parallel_branch' is present
         if($(node).children(':not(parallel_branch)').length > 0) return 'vertical';
@@ -667,49 +783,37 @@ function WFAdaptorManifestation(adaptor) {
     },//}}}
     'description': self.adaptor.theme_dir + 'rngs/parallel.rng',
     'permissible_children': function(node,mode) { //{{{
+      var func = null;
+      if (mode == 'into') { func = self.adaptor.description.insert_first_into }
+      else { func = self.adaptor.description.insert_after }
       var childs =  [
         {'label': 'Service Call with Scripts',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.callmanipulate.illustrator.svg.clone(),
          'type': 'callmanipulate',
          'params': [self.adaptor.description.elements.callmanipulate, node]},
         {'label': 'Service Call',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.call.illustrator.svg.clone(),
          'type': 'call',
          'params': [self.adaptor.description.elements.call, node]},
         {'label': 'Manipulate',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.manipulate.illustrator.svg.clone(),
          'type': 'manipulate',
          'params': [self.adaptor.description.elements.manipulate, node]},
         {'label': 'Decision',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.choose.illustrator.svg.clone(),
          'type': 'choose',
          'params': [self.adaptor.description.elements.choose, node]},
         {'label': 'Loop',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.loop.illustrator.svg.clone(),
          'type': 'loop',
          'params': [self.adaptor.description.elements.loop, node]},
-        {'label': 'Terminate',
-         'function_call': self.adaptor.description.insert_last_into,
-         'menu_icon': self.elements.terminate.illustrator.svg.clone(),
-         'type': 'terminate',
-         'params': [self.adaptor.description.elements.terminate, node]},
-        {'label': 'Stop',
-         'function_call': self.adaptor.description.insert_last_into,
-         'menu_icon': self.elements.stop.illustrator.svg.clone(),
-         'type': 'stop',
-         'params': [self.adaptor.description.elements.stop, node]},
-        {'label': 'Critical',
-         'function_call': self.adaptor.description.insert_last_into,
-         'menu_icon': self.elements.critical.illustrator.svg.clone(),
-         'type': 'critical',
-         'params': [self.adaptor.description.elements.critical, node]},
         {'label': 'Parallel Branch',
-         'function_call': self.adaptor.description.insert_last_into,
+         'function_call': func,
          'menu_icon': self.elements.parallel_branch.illustrator.svg.clone(),
          'type': 'parallel_branch',
          'params': [self.adaptor.description.elements.parallel_branch, node]}
@@ -735,11 +839,19 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.parallel_branch = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'endnodes': 'this',
+      'endnodes': 'passthrough',
       'closeblock': false,
+      'noarrow': true,
       'expansion': function(node) {
         return 'vertical';
       },
+      'resolve_symbol': function(node,shift) {
+        if(shift == true) {
+          return 'parallel_branch_event';
+        } else {
+          return 'parallel_branch_normal';
+        }
+      },
       'col_shift': function(node) {
         if(node.parentNode.tagName == 'choose') return false;
         if($(node).parents('parallel').first().children(':not(parallel_branch)').length > 0) return true;
@@ -811,7 +923,12 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
+        var xml_node = self.adaptor.description.get_node_by_svg_id(node);
+        if(xml_node.get(0).parentNode.tagName == 'parallel') {
+          self.events.mousedown(node,e,true,false);
+        } else {
+          self.events.mousedown(node,e,true,true);
+        }
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -933,9 +1050,11 @@ function WFAdaptorManifestation(adaptor) {
     'illustrator': {//{{{
       'endnodes': 'passthrough',
       'closeblock': false,
+      'balance': true,
       'expansion': function(node) {
         return 'vertical';
       },
+      'closing_symbol': 'end',
       'col_shift': function(node) {
         return true;
       },
@@ -1009,31 +1128,67 @@ function WFAdaptorManifestation(adaptor) {
   // * they may only have an illustrator (or other parts)
   // * they HAVE TO have a parent
   this.elements.callmanipulate = { /*{{{*/
-    'type': 'abstract',
     'parent': 'call',
     'description': self.adaptor.theme_dir + 'rngs/callmanipulate.rng',
     'illustrator': {//{{{
-      'label': function(node){return $('> label',$(node).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,'')},
       'info': function(node){ return { 'element-endpoint': $(node).attr('endpoint') }; },
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
-    'type': 'abstract',
     'parent': 'choose',
     'illustrator': {//{{{
       'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg'
-    },//}}}
+    }//}}}
   };  /*}}}*/
   this.elements.choose_exclusive = { /*{{{*/
-    'type': 'abstract',
     'parent': 'choose',
     'illustrator': {//{{{
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.choose_inclusive_finish = { /*{{{*/
+    'parent': 'choose_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/choose_inclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.choose_exclusive_finish = { /*{{{*/
+    'parent': 'choose_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.parallel_simple = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_complex = { /*{{{*/
+    'parent': 'parallel_finish',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/complex.svg'
+    },//}}}
+  };  /*}}}*/
+  this.elements.parallel_branch_normal = { /*{{{*/
+    'parent': 'parallel_branch',
+    'illustrator': {//{{{
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_normal.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.parallel_branch_event = { /*{{{*/
+    'parent': 'parallel_branch',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'noarrow': false,
+      'border': true,
+      'wide': true,
+      'closing_symbol': 'event_end',
+      'svg': self.adaptor.theme_dir + 'symbols/parallel_branch_event.svg'
+    }//}}}
+  };  /*}}}*/
   this.elements.scripts = { /*{{{*/
-    'type': 'abstract',
     'description': [self.adaptor.theme_dir + 'rngs/update.rng',self.adaptor.theme_dir + 'rngs/finalize.rng']
   }; /*}}}*/
 }