cpee 2.1.110 → 2.1.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f9943a992fd0daa8d83a77e39978af329c56c9d79cf696ace8893f77b22aecb
-  data.tar.gz: f9d15c11818701cf6471303e8d2750a47eb70c4e5cf74f4097ba8eb33f9e7885
+  metadata.gz: 2328b64e63f8cb6aa07f437e6eb74db8b887f9a19213dedca0b85a87d7ab78a9
+  data.tar.gz: e8b3d0b931d7c189c000bba2078b35f4a387e7ef256bcab8fd71d6d0253e7d60
 SHA512:
-  metadata.gz: 28dddc79621ae601467ce069b282f2066b0188884e8a1e540b66229f96c3483f0d1f864215d36f72b0092e04029ea171b72b582a45ca765ca000eb2a43ab19e5
-  data.tar.gz: e85108d60aa7b2971efa810425877e658d7974eefeae77486e53386e23c50e04a5f8780bd3d30305f17a8a695f4e8cde6d68842814b57a29b055f9b37d51de07
+  metadata.gz: 5cc21448cdaa794df412a1102a34a59f1d8c27cf75378596331821c0780984fe613a5214a5e854d9ae06037a8ba3260f4629fd9f66d122acdd58248fdde828cd
+  data.tar.gz: e1962692f65c3b65a3abcc195255705a630cecc53b00c33a852f5afb0bb0e9bf45add649cc63c9e1ebcba59d0bbf2391e4afbb9b9a39a9922962d5a9fb193290

data/cockpit/css/extended_columns-label.css

@@ -36,5 +36,5 @@ svg.displaylabel text.label {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family: adawaita-sans;
+  font-family: adwaita-sans;
 }

data/cockpit/css/extended_columns-svg.css

@@ -4,17 +4,29 @@ svg rect.border {
 svg .resource-point.read {
   fill: green;
 }
+svg .resource-point.read text {
+  font-size: 11px;
+  fill: black;
+}
 svg .resource-point.write {
   fill: orange;
 }
+svg .resource-point.write text {
+  font-size: 11px;
+  fill: black;
+}
 svg .resource-point.both {
   fill: blue;
 }
-svg line.resource-column {
-  stroke: red;
-  stroke-opacity: 0.1;
+svg .resource-point.both text {
+  font-size: 11px;
+  fill: black;
+}
+svg rect.resource-column {
+  fill: grey;
+  fill-opacity: 0.1;
 }
-svg line.resource-column:hover {
-  stroke: red;
-  stroke-opacity: 0.2;
+svg rect.resource-column:hover {
+  fill: red;
+  fill-opacity: 0.1;
 }

data/cockpit/css/llm.css

@@ -38,7 +38,7 @@
   overflow-y: scroll;
 }
 #prompt:empty:before {
-  font-family: adawaita-sans;
+  font-family: adwaita-sans;
   white-space: normal;
   content: attr(placeholder);
   display: block;

data/cockpit/css/ui.css

@@ -3,7 +3,7 @@ body {
   -moz-user-select: -moz-none;
   -ms-user-select: none;
   user-select: none;
-  font-family: adawaita-sans;
+  font-family: adwaita-sans;
   font-size: 1em;
 }
 

data/cockpit/css/wfadaptor.css

@@ -42,7 +42,7 @@ svg {
   display:inline;
   margin:0;
   padding:0;
-  font-family: adawaita-sans;
+  font-family: adwaita-sans;
   user-select: none;
 }
 
@@ -223,10 +223,10 @@ svg .grey {
   stroke-dasharray:none;
 }
 
-svg.labelsrow text.label {
+svg.labelscolumn text.label {
   cursor: pointer;
 }
-svg.labelsrow text.label:hover, svg.labelsrow text.label.hover {
+svg.labelscolumn text.label:hover, svg.labelscolumn text.label.hover {
   fill: var(--wfadaptor-selected-text);
 }
 

data/cockpit/david.html

@@ -272,7 +272,7 @@
           <div id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
         </ui-area>

data/cockpit/edit.html

@@ -271,7 +271,7 @@
           <div id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
         </ui-area>

data/cockpit/graph.html

@@ -79,7 +79,7 @@
         <div id="modelling">
           <div id='graphgrid'>
             <div class="resource-label" style="display: none"></div>
-            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
           </div>
         </div>
       </div>

data/cockpit/index.html

@@ -272,7 +272,7 @@
           <div id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
         </ui-area>

data/cockpit/js/extended_columns.js

@@ -3,7 +3,7 @@ function show_dataflow_label(x,y,deg,text) {
 
   let clone = $('svg',document.querySelector('#label').content.cloneNode(true));
   $('text',clone).text(text);
-  let n = $('body').append(clone);
+  $('body').append(clone);
   let dim = $('text',clone)[0].getBBox();
   let height = $('rect',clone).attr('height');
   let width = dim.width + dim.x;
@@ -16,11 +16,16 @@ function show_dataflow_label(x,y,deg,text) {
 
   let top = y-shift-top_y;
   if (top < 0) top = 0;
+  if (top < window.scrollY) {
+    top = window.scrollY;
+    $(clone).attr('data-eq','true');
+  }
   $(clone).css('left',x-top_x);
   $(clone).css('top',top);
 
   $(clone).attr('height',shift + shift_plus + 2);
   $(clone).attr('width',neigh + 2);
+  $(clone).attr('width',neigh + 2);
   $('g',clone).attr('transform',$('g',clone).attr('transform').replace(/%%1/, shift + 1).replace(/%%2/, deg));
   $('rect',clone).attr('width',width);
 }
@@ -29,13 +34,34 @@ function show_dataflow_row_label(data) {
   let pos = data.getBoundingClientRect();
   let pos_top = $('#graphgrid').parent()[0].getBoundingClientRect();
   let pos_y;
-  let text = $('text',data).text();
+  let text = $('text.label',data).text();
   if (pos.y < (pos_top.y + 10)) {
     pos_y = pos_top.y + 10;
   } else {
     pos_y = pos.y;
   }
-  show_dataflow_label(pos.x + 12, pos_y, 60, text);
+  show_dataflow_label(pos.x + window.scrollX + 12, pos_y + window.scrollY , 60, text);
+}
+
+function show_dataflow_row_labels() {
+  $('.displaylabel').remove();
+  let top = 0;
+  if (manifestation.adaptor.properties['always'] == 'true') {
+    $('.resource-column',manifestation.adaptor.illustrator.svg.label_container).each((_,ele)=>{
+      show_dataflow_row_label(ele);
+    });
+  }
+  let height = 0;
+  $('svg.displaylabel').each((_,e)=>{
+    if ($(e).attr('data-eq') == 'true') {
+      if ($(e).attr('height') > height) { height = parseFloat($(e).attr('height')); }
+    }
+  });
+  $('svg.displaylabel').each((_,e)=>{
+    if ($(e).attr('data-eq') == 'true') {
+      $(e).css('top',window.scrollY + height - parseFloat($(e).attr('height')));
+    }
+  });
 }
 
 function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
@@ -49,7 +75,7 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
     graphrealization.illustrator.svg.label_container.removeClass('striped');
   }
 
-  $('.labelsrow, .graphlast').remove();
+  $('.labelscolumn, .graphlast').remove();
   let tcolumns = [];
   let tcolumntype = {};
   let tcolumncount = {}
@@ -87,7 +113,7 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
               mapPoints.set(k, p);
             }
 
-            let tsvg = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-row" element-row="' + (val.row-1) + '"></g>');
+            let tsvg = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-row" element-id="' + val.element_id + '" element-row="' + (val.row-1) + '"></g>');
 
             var cx = space;
             var count = 0;
@@ -100,14 +126,26 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
                 let inner;
 
                 if (p.AR == "Read") {
-                  inner = $X('<polygon xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" points="' + (p.x) + ',' + pos + ' ' + (p.x + iconsize) + ',' + (pos + iconsize/2) + ' ' + (p.x + iconsize) + ',' + (pos - iconsize/2) + '" class="resource-point read"></polygon>');
+                  inner = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-point read" resource-column="' + count + '"><polygon class="target" points="' + (p.x) + ',' + pos + ' ' + (p.x + iconsize) + ',' + (pos + iconsize/2) + ' ' + (p.x + iconsize) + ',' + (pos - iconsize/2) + '"></polygon></g>');
+                  if (manifestation.adaptor.properties['iolabels'] == 'true') {
+                    inner.append($X('<text xmlns="http://www.w3.org/2000/svg" x="' + (p.x + 3) + '" y="' + (pos+12) + '">r</text>'));
+                  }
                   if (pos == p.y0) { firstAssignFlag = true; }
                 } else if (p.AR == "Assign") {    // Define points for a triangle pointing to the left
-                  inner = $X('<polygon xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" points="' + (p.x + iconsize) + ',' + pos + ' ' + (p.x) + ',' + (pos + iconsize/2) + ' ' + (p.x) + ',' + (pos - iconsize/2) + '" class="resource-point write"></polygon>');
+                  inner = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-point write" resource-column="' + count + '"><polygon class="target" points="' + (p.x + iconsize) + ',' + pos + ' ' + (p.x) + ',' + (pos + iconsize/2) + ' ' + (p.x) + ',' + (pos - iconsize/2) + '"></polygon></g>');
+                  if (manifestation.adaptor.properties['iolabels'] == 'true') {
+                    inner.append($X('<text xmlns="http://www.w3.org/2000/svg" x="' + (p.x) + '" y="' + (pos+12) + '">w</text>'));
+                  }
                 } else if (p.AR == "AssignRead") {
-                  inner = $X('<circle xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" cx="' + (p.x + iconsize/2) + '" cy="' + pos + '" r="' + (iconsize / 2) + '" class="resource-point both"></circle>');
+                  inner = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-point both" resource-column="' + count + '"><circle class="target" cx="' + (p.x + iconsize/2) + '" cy="' + pos + '" r="' + (iconsize / 2) + '"></circle></g>');
+                  if (manifestation.adaptor.properties['iolabels'] == 'true') {
+                    inner.append($X('<text xmlns="http://www.w3.org/2000/svg" x="' + (p.x-1.5) + '" y="' + (pos+13) + '">rw</text>'));
+                  }
                 } else if (p.AR == "ReadAssign") {
-                  inner = $X('<circle xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" cx="' + (p.x + iconsize/2) + '" cy="' + pos + '" r="' + (iconsize / 2) + '" class="resource-point both"></circle>');
+                  inner = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-point both" resource-column="' + count + '"><circle class="target" cx="' + (p.x + iconsize/2) + '" cy="' + pos + '" r="' + (iconsize / 2) + '"></circle></g>');
+                  if (manifestation.adaptor.properties['iolabels'] == 'true') {
+                    inner.append($X('<text xmlns="http://www.w3.org/2000/svg" x="' + (p.x-1.5) + '" y="' + (pos+13) + '">rw</text>'));
+                  }
                   if (pos == p.y0) { firstAssignFlag = true; }
                 }
 
@@ -116,7 +154,7 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
                   p.ymax = pos;
                 }
 
-                inner.append($X('<text xmlns="http://www.w3.org/2000/svg"></text>').text(k));
+                inner.children().first().append($X('<text class="label" xmlns="http://www.w3.org/2000/svg"></text>').text(k));
                 tsvg.append(inner);
               }
 
@@ -126,7 +164,12 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
                 if (tcolumnsvgs[col.column][1] == undefined) {
                   tcolumnsvgs[col.column][1] = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-row" element-row="' + 0 + '"></g>');
                 }
-                tcolumnsvgs[col.column][1].append($X('<polygon xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" points="' + (p.x + iconsize) + ',' + firstpos + ' ' + (p.x) + ',' + (firstpos + iconsize/2) + ' ' + (p.x) + ',' + (firstpos - iconsize/2) + '" class="resource-point write"></polygon>').append($X('<text xmlns="http://www.w3.org/2000/svg"></text>').text(k)));
+                let i = $X('<g xmlns="http://www.w3.org/2000/svg" class="resource-point write" resource-column="' + count + '"><polygon class="target" points="' + (p.x + iconsize) + ',' + firstpos + ' ' + (p.x) + ',' + (firstpos + iconsize/2) + ' ' + (p.x) + ',' + (firstpos - iconsize/2) + '"></polygon></g>');
+                if (manifestation.adaptor.properties['iolabels'] == 'true') {
+                  i.append($X('<text xmlns="http://www.w3.org/2000/svg" x="' + (p.x) + '" y="' + (firstpos+12) + '">w</text>'));
+                }
+                i.children().first().append($X('<text class="label" xmlns="http://www.w3.org/2000/svg"></text>').text(k));
+                tcolumnsvgs[col.column][1].append(i);
               }
               cx += iconsize + space;
               count += 1;
@@ -136,11 +179,8 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
               tcolumnsvgs[col.column][val.row] = tsvg;
             }
           } else {
-            tsvg = $X('<text class="label" element-id="' + val.element_id + '" x="' + space + '" y="' + (dimensions.height * val.row - dimensions.height_shift) + '" xmlns="http://www.w3.org/2000/svg"></text>')
+            tsvg = $X('<text class="label" element-row="' + (val.row - 1) + '" element-id="' + val.element_id + '" x="' + space + '" y="' + (dimensions.height * val.row - dimensions.height_shift) + '" xmlns="http://www.w3.org/2000/svg"></text>')
             tsvg.text(col.value);
-            tsvg.mouseover(function(ev){ manifestation.events.mouseover($(ev.currentTarget).attr('element-id')); });
-            tsvg.mouseout(function(ev){ manifestation.events.mouseout($(ev.currentTarget).attr('element-id')); });
-            tsvg.click(function(ev){ manifestation.events.click($(ev.currentTarget).attr('element-id'),ev); });
             tcolumnsvgs[col.column][val.row] = tsvg;
           }
 
@@ -157,7 +197,7 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
 
   tcolumns.forEach(h => {
     if (Object.keys(tcolumnsvgs[h]).length > 0) {
-      const svgcolumn = $X('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" class="labelsrow"></svg>');
+      const svgcolumn = $X('<svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" class="labelscolumn"></svg>');
       const svgback = $X('<g xmlns="http://www.w3.org/2000/svg"></g>');
       const svgfront = $X('<g xmlns="http://www.w3.org/2000/svg"></g>');
       let xwidth = 0;
@@ -182,7 +222,7 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
       if (tcolumntype[h] == 'resource' || tcolumntype[h] == 'bodsod') {
         let count = 0;
         for (const [k, p] of mapPoints) {
-          svgback.append($X('<line xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" x1="' + (p.x + iconsize/2) + '" y1="' + p.y0 + '" x2="' + (p.x + iconsize/2) + '" y2="' + (p.ymax + 0.01) + '" class="' + tcolumntype[h] + '-column" stroke-width="' + iconsize + '"><text>' + k + '</text></line>'));
+          svgback.append($X('<rect xmlns="http://www.w3.org/2000/svg" resource-column="' + count + '" x="' + p.x + '" y="' + p.y0 + '" width="' + iconsize + '" height="' + (p.ymax - p.y0 + 0.01) + '" class="' + tcolumntype[h] + '-column"><text class="label">' + k + '</text></rect>'));
           count += 1;
         }
       }
@@ -193,6 +233,8 @@ function draw_extended_columns(graphrealization,max,labels,dimensions,striped) {
     }
   });
 
+  show_dataflow_row_labels();
+
   return tcolumns.length;
 }
 
@@ -201,11 +243,25 @@ $(document).ready(function() {
   var clicked_label;
   $('#graphgrid').on('mouseout','svg .resource-column, svg .resource-point',(data)=>{
     if (clicked_label != current_label) {
-      $('.displaylabel').remove();
+      let rc = $(current_label).attr('resource-column');
+      $('.resource-point[resource-column=' + rc + ']').each((_,e)=>{
+        let svgid = $(e).parent('g').attr('element-id');
+        manifestation.events.mouseout(svgid);
+      });
+
+      show_dataflow_row_labels();
       clicked_label = undefined;
       current_label = undefined;
     }
   });
+  $(window).scroll((data)=>{
+    if (current_label != undefined) {
+      $('.displaylabel').remove();
+      show_dataflow_row_label(current_label);
+    } else {
+      show_dataflow_row_labels();
+    }
+  });
   $('#graphcolumn').scroll((data)=>{
     if (current_label != undefined) {
       $('.displaylabel').remove();
@@ -218,16 +274,47 @@ $(document).ready(function() {
     clicked_label = data.target;
   });
   $('#graphgrid').on('mouseover','svg .resource-column',(data)=>{
+    $('.displaylabel').remove();
     show_dataflow_row_label(data.target);
     current_label = data.target;
+
+    let rc = $(data.target).attr('resource-column');
+    $('.resource-point[resource-column=' + rc + ']').each((_,e)=>{
+      let svgid = $(e).parent('g').attr('element-id');
+      manifestation.events.mouseover(svgid);
+    });
+  });
+  $('#graphgrid').on('mouseover','svg .resource-point',(data)=>{
+    $('.displaylabel').remove();
+    let tar = $(data.currentTarget);
+    let rc = tar.attr('resource-column');
+    let rct = $('.resource-column[resource-column=' + rc + ']')[0];
+
+    let pos = tar.find('.target')[0].getBoundingClientRect();
+    let text = $('text.label',tar).text();
+    show_dataflow_label(pos.x + window.scrollX + 12, pos.y + window.scrollY + 5, 60, text);
+
+    let svgid = tar.parent().attr('element-id');
+    manifestation.events.mouseover(svgid);
+    current_label = rct;
+  });
+
+  $('#graphgrid').on('mouseover','svg.labelscolumn text.label, svg.graphcolumn g.element',(ev)=>{
+    $('.displaylabel').remove();
+    let svgid = $(ev.currentTarget).attr('element-id');
+    manifestation.events.mouseover(svgid);
+    let er = manifestation.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"][element-row]').attr('element-row');
+    $('.resource-row[element-row=' + er + '] .resource-point .target').each((_,e) => {
+      let pos = e.getBoundingClientRect();
+      let text = $('text.label',e).text();
+      show_dataflow_label(pos.x + window.scrollX + 12, pos.y + window.scrollY + 5, 60, text);
+    })
+  });
+  $('#graphgrid').on('mouseout','svg.labelscolumn text.label, svg.graphcolumn g.element',(ev)=>{
+    manifestation.events.mouseout($(ev.currentTarget).attr('element-id'));
+    show_dataflow_row_labels();
   });
-  $('#graphgrid').on('mouseover','svg .resource-point',(ev)=>{
-    let rc = $(ev.target).attr('resource-column');
-    let data = $('.resource-column[resource-column=' + rc + ']')[0];
-    show_dataflow_row_label(data);
-    current_label = data;
-    // let pos = data.target.getBoundingClientRect();
-    // let text = $('text',data.target).text();
-    // show_dataflow_label(pos.x + 12, pos.y + 5, 60, text);
+  $('#graphgrid').on('click','svg.labelscolumn text.label, svg.graphcolumn g.element',(ev)=>{
+    manifestation.events.click($(ev.currentTarget).attr('element-id'),ev);
   });
 });

data/cockpit/js/instance.js

@@ -123,7 +123,16 @@ function cockpit() { //{{{
   document.addEventListener('uidash:activate_tab', function (e) {
     if (!$('#tabdetails').hasClass('inactive')) {
       if (save['graph_adaptor']) {
+        var svgid = manifestation.selected();
+        var marks = manifestation.marked();
         save['graph_adaptor'].redraw();
+        let vtarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
+        if (vtarget.length > 0) { vtarget.parents('g.element[element-id]').addClass('selected'); }
+        format_instance_pos();
+        marks.forEach((svgid) => {
+          let vtarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
+          if (vtarget.length > 0) { vtarget.parents('g.element[element-id]').addClass('marked'); }
+        });
       }
     }
   });
@@ -441,11 +450,15 @@ function monitor_instance(cin,rep,load,exec) {// {{{
   });
 }// }}}
 
+function translate_endpoint(ep) {
+  return ep.replace(/\{[^\/\}]+\}/,'*');
+}
+
 function get_resource(base, key, loc, cache) {
   cache[key] = {};
   let deferreds = [new $.Deferred(), new $.Deferred(), new $.Deferred()];
   $.ajax({
-    url: base + 'endpoints/' + encodeURIComponent(loc) + "/symbol.svg",
+    url: base + 'endpoints/' + encodeURIComponent(translate_endpoint(loc)) + "/symbol.svg",
     success: function(res) {
       cache[key]['symbol'] = res;
       deferreds[0].resolve(true);
@@ -453,7 +466,7 @@ function get_resource(base, key, loc, cache) {
     error: deferreds[0].resolve
   })
   $.ajax({
-    url: base + 'endpoints/' + encodeURIComponent(loc) + "/schema.rng",
+    url: base + 'endpoints/' + encodeURIComponent(translate_endpoint(loc)) + "/schema.rng",
     success: function(res) {
       cache[key]['schema'] = res;
       deferreds[1].resolve(true);
@@ -461,7 +474,7 @@ function get_resource(base, key, loc, cache) {
     error: deferreds[1].resolve
   })
   $.ajax({
-    url: base + 'endpoints/' + encodeURIComponent(loc) + "/properties.json",
+    url: base + 'endpoints/' + encodeURIComponent(translate_endpoint(loc)) + "/properties.json",
     success: function(res) {
       cache[key]['properties'] = res;
       deferreds[2].resolve(true);
@@ -510,7 +523,7 @@ function monitor_instance_values(type,vals) {// {{{
             let def = new $.Deferred();
             deferreds.push(def);
             $.ajax({
-              url: rep + 'endpoints/' + encodeURIComponent($(v).text()),
+              url: rep + 'endpoints/' + encodeURIComponent(translate_endpoint($(v).text())),
               success: () => {
                 tmp[v.tagName] = {};
                 $.when.apply($, get_resource(rep,v.tagName,$(v).text(),tmp)).then(function(x) {
@@ -527,10 +540,10 @@ function monitor_instance_values(type,vals) {// {{{
               let defr = new $.Deferred();
               deferreds.push(defr);
               $.ajax({
-                url: rep + 'endpoints/' + encodeURIComponent(encodeURIComponent($(v).text())),
+                url: rep + 'endpoints/' + encodeURIComponent(encodeURIComponent(translate_endpoint($(v).text()))),
                 success: () => {
                   tmp[v.tagName] = {};
-                  $.when.apply($, get_resource(rep,v.tagName,encodeURIComponent($(v).text()),tmp)).then(function(x) {
+                  $.when.apply($, get_resource(rep,v.tagName,encodeURIComponent(translate_endpoint($(v).text())),tmp)).then(function(x) {
                     save['endpoints_cache'] = tmp;
                     def.resolve();
                     // when updating attributes clear the attributes, because they might change as well. New arguments are possible.
@@ -1031,6 +1044,7 @@ function save_svgfile() {// {{{
   });
   gc.find('.selected').removeClass('selected');
   var varreps = {};
+  var ffamily = '';
   $(window.document.styleSheets).each(function(i,x){
     if (x && x.href && x.ownerNode.attributes.getNamedItem('data-include-export')) {
       $(x.cssRules).each(function(j,y){
@@ -1039,6 +1053,13 @@ function save_svgfile() {// {{{
             varreps['var\\(' + z + '\\)'] = getComputedStyle(document.documentElement).getPropertyValue(z).toString();
           });
         }
+        if (y.selectorText == "svg") {
+          $(y.style).each(function(k,z) {
+            if (z == 'font-family') {
+              ffamily = getComputedStyle($('#graphgrid > svg')[0]).getPropertyValue(z).toString();
+            }
+          });
+        }
         var loc = $(gc).find(y.selectorText.replace(/svg /g,''));
         var cst = y.style.cssText;
         for (k in varreps) {
@@ -1049,8 +1070,13 @@ function save_svgfile() {// {{{
           $(loco).attr('style',cst + sty);
         });
       });
-      var loc = $(gc).find('text.super');
-      loc.attr('style',loc.attr('style') + ' display: none; ');
+      $(gc).find('text.super,g.hoverstyle,g.markstyle').each(function(k,loco){
+        $(loco).attr('style',$(loco).attr('style') + ' display: none; ');
+      });
+      ffamily = ffamily.replace(/-/,' ').split(' ').map(function(word) { return word[0].toUpperCase() + word.substr(1); }).join(' ');
+      $(gc).find('text').each(function(k,loco){
+        $(loco).attr('style',$(loco).attr('style') + ' font-family: \'' + ffamily + '\'; ');
+      });
     }
   });
   gc.attr('width',start+1);

data/cockpit/js/wfadaptor.js

@@ -26,12 +26,13 @@ var high;
 // e.g. Event fires to Adaptor to insert Element and Illustrator and Description do it
 function WfAdaptor(theme_base,doit) { // Controller {{{
 
- // public variables {{{
+  // public variables {{{
     this.illustrator;
     this.description;
     this.elements = {};
     this.theme_base = theme_base;
     this.theme_dir = theme_base.replace(/theme.js/,'');
+    this.properties = {};
   // }}}
 
   // private variables {{{
@@ -1146,7 +1147,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     if(root.tagName == 'description' && illustrator.elements[root.tagName].closing_symbol) {
       pos.row++;
       max.row = pos.row;
-      draw_position(illustrator.elements['start'].closing_symbol,parent_pos,pos,prev,block,[],this,{svg: block.svg, pos: pos});
+      draw_position(illustrator.elements['start'].closing_symbol,parent_pos,pos,prev,block,[],root,{svg: block.svg, pos: pos});
     }
 
     return {'endnodes': endnodes, 'max':max, 'svg': block.svg};

data/cockpit/llm.html

@@ -267,7 +267,7 @@
           <div id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
           <div id='status'></div>

data/cockpit/llm_alternative.html

@@ -269,7 +269,7 @@
           <div id="modelling">
             <div id='graphgrid'>
               <div class="resource-label" style="display: none"></div>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
           <div id='status'></div>

data/cockpit/model.html

@@ -180,7 +180,7 @@
         <ui-area data-belongs-to-tab="details" id='graphcolumn' oncontextmenu='return false'>
           <div id="modelling">
             <div id='graphgrid'>
-              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+              <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
             </div>
           </div>
         </ui-area>

data/cockpit/only_llm.html

@@ -244,7 +244,7 @@
         <ui-area data-belongs-to-tab="details" id="detailcolumn">
           <div id='graphgrid'>
             <div class="resource-label" style="display: none"></div>
-            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
           </div>
         </ui-area>
         <ui-area data-belongs-to-tab="log" id="arealog" class="inactive"> <!--{{{-->

data/cockpit/templates/Coopis 2010 Replay.xml

@@ -0,0 +1,214 @@
+<?xml version="1.0"?>
+<testset xmlns="http://cpee.org/ns/properties/2.0">
+  <executionhandler>ruby</executionhandler>
+  <dataelements>
+    <persons>3</persons>
+    <card>Visa_12345</card>
+    <airline/>
+    <hotels>[]</hotels>
+    <from>Vienna</from>
+    <to>Prague</to>
+    <costs>0</costs>
+  </dataelements>
+  <endpoints>
+    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <user>https-post://cpee.org/services/timeout-user.php</user>
+    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
+    <timeout>https://cpee.org/services/timeout.php</timeout>
+    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <subprocess>https://cpee.org/flow/start/url/</subprocess>
+    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <send>https-post://cpee.org/ing/correlators/message/send/</send>
+    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
+  </endpoints>
+  <attributes>
+    <guarded>none</guarded>
+    <modeltype>CPEE</modeltype>
+    <theme>extended</theme>
+    <guarded_id/>
+    <info>Coopis 2010 Replay</info>
+    <creator>Christine Ashcreek</creator>
+    <author>Christine Ashcreek</author>
+    <design_stage>development</design_stage>
+    <design_dir>Templates.dir/</design_dir>
+    <model_uuid>8f79b49f-2747-41c1-b278-195816951bbf</model_uuid>
+    <model_version/>
+    <replay>https://cpee.org/replay/</replay>
+    <replay_target>https://cpee.org/replay-data/coopis/1274c1de-286e-4d73-9375-30b363d280fa.xes.yaml</replay_target>
+    <replay_instantiate>https://cpee.org/flow/start/url/</replay_instantiate>
+  </attributes>
+  <description>
+    <description xmlns="http://cpee.org/ns/description/1.0">
+      <call id="a1" endpoint="bookAir">
+        <parameters>
+          <label>Book Airline 1</label>
+          <method>:post</method>
+          <arguments>
+            <from>!data.from</from>
+            <to>!data.to</to>
+            <persons>!data.persons</persons>
+          </arguments>
+        </parameters>
+        <code>
+          <prepare/>
+          <finalize output="result">data.airline = result.value('id')
+data.costs += result.value('costs').to_f
+status.update 1, 'Hotel'</finalize>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
+        <annotations>
+          <_timing>
+            <_timing_weight/>
+            <_timing_avg/>
+            <explanations/>
+          </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
+          <_notes>
+            <_notes_general/>
+          </_notes>
+        </annotations>
+        <documentation>
+          <input/>
+          <output/>
+          <implementation>
+            <description/>
+          </implementation>
+          <code>
+            <description/>
+          </code>
+        </documentation>
+      </call>
+      <parallel wait="-1" cancel="last">
+        <loop mode="pre_test" condition="data.persons &gt; 0">
+          <parallel_branch>
+            <call id="a2" endpoint="bookHotel">
+              <parameters>
+                <label>Book Hotel</label>
+                <method>:post</method>
+                <arguments>
+                  <to>!data.to</to>
+                </arguments>
+              </parameters>
+              <code>
+                <prepare/>
+                <finalize output="result">data.hotels &lt;&lt; result.value('id')
+data.costs += result.value('costs').to_f</finalize>
+                <update output="result"/>
+                <rescue output="result"/>
+              </code>
+              <annotations>
+                <_timing>
+                  <_timing_weight/>
+                  <_timing_avg/>
+                  <explanations/>
+                </_timing>
+                <_shifting>
+                  <_shifting_type>Duration</_shifting_type>
+                </_shifting>
+                <_context_data_analysis>
+                  <probes/>
+                  <ips/>
+                </_context_data_analysis>
+                <report>
+                  <url/>
+                </report>
+                <_notes>
+                  <_notes_general/>
+                </_notes>
+              </annotations>
+              <documentation>
+                <input/>
+                <output/>
+                <implementation>
+                  <description/>
+                </implementation>
+                <code>
+                  <description/>
+                </code>
+              </documentation>
+            </call>
+          </parallel_branch>
+          <manipulate id="a3" label="">
+            <code>data.persons -= 1</code>
+            <annotations>
+              <_logging_behavior>
+                <_exclude/>
+              </_logging_behavior>
+              <_context_data_analysis>
+                <probes/>
+              </_context_data_analysis>
+            </annotations>
+          </manipulate>
+        </loop>
+      </parallel>
+      <choose mode="exclusive">
+        <alternative condition="data.costs &gt; 700">
+          <_probability>
+            <_probability_min/>
+            <_probability_max/>
+            <_probability_avg/>
+          </_probability>
+          <call id="a4" endpoint="approve">
+            <parameters>
+              <label>Approve Hotel</label>
+              <method>:post</method>
+              <arguments>
+                <costs>!data.costs</costs>
+              </arguments>
+            </parameters>
+            <annotations>
+              <_timing>
+                <_timing_weight/>
+                <_timing_avg/>
+                <explanations/>
+              </_timing>
+              <_shifting>
+                <_shifting_type>Duration</_shifting_type>
+              </_shifting>
+              <_context_data_analysis>
+                <probes/>
+                <ips/>
+              </_context_data_analysis>
+              <report>
+                <url/>
+              </report>
+              <_notes>
+                <_notes_general/>
+              </_notes>
+            </annotations>
+            <documentation>
+              <input/>
+              <output/>
+              <implementation>
+                <description/>
+              </implementation>
+            </documentation>
+          </call>
+        </alternative>
+        <otherwise/>
+      </choose>
+    </description>
+  </description>
+  <transformation>
+    <description type="copy"/>
+    <dataelements type="none"/>
+    <endpoints type="none"/>
+  </transformation>
+  <subscriptions xmlns="http://riddl.org/ns/common-patterns/notifications-producer/2.0">
+    <subscription id="_matze" url="https://lehre.bpm.in.tum.de/~mangler/a.php">
+      <topic id="state">
+        <event>change</event>
+      </topic>
+    </subscription>
+  </subscriptions>
+</testset>

data/cockpit/templates/Coopis 2010.xml

@@ -2,22 +2,22 @@
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
   <dataelements>
+    <airline>Aeroflot</airline>
     <persons>3</persons>
     <card>Visa_12345</card>
-    <airline/>
+    <costs>565.0</costs>
     <hotels>[]</hotels>
     <from>Vienna</from>
     <to>Prague</to>
-    <costs>0</costs>
   </dataelements>
   <endpoints>
-    <bookAir>http://gruppe.wst.univie.ac.at/~mangler/services/airline.php</bookAir>
+    <bookAir>https://cpee.org/services/airline.php</bookAir>
     <user>https-post://cpee.org/services/timeout-user.php</user>
     <auto>https-post://cpee.org/services/timeout-auto.php</auto>
     <timeout>https://cpee.org/services/timeout.php</timeout>
-    <bookHotel>http://gruppe.wst.univie.ac.at/~mangler/services/hotel.php</bookHotel>
+    <bookHotel>https://cpee.org/services/hotel.php</bookHotel>
     <subprocess>https://cpee.org/flow/start/url/</subprocess>
-    <approve>http://gruppe.wst.univie.ac.at/~mangler/services/approval.php</approve>
+    <approve>https://cpee.org//services/approval.php</approve>
     <send>https-post://cpee.org/ing/correlators/message/send/</send>
     <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
   </endpoints>
@@ -33,9 +33,6 @@
     <design_dir>Templates.dir</design_dir>
     <model_uuid>a1cbb855-90e3-4d8c-b44b-d3ba7bff9f4e</model_uuid>
     <model_version/>
-    <replay>https://cpee.org/replay/</replay>
-    <replay_target>https://cpee.org/replay-data/coopis/1274c1de-286e-4d73-9375-30b363d280fa.xes.yaml</replay_target>
-    <replay_instantiate>https://cpee.org/flow/start/url/</replay_instantiate>
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -138,7 +135,17 @@ data.costs += result.value('costs').to_f</finalize>
               </documentation>
             </call>
           </parallel_branch>
-          <manipulate id="a3">data.persons -= 1</manipulate>
+          <manipulate id="a3" label="">
+            <code>data.persons -= 1</code>
+            <annotations>
+              <_logging_behavior>
+                <_exclude/>
+              </_logging_behavior>
+              <_context_data_analysis>
+                <probes/>
+              </_context_data_analysis>
+            </annotations>
+          </manipulate>
         </loop>
       </parallel>
       <choose mode="exclusive">

data/cockpit/templates/Frames.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements>
-    <res>{"select_0":"learned in class or from book","input_0":"sadff","select_1":"used on a class project","input_1":"asdfsaf","input_2":"sadfasdf"}</res>
-  </dataelements>
+  <dataelements/>
   <endpoints>
-    <frames_init>https-post://cpee.org/out/frames/</frames_init>
-    <frames_display>https-put://cpee.org/out/frames/</frames_display>
+    <frames_init>https-post://cpee.org/out/frames/{simple}/</frames_init>
+    <frames_display>https-put://cpee.org/out/frames/{simple}/</frames_display>
   </endpoints>
   <attributes>
     <guarded>none</guarded>
@@ -20,7 +18,6 @@
     <model_version/>
     <design_dir>Templates.dir</design_dir>
     <design_stage>development</design_stage>
-    <fid>gnd</fid>
   </attributes>
   <description>
     <description xmlns="http://cpee.org/ns/description/1.0">
@@ -38,14 +35,18 @@
           </arguments>
         </parameters>
         <code>
-          <signal/>
-          <prepare>endpoints.frames_init += attributes.fid</prepare>
+          <signal>false</signal>
+          <prepare/>
           <finalize output="result"/>
           <update output="result"/>
           <rescue output="result"/>
         </code>
         <annotations>
           <_generic/>
+          <_logging_behavior>
+            <_exclude>false</_exclude>
+            <_include>false</_include>
+          </_logging_behavior>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
@@ -93,14 +94,18 @@
           </arguments>
         </parameters>
         <code>
-          <signal/>
-          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <signal>false</signal>
+          <prepare/>
           <finalize output="result"/>
           <update output="result"/>
           <rescue output="result"/>
         </code>
         <annotations>
           <_generic/>
+          <_logging_behavior>
+            <_exclude>false</_exclude>
+            <_include>false</_include>
+          </_logging_behavior>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
@@ -153,14 +158,18 @@
           </arguments>
         </parameters>
         <code>
-          <signal/>
-          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <signal>false</signal>
+          <prepare/>
           <finalize output="result"/>
           <update output="result"/>
           <rescue output="result"/>
         </code>
         <annotations>
           <_generic/>
+          <_logging_behavior>
+            <_exclude>false</_exclude>
+            <_include>false</_include>
+          </_logging_behavior>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
@@ -213,14 +222,18 @@
           </arguments>
         </parameters>
         <code>
-          <signal/>
-          <prepare>endpoints.frames_display += attributes.fid</prepare>
+          <signal>false</signal>
+          <prepare/>
           <finalize output="result"/>
           <update output="result"/>
           <rescue output="result"/>
         </code>
         <annotations>
           <_generic/>
+          <_logging_behavior>
+            <_exclude>false</_exclude>
+            <_include>false</_include>
+          </_logging_behavior>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
@@ -279,14 +292,18 @@
             </arguments>
           </parameters>
           <code>
-            <signal/>
-            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <signal>false</signal>
+            <prepare/>
             <finalize output="result"/>
             <update output="result"/>
             <rescue output="result"/>
           </code>
           <annotations>
             <_generic/>
+            <_logging_behavior>
+              <_exclude>false</_exclude>
+              <_include>false</_include>
+            </_logging_behavior>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
@@ -325,8 +342,8 @@
               <type>wait</type>
               <lx>0</lx>
               <ly>1</ly>
-              <x_amount>5</x_amount>
-              <y_amount>9</y_amount>
+              <x_amount>3</x_amount>
+              <y_amount>7</y_amount>
               <button/>
               <style/>
               <urls>
@@ -347,14 +364,18 @@
             </arguments>
           </parameters>
           <code>
-            <signal/>
-            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <signal>false</signal>
+            <prepare/>
             <finalize output="result">data.res = result</finalize>
             <update output="result"/>
             <rescue output="result"/>
           </code>
           <annotations>
             <_generic/>
+            <_logging_behavior>
+              <_exclude>false</_exclude>
+              <_include>false</_include>
+            </_logging_behavior>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
@@ -402,14 +423,18 @@
             </arguments>
           </parameters>
           <code>
-            <signal/>
-            <prepare>endpoints.frames_display += attributes.fid</prepare>
+            <signal>false</signal>
+            <prepare/>
             <finalize output="result"/>
             <update output="result"/>
             <rescue output="result"/>
           </code>
           <annotations>
             <_generic/>
+            <_logging_behavior>
+              <_exclude>false</_exclude>
+              <_include>false</_include>
+            </_logging_behavior>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
@@ -440,7 +465,6 @@
             </code>
           </documentation>
         </call>
-        <stop id="a4"/>
       </loop>
     </description>
   </description>

data/cockpit/templates/ML-pipe-multi.xml

@@ -108,7 +108,6 @@ performance = f1_score(y_test, y_predict, average='macro')
     <info>ML-pipe-multi</info>
     <modeltype>CPEE</modeltype>
     <theme>extended</theme>
-    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>

data/cockpit/templates/Worklist Vote.xml

@@ -11,7 +11,7 @@
   <attributes>
     <info>Worklist Vote</info>
     <modeltype>CPEE</modeltype>
-    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+    <organisation1>https://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
     <theme>extended</theme>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>

data/cockpit/templates/Worklist.xml

@@ -9,7 +9,7 @@
     <info>Worklist</info>
     <modeltype>CPEE</modeltype>
     <theme>extended</theme>
-    <organisation1>http://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
+    <organisation1>https://cpee.org/~demo/orgviz/organisation_informatik.xml</organisation1>
     <creator>Christine Ashcreek</creator>
     <author>Christine Ashcreek</author>
     <design_stage>development</design_stage>

data/cockpit/themes/base.js

@@ -292,6 +292,10 @@ function WFAdaptorManifestationBase(adaptor) {
     return false;
   } // }}}
   this.events.mousedown = function(svgid, e, child, sibling) { // {{{
+    if (typeof save === 'undefined') {
+      return;
+    }
+
     if(e.button == 0) {  // left-click
       save['details_target'].tsvgid = svgid;
     } else if(e.button == 1) { // middle-click
@@ -305,16 +309,12 @@ function WFAdaptorManifestationBase(adaptor) {
     return false;
   } // }}}
   this.events.click = function(svgid, e) { // {{{
-    if (self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
+    if (typeof save === 'undefined' || self.adaptor.description.get_node_by_svg_id(svgid).length == 0) {
       return;
     }
 
-    $('#graphgrid .selected').removeClass('selected');
-
     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) {
         var vt = vtarget.parents('g.element[element-id]');
@@ -330,6 +330,8 @@ function WFAdaptorManifestationBase(adaptor) {
     } else if (e && (e.shiftKey)) {
       positionHandling(svgid);
     } else {
+      $('#graphgrid .selected').removeClass('selected');
+
       self.adaptor.illustrator.get_elements().removeClass('marked');
       localStorage.removeItem('marked');
       localStorage.removeItem('marked_from');
@@ -348,19 +350,12 @@ function WFAdaptorManifestationBase(adaptor) {
   this.events.dblclick = function(svgid, e) { // {{{
   } // }}}
   this.events.mouseover = function(svgid, e) { // {{{
-    let er = self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"][element-row]').attr('element-row');
-    $('.resource-row[element-row=' + er + '] .resource-point').each((_,e) => {
-      let pos = e.getBoundingClientRect();
-      let text = $('text',e).text();
-      show_dataflow_label(pos.x + 12, pos.y + 5, 60, text);
-    })
     self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','block');
     self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').addClass('hover');
     self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').addClass('hover');
     return false;
   } // }}}
   this.events.mouseout = function(svgid, e) { // {{{
-    $('.displaylabel').remove();
     self.adaptor.illustrator.svg.container.find('.tile[element-id = "' + svgid + '"]').css('display','none');
     self.adaptor.illustrator.svg.container.find('[element-id = "' + svgid + '"]').removeClass('hover');
     self.adaptor.illustrator.svg.label_container.find('[element-id = "' + svgid + '"]').removeClass('hover');
@@ -1350,9 +1345,9 @@ function WFAdaptorManifestationBase(adaptor) {
             $('call > code > prepare',n).each(function(j,m){
               item += m.textContent + '\n';
             });
-            if (n.nodeName == 'manipulate') { // css selector can not directly access manipulate
-              item += n.textContent + '\n';
-            }
+            $('manipulate > code',n).each(function(j,m){
+              item += m.textContent + '\n';
+            });
             $('call > parameters > arguments *',n).each(function(j,m){
               let x = m.textContent;
               if (x.charAt(0) == '!') { item += x + '\n'; }

data/cockpit/track.html

@@ -142,7 +142,7 @@
         <div id="modelling">
           <div id='graphgrid'>
             <div class="resource-label" style="display: none"></div>
-            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' width='1' height='1'></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" version="1.1" xmlns:x="http://www.w3.org/1999/xlink" id='graphcanvas' class='graphcolumn' width='1' height='1'></svg>
           </div>
         </div>
       </div>

data/cpee.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "cpee"
-  s.version          = "2.1.110"
+  s.version          = "2.1.111"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0-or-later"
   s.summary          = "The cloud process execution engine (cpee.org). If you just need workflow execution, without a rest service exposing it, then use WEEL."

data/server/executionhandlers/eval/connection.rb

@@ -127,8 +127,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
     status = result = headers = nil
     begin
-      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete|patch):/,'http\\1:')
       type = $2 || parameters[:method] || 'post'
+      tendpoint.gsub!(/{([^\/\}]+)}/,'\\1')
 
       client = Riddl::Client.new(tendpoint)
 

data/server/executionhandlers/ruby/connection.rb

@@ -127,8 +127,9 @@ class ConnectionWrapper < WEEL::ConnectionWrapperBase
 
     status = result = headers = nil
     begin
-      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete):/,'http\\1:')
+      tendpoint = @handler_endpoint.sub(/^http(s)?-(get|put|post|delete|patch):/,'http\\1:')
       type = $2 || parameters[:method] || 'post'
+      tendpoint.gsub!(/{([^\/\}]+)}/,'\\1')
 
       client = Riddl::Client.new(tendpoint)
 

data/server/executionhandlers/ruby/dsl_to_dslx.xsl

@@ -52,7 +52,7 @@
       <xsl:text>, parameters: { </xsl:text>
       <xsl:apply-templates select="d:parameters"/>
       <xsl:text> }</xsl:text>
-      <xsl:if test="d:code/d:signal[text()='on']">
+      <xsl:if test="d:code/d:signal[text()='true']">
         <xsl:text>, signal: true</xsl:text>
       </xsl:if>
       <xsl:if test="(d:finalize or d:code/d:finalize) and (d:finalize/text() or d:code/d:finalize/text())">

data/server/resources/topics.xml

@@ -22,11 +22,13 @@
     <event>manipulating</event>
     <event>status</event>
     <event>done</event>
+    <event>annotation</event>
     <vote>syncing_before</vote>
     <vote>syncing_after</vote>
   </topic>
   <topic id='gateway'>
     <event>decide</event>
+    <event>annotation</event>
     <event>split</event>
     <event>join</event>
   </topic>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cpee
 version: !ruby/object:Gem::Version
-  version: 2.1.110
+  version: 2.1.111
 platform: ruby
 authors:
 - Juergen eTM Mangler
@@ -309,6 +309,7 @@ files:
 - cockpit/templates.legacy/convert_preset.rb
 - cockpit/templates.legacy/testsets.xml
 - cockpit/templates.legacy/transformations.xml
+- cockpit/templates/Coopis 2010 Replay.xml
 - cockpit/templates/Coopis 2010.xml
 - cockpit/templates/Frames.xml
 - cockpit/templates/IUPC arXiv:1104.3609 P34 1.xml