cpee 1.5.9 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '049a6bd1e8e2156d652d5cb56365329878a3821d38a95df6ba97d641207ff7f4'
-  data.tar.gz: df295a2647654302459bf5cd91aa543fa7cb3878d506b80defedfef9f83528b8
+  metadata.gz: 60c62160d5a81af31291d43be2b7a15d7ec82280fbaf8100b2e7f6d1c9444acb
+  data.tar.gz: 5c2ec7a78293aaeabd1d6b0a450ad8205c4e31e9dac2799a36020b1b4a04525d
 SHA512:
-  metadata.gz: c8cfcebb9bda6504bc52c9d26a706116ce8da13900ca04e82c7f51d6ec3fe8077fad22d55a9a2e1b8bb11a17e837bb9c475e44890f93649a6c58d1a4fa1554f2
-  data.tar.gz: b4b0bcd58beaaafe5747103948514d9df0bb321d5e635714324cb4d3daab5c82c09ba1b2583a67ca7828c6bc91511f21f3d08a2954640b777f0b48d9e79ca012
+  metadata.gz: 6795bea238d2fb417ce780ce8335eee886019b1e712fed7a2bdded535822a9b9648bb941a6a44a0d5ee188da10fc0aed1ec01661b23b83cbc9846537686f2855
+  data.tar.gz: f983dddac9dfbd8a3150e594958202a67910f7532a70ee5b27a67ec5c565e5dd3d9ef8a56320d7fe91216f8158c1ee5491582a7d64130798eb90eaaef19c7261

data/cockpit/js/wfadaptor.js

@@ -603,7 +603,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
 
       var g;
       set_details(tname,sname,pos,context);
-      [g, endnodes] = draw_position(tname,pos,prev,block,group,endnodes,context);
+
+      var origpos = jQuery.extend(true, {}, pos);
+      [g, endnodes] = draw_position(tname,origpos,prev,block,group,endnodes,context);
 
       // Prepare next iteration {{{
       if(root_expansion == 'vertical') { prev = jQuery.extend(true, {}, endnodes); pos.row = block.max.row;} // covers e.g. input's for alternative, parallel_branch, ... everything with horizontal expansion
@@ -613,6 +615,8 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       // }}}
 
       if (illustrator.elements[sname].closing_symbol) {
+        var ctname = illustrator.elements[sname].closing_symbol;
+        var csname = sym_name(ctname,context);
         pos.row++;
         max.row++;
         block.max.row = pos.row;
@@ -622,11 +626,12 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
             max.col++;
             block.max.col = pos.col;
           }
-          draw_position(illustrator.elements[sname].closing_symbol,pos,block.endnodes,block,group,[],context,g);
+          draw_position(ctname,pos,block.endnodes,block,group,[],context,{svg: g, pos: origpos});
           pos.col--;
         } else {
-          [undefined, endnodes] = draw_position(illustrator.elements[sname].closing_symbol,pos,prev,block,group,[],context,g);
+          [undefined, endnodes] = draw_position(ctname,pos,prev,block,group,[],context,{svg: g, pos: origpos});
         }
+        set_details(ctname,csname,pos,context,true);
         prev = jQuery.extend(true, {}, endnodes);
       }
     });
@@ -637,12 +642,10 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       max.col = parent_pos.col;
     }
 
-    if((illustrator.elements[root.tagName].endnodes == 'this' || illustrator.elements[sname].endnodes == 'this') && illustrator.elements[root.tagName].closeblock == false) {endnodes = prev;} // closeblock == false, allows loop to close himself
-
     if(root.tagName == 'description' && illustrator.elements[root.tagName].closing_symbol) {
       pos.row++;
       max.row = pos.row;
-      draw_position(illustrator.elements['start'].closing_symbol,pos,prev,block,group,[],this,group);
+      draw_position(illustrator.elements['start'].closing_symbol,pos,prev,block,group,[],this,{svg: group, pos: pos});
     }
 
     return {'endnodes': endnodes, 'max':max, 'svg':group};
@@ -655,12 +658,14 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     else                                                                     {sname = tname;}
     return sname;
   } //}}}
-  var set_details = function(tname,sname,pos,context) { //{{{
-    if($(context).attr('id') == undefined) {
-      if(id_counter[tname] == undefined) id_counter[tname] = -1;
-      $(context).attr('svg-id', tname + '_' + (++id_counter[tname]));
-    } else {
-      $(context).attr('svg-id',  $(context).attr('id'));
+  var set_details = function(tname,sname,pos,context,simple) { //{{{
+    if (simple == undefined || simple == false) {
+      if($(context).attr('id') == undefined) {
+        if(id_counter[tname] == undefined) id_counter[tname] = -1;
+        $(context).attr('svg-id', tname + '_' + (++id_counter[tname]));
+      } else {
+        $(context).attr('svg-id',  $(context).attr('id'));
+      }
     }
     if (illustrator.elements[sname].label) {
       var lab = illustrator.elements[sname].label(context);
@@ -674,7 +679,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     var sname = sym_name(tname,context);
     // Draw Symbol {{{
     if (second) {
-      illustrator.draw.draw_symbol(sname, $(context).attr('svg-id'), $(context).attr('svg-label'), pos.row, pos.col, second, true).addClass(illustrator.elements[sname] ? illustrator.elements[sname].type : 'primitive unknown');
+      illustrator.draw.draw_symbol(sname, $(context).attr('svg-id'), $(context).attr('svg-label'), pos.row, pos.col, second.svg, true).addClass(illustrator.elements[sname] ? illustrator.elements[sname].type : 'primitive unknown');
     } else {
       $(context).attr('svg-type',tname);
       $(context).attr('svg-subtype',sname);
@@ -690,9 +695,9 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       if(illustrator.elements[sname] && illustrator.elements[sname].border) {
         var wide = (illustrator.elements[sname].wide == true && block.max.col == pos.col) ? pos.col + 1 : block.max.col;
         if (illustrator.elements[sname].closing_symbol) {
-          illustrator.draw.draw_border($(context).attr('svg-id'), pos, { col: wide, row: (illustrator.elements[sname].closing_symbol ? block.max.row+1 : block.max.row) }, block.svg);
+          illustrator.draw.draw_border($(context).attr('svg-id'), pos, { col: wide, row: block.max.row + 1 }, block.svg);
         } else {
-          illustrator.draw.draw_border($(context).attr('svg-id'), pos, { col: wide, row: (illustrator.elements[sname].closing_symbol ? block.max.row+1 : block.max.row) }, block.svg);
+          illustrator.draw.draw_border($(context).attr('svg-id'), pos, { col: wide, row: block.max.row }, block.svg);
         }
       }
       if(illustrator.elements[sname] && illustrator.elements[sname].type == 'complex') {
@@ -706,10 +711,16 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     }
     // }}}
     // Calculate Connection {{{
-    if(illustrator.elements[sname] != undefined && illustrator.elements[sname].closeblock) { // Close Block if element e.g. loop
-      for(node in block.endnodes) {
-        if (!block.endnodes[node].final) {
-          illustrator.draw.draw_connection(group, block.endnodes[node], pos, block.max.row+1, block.endnodes.length, true);
+    if(illustrator.elements[sname] != undefined && illustrator.elements[sname].closeblock == true) { // Close Block if element e.g. loop
+      if (second) {
+        if (second.pos.row+1 < pos.row) { // when no content, dont paint the up arrow
+          illustrator.draw.draw_connection(group, pos, second.pos, block.max.row+1, 1, true);
+        }
+      } else {
+        for(node in block.endnodes) {
+          if (!block.endnodes[node].final) {
+            illustrator.draw.draw_connection(group, block.endnodes[node], pos, block.max.row+1, block.endnodes.length, true);
+          }
         }
       }
     }

data/cockpit/themes/compact/theme.js

@@ -408,6 +408,27 @@ function WFAdaptorManifestation(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.loop_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+    }, //}}}
+    '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': {//{{{
@@ -664,12 +685,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){
-        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
-        return ret;
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'pre_test') {
+          return 'loop_head';
+        } else {
+          return 'loop_tail';
+        }
       },
-      'endnodes': 'this',
-      'closeblock': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -1122,6 +1144,25 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
+  this.elements.loop_head = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'aggregate',
+      'closeblock': false,
+      'closing_symbol': 'loop_finish'
+    },//}}}
+  };  /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'parent': 'choose',
     'illustrator': {//{{{
@@ -1146,6 +1187,22 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.loop_head_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': false,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{

data/cockpit/themes/default/theme.js

@@ -408,6 +408,27 @@ function WFAdaptorManifestation(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.loop_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+    }, //}}}
+    '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': {//{{{
@@ -665,12 +686,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){
-        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
-        return ret;
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'pre_test') {
+          return 'loop_head';
+        } else {
+          return 'loop_tail';
+        }
       },
-      'endnodes': 'this',
-      'closeblock': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -1123,6 +1145,25 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
+  this.elements.loop_head = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'aggregate',
+      'closeblock': false,
+      'closing_symbol': 'loop_finish'
+    },//}}}
+  };  /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'parent': 'choose',
     'illustrator': {//{{{
@@ -1147,6 +1188,22 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.loop_head_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': false,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{

data/cockpit/themes/extended/theme.js

@@ -440,6 +440,31 @@ function WFAdaptorManifestation(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.loop_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      '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;
+      },
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+    }, //}}}
+    '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': {//{{{
@@ -705,16 +730,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      '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 + 'ｘ' });
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'pre_test') {
+          return 'loop_head';
+        } else {
+          return 'loop_tail';
         }
-        return ret;
       },
-      'endnodes': 'this',
-      'closeblock': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -1168,6 +1190,29 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
+  this.elements.loop_head = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      '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;
+      },
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'aggregate',
+      'closeblock': false,
+      'closing_symbol': 'loop_finish'
+    },//}}}
+  };  /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'parent': 'choose',
     'illustrator': {//{{{
@@ -1192,6 +1237,22 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.loop_head_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': false,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{

data/cockpit/themes/packed/theme.js

@@ -408,6 +408,27 @@ function WFAdaptorManifestation(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.loop_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+    }, //}}}
+    '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': {//{{{
@@ -664,12 +685,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){
-        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
-        return ret;
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'pre_test') {
+          return 'loop_head';
+        } else {
+          return 'loop_tail';
+        }
       },
-      'endnodes': 'this',
-      'closeblock': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -1122,6 +1144,25 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
+  this.elements.loop_head = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'aggregate',
+      'closeblock': false,
+      'closing_symbol': 'loop_finish'
+    },//}}}
+  };  /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'parent': 'choose',
     'illustrator': {//{{{
@@ -1146,6 +1187,22 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.loop_head_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': false,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{

data/cockpit/themes/preset/theme.js

@@ -75,7 +75,7 @@ function WFAdaptorManifestation(adaptor) {
   }; //}}}
 
   function copyOrMove(menu,group,xml_node,mode) { //{{{
-    var markymark = self.marked();
+    var markymark = _.uniq(self.marked());
     var check1 = [];
     var check2 = [];
     $(markymark).each(function(key,svgid){
@@ -408,6 +408,27 @@ function WFAdaptorManifestation(adaptor) {
       'mouseout': self.events.mouseout
     }//}}}
   }; /*}}}*/
+  this.elements.loop_finish = { /*{{{*/
+    'type': 'primitive',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg',
+    }, //}}}
+    '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': {//{{{
@@ -472,7 +493,7 @@ function WFAdaptorManifestation(adaptor) {
        'menu_icon': self.elements.alternative.illustrator.svg.clone(),
        'type': 'alternative',
        'params': [self.adaptor.description.elements.alternative, node]}];
-      if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length)
+      if((node.children('otherwise').length == 0) && node.parents('parallel').length == node.parents('parallel_branch').length && node.parent('choose').length == 0)
         childs.push({'label': 'Otherwise',
          'function_call': self.adaptor.description.insert_last_into,
          'menu_icon': self.elements.otherwise.illustrator.svg.clone(),
@@ -654,7 +675,7 @@ function WFAdaptorManifestation(adaptor) {
     }, //}}}
     'adaptor': {//{{{
       'mousedown': function (node,e) {
-        self.events.mousedown(node,e,true,false);
+        self.events.mousedown(node,e,true,true);
       },
       'click': self.events.click,
       'dblclick': self.events.dblclick,
@@ -665,12 +686,13 @@ function WFAdaptorManifestation(adaptor) {
   this.elements.loop = { /*{{{*/
     'type': 'complex',
     'illustrator': {//{{{
-      'label': function(node){
-        var ret = [ { column: 'Label', value: $(node).attr('condition') + ($(node).attr('mode') == 'pre_test' ? ' (⭱)' : ' (⭳)') } ];
-        return ret;
+      'resolve_symbol': function(node) {
+        if($(node).attr('mode') == 'pre_test') {
+          return 'loop_head';
+        } else {
+          return 'loop_tail';
+        }
       },
-      'endnodes': 'this',
-      'closeblock': true,
       'expansion': function(node) {
         return 'vertical';
       },
@@ -1123,6 +1145,25 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/callmanipulate.svg'
     },//}}}
   }; /*}}}*/
+  this.elements.loop_head = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'label': function(node){
+        var ret = [ { column: 'Label', value: $(node).attr('condition') } ];
+        return ret;
+      },
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail = { /*{{{*/
+    'parent': 'loop',
+    'illustrator': {//{{{
+      'endnodes': 'aggregate',
+      'closeblock': false,
+      'closing_symbol': 'loop_finish'
+    },//}}}
+  };  /*}}}*/
   this.elements.choose_inclusive = { /*{{{*/
     'parent': 'choose',
     'illustrator': {//{{{
@@ -1147,6 +1188,22 @@ function WFAdaptorManifestation(adaptor) {
       'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
     },//}}}
   };  /*}}}*/
+  this.elements.loop_head_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': true,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    }//}}}
+  };  /*}}}*/
+  this.elements.loop_tail_finish = { /*{{{*/
+    'parent': 'loop_finish',
+    'illustrator': {//{{{
+      'endnodes': 'this',
+      'closeblock': false,
+      'svg': self.adaptor.theme_dir + 'symbols/choose_exclusive.svg'
+    },//}}}
+  };  /*}}}*/
   this.elements.parallel_simple = { /*{{{*/
     'parent': 'parallel_finish',
     'illustrator': {//{{{

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "1.5.9"
+  s.version          = "1.5.10"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Preliminary release of cloud process execution engine (cpee). If you just need workflow execution, without a rest/xmpp service exposing it, then use WEEL"

data/server/server.pid

@@ -0,0 +1 @@
+29054

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2019-10-22 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riddl
@@ -303,6 +303,7 @@ files:
 - server/resources/topics.xml
 - server/resources/transformation.xml
 - server/resources/transformation_dslx.xsl
+- server/server.pid
 - server/server.rb
 - test/callback.rb
 - tools/cpee