cpee 1.3.214 → 1.3.215

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 159cc2d072f1b63869e15a644e62622723dbc3de
-  data.tar.gz: 6741c81ce6bc41d5622f91554c8d62f97c28c132
+  metadata.gz: 81086a732b73cc9fbd226de99af3ed04fbebe293
+  data.tar.gz: 437c2e25e1e617be28d9da30d6f0ab09bf8dd13d
 SHA512:
-  metadata.gz: 93ab571af3484ffaee9a29448c36339057fb088c7694fb61733c521e348091b9893092812a7a292c28a06581c0e91172a47157c6f38b3a99f049dde9841ec8e9
-  data.tar.gz: 7578732f93b060799b04b0b2d24dcfda62b6d3d58295dca01b4c02ce016ba36e4852637fb61c76945b579ea58c49b918dedf1ffa6cd779b1d5206d09142ba92a
+  metadata.gz: e5095a24c631f487a18d7848f8cb1b7f8bf05fc5e1209cda9bccfd61749e4151cb8ee141726e1c6d946d414e301ccad86ebffa0ec978d1a4ad4db1229bd53cb1
+  data.tar.gz: 61ab61dc74f7906c7434420be12ec23addde78e7d89fa972e184236ed0ca792021961bac82ca4ee2291ae6ef94611b20134ab76fd0716e13015d2885c46307f4

data/cockpit/css/wfadaptor.css

@@ -105,11 +105,29 @@ svg .black {
   stroke-dasharray:none;
 }
 
-svg .clicked {
-  fill: grey;
-  stroke: grey;
-  filter: drop-shadow(0 0 0.15em rgba(0,0,0,0.9));
-  padding: 1em;
+svg .clicked text.label {
+  color: #f57900;
+  fill: #f57900;
+}
+svg .clicked .cfill {
+  fill:#f57900;
+  fill-opacity:1;
+  stroke:#f57900;
+  stroke-width:0.2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+}
+svg .clicked .cline {
+  stroke:#f57900;
+  stroke-width:2.06896567;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
 }
 
 svg .unknown {
@@ -242,8 +260,58 @@ svg text.small {
   font-family:Arial;
 }
 
+svg text.label {
+  font-size:14px;
+  font-style:normal;
+  font-variant:normal;
+  font-stretch:normal;
+  text-align:center;
+  line-height:125%;
+  writing-mode:horizontal-tb;
+  text-anchor:left;
+  color: #a1a1a1;
+  fill: #a1a1a1;
+  fill-opacity:1;
+  stroke:none;
+  font-family:Arial;
+}
+
 #arrow {
   stroke: #000000;
   stroke-width: 2;
   fill: #000000;
 }
+
+svg g.element[element-id]:hover .hfill {
+  fill: #f57900;
+  fill-opacity:1;
+  cursor: pointer;
+}
+svg g.element[element-id]:hover .hline {
+  fill:#f57900;
+  fill-opacity:1;
+  stroke:#f57900;
+  stroke-width:2.06896567;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+  cursor: pointer;
+}
+svg g.element[element-id]:hover .htext {
+  fill:#f57900;
+  fill-opacity:1;
+  stroke:#f57900;
+  stroke-width:0.2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  stroke-miterlimit:4;
+  stroke-opacity:1;
+  stroke-dasharray:none;
+  cursor: pointer;
+}
+svg g.element[element-id]:hover > text.label {
+  color: #f57900;
+  fill: #f57900;
+}

data/cockpit/js/instance.js

@@ -6,6 +6,8 @@ var save = {};
     save['state']= undefined;
     save['dsl'] = undefined;
     save['graph'] = undefined;
+    save['graph_theme'] = undefined;
+    save['graph_adaptor'] = undefined;
     save['endpoints'] = undefined;
     save['dataelements'] = undefined;
     save['attributes'] = undefined;
@@ -299,25 +301,36 @@ function monitor_instance_values(val) {// {{{
 } // }}}
 
 function adaptor_init(url,theme,dslx) {
-  new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
-    graphrealization.set_svg_container($('#graphcanvas'));
-    graphrealization.set_description($(dslx), true);
-    graphrealization.notify = function(svgid) {
-      var g = graphrealization.get_description();
-      save['graph'] = $X(g);
-      save['graph'].find('[xmlns]').removeAttr('xmlns');
-      $.ajax({
-        type: "PUT",
-        url: url + "/properties/values/description/",
-			 	data: ({'content': '<content>' + g + '</content>'})
-      });
+  if (save['graph_theme'] != theme) {
+    save['graph_theme'] = theme;
+    save['graph_adaptor'] = new WfAdaptor($('body').data('theme-base') + '/' + theme + '/theme.js',function(graphrealization){
+      graphrealization.set_svg_container($('#graphcanvas'));
+      graphrealization.set_description($(dslx), true);
+      graphrealization.notify = function(svgid) {
+        var g = graphrealization.get_description();
+        save['graph'] = $X(g);
+        save['graph'].find('[xmlns]').removeAttr('xmlns');
+        $.ajax({
+          type: "PUT",
+          url: url + "/properties/values/description/",
+          data: ({'content': '<content>' + g + '</content>'})
+        });
+        manifestation.events.click(svgid);
+      };
+      monitor_instance_pos();
+      $('#dat_details').empty();
+    });
+  } else {
+    save['graph_adaptor'].update(function(graphrealization){
+      var svgid = manifestation.clicked();
+      graphrealization.set_description($(dslx));
       manifestation.events.click(svgid);
-    };
-    monitor_instance_pos();
-  });
+      monitor_instance_pos();
+    });
+  }
 }
 
-function monitor_graph_change(force) {
+function monitor_graph_change(force) { //{{{
   var url = $("#current-instance").text();
   $.ajax({
     type: "GET",
@@ -337,7 +350,7 @@ function monitor_graph_change(force) {
       }
     }
   });
-}
+} //}}}
 
 function monitor_instance_dsl() {// {{{
   var url = $("#current-instance").text();
@@ -677,7 +690,7 @@ function load_testsetfile_after() { //{{{
   var reader = new FileReader();
   reader.onload = function(){
     set_testset($.parseXML(reader.result),false);
-    document.getElementById("fuckchrome").reset();
+    document.getElementById('fuckchrome').reset();
     running  = false;
   }
   reader.onerror = function(){ console.log('error reading file'); running  = false; }
@@ -945,12 +958,18 @@ function format_visual_set(what) {//{{{
 }//}}}
 function format_visual_clear() {//{{{
   node_state = {};
-  $('.super .active').each(function(a,b){b.setAttribute("class","active");});
-  $('.super .passive').each(function(a,b){b.setAttribute("class","passive");});
-  $('.super .vote').each(function(a,b){b.setAttribute("class","vote");});
-  $('.super .colon').each(function(a,b){b.setAttribute("class","colon");});
-  $('.activities').each(function(a,b){b.setAttribute("class","activities");});
-  $("#votes").empty();
+  $('.super .active').each(function(a,b){b.setAttribute('class','active');});
+  $('.super .passive').each(function(a,b){b.setAttribute('class','passive');});
+  $('.super .vote').each(function(a,b){b.setAttribute('class','vote');});
+  $('.super .colon').each(function(a,b){b.setAttribute('class','colon');});
+  $('.activities').each(function(a,b){
+    if (b.hasAttribute('clicked')) {
+      b.setAttribute('class','activities clicked');
+    } else {
+      b.setAttribute('class','activities');
+    }
+  });
+  $('#votes').empty();
 }//}}}
 function format_visual_vote_clear() {//{{{
   node_state = {};

data/cockpit/js/wfadaptor.js

@@ -51,11 +51,12 @@ function WfAdaptor(theme_base,doit) { // Controller {{{
     illustrator.set_container(container); // TODO: shadowing the container element
   } // }}}
 
-
-  // initialze
+  // initialize
   this.illustrator = illustrator = new WfIllustrator(this);
   this.description = description = new WfDescription(this, this.illustrator);
 
+  this.update = function(doit){ doit(self); };
+
   $.getScript(theme_base, function() {
     manifestation = new WFAdaptorManifestation(self);
     illustrator.noarrow = manifestation.noarrow;
@@ -173,28 +174,38 @@ function WfIllustrator(wf_adaptor) { // View  {{{
   this.get_node_by_svg_id = function(svg_id) { // {{{
     return $('[element-id = \'' + svg_id + '\'] g.activities', self.svg.container);
   } // }}}
-  this.get_nodes = function() { // {{{
-    return $('g.activities', self.svg.container);
+  this.get_elements = function() { // {{{
+    return $('g.element', self.svg.container);
   } // }}}
   // }}}
   // Helper Functions {{{
+  var draw_label = this.draw.draw_label = function (row, col, label, group, where) { // {{{
+    var g = $X('<text class="label" transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height+20-((self.height*0.74))) + ')" xmlns="http://www.w3.org/2000/svg">' +
+                 (label != '' ? '◤ ' : '')  + label +
+               '</text>');
+    if(group) { group.find('g.element[element-id=' + where + ']').append(g); }
+    else {self.svg.container.children('g:first').append(g);}
+    return g;
+  } // }}}
   var draw_symbol = this.draw.draw_symbol = function (tname, sym_name, id, title, row, col, group) { // {{{
     if(self.elements[sym_name] == undefined || self.elements[sym_name].svg == undefined) sym_name = 'unknown';
-    var g = $X('<g class="element" element-type="' + sym_name + '" element-id="' + id  + '" transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height-((self.height*0.74))) + ')" xmlns="http://www.w3.org/2000/svg">' +
-                  '<text class="super" transform="translate(30,8.4)">' +
-                    '<tspan class="active">0</tspan>' +
-                    '<tspan class="colon">,</tspan>' +
-                    '<tspan class="vote">0</tspan>' +
-                  '</text>' +
+    var g = $X('<g class="element" element-type="' + sym_name + '" element-id="' + id  + '" xmlns="http://www.w3.org/2000/svg">' +
+                  '<g transform="translate(' + String((col*self.width)-((self.width*0.39))) + ',' + String(row*self.height-((self.height*0.74))) + ')">' +
+                    '<text class="super" transform="translate(30,8.4)">' +
+                      '<tspan class="active">0</tspan>' +
+                      '<tspan class="colon">,</tspan>' +
+                      '<tspan class="vote">0</tspan>' +
+                    '</text>' +
+                  '</g>' +
                '</g>');
     var sym = self.svg.defs[sym_name].clone();
     sym.prepend($X('<title xmlns="http://www.w3.org/2000/svg">' + title  + '</title>'));
     sym.attr('class','activities');
-    g.append(sym);
+    $(g[0].childNodes[0]).append(sym);
 
     // Binding events for symbol
     for(event_name in adaptor.elements[tname]) {
-      sym.bind(event_name, {'function_call':adaptor.elements[tname][event_name]}, function(e) { e.data.function_call($(this).parents(':first').attr('element-id'),e)});
+      sym.bind(event_name, {'function_call':adaptor.elements[tname][event_name]}, function(e) { e.data.function_call($(this).parents('.element:first').attr('element-id'),e)});
       if(event_name == 'mousedown') sym.bind('contextmenu', false);
     }
     if(group) {group.append(g);}
@@ -287,6 +298,19 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   var description;
   var id_counter = {};
   var update_illustrator = true;
+  var labels = [];
+
+  // Set Labels //{{{
+  this.set_labels = function(graph) {
+    if (illustrator.compact == false) {
+      if (labels.length > 0) {
+        _.each(labels,function(a,key) {
+          illustrator.draw.draw_label(a.row, graph.max.col + 1, a.label, graph.svg, a.element_id);
+        });
+        graph.max.col += 4;
+      }
+    }
+  } //}}}
 
   // Generic Functions {{{
   this.set_description = function(desc, auto_update) { // public {{{
@@ -300,8 +324,11 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
       description = null;
     }
     id_counter = {};
+    labels = [];
     illustrator.clear();
     var graph = parse(description.children('description').get(0), {'row':0,'col':0});
+    self.set_labels(graph);
+    // set labels
     illustrator.set_svg(graph);
   } // }}}
   var gd = this.get_description = function() { //  public {{{
@@ -338,8 +365,10 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
   var update = this.update = function(svgid) { // {{{
     id_counter = {};
     if(update_illustrator){
+      labels = [];
       illustrator.clear();
       var graph = parse(description.children('description').get(0), {'row':0,'col':0});
+      self.set_labels(graph);
       illustrator.set_svg(graph);
     }
 
@@ -430,7 +459,7 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     if(root_expansion == 'horizontal') pos.row++;
     if(illustrator.elements[root.tagName].col_shift(root) == true && root_expansion != 'horizontal') pos.col++;
 
-    if(root.tagName == 'description') { // First parsing {{{
+    if(root .tagName == 'description') { // First parsing {{{
       pos.row++;
       max.row++;
       $(root).attr('svg-id','description');
@@ -441,19 +470,6 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
     $(root).children().each(function() {
       var tname = this.tagName;
 
-      // Set SVG-ID {{{
-      if($(this).attr('id') == undefined) {
-        if(id_counter[tname] == undefined) id_counter[tname] = -1;
-        $(this).attr('svg-id', tname + '_' + (++id_counter[tname]));
-        $(this).attr('svg-label', '');
-      } else {
-        $(this).attr('svg-id',  $(this).attr('id'));
-        if ($(this).children('parameters').length > 0) {
-          $(this).attr('svg-label', $('label',$(this).children('parameters')).text().replace(/^['"]/,'').replace(/['"]$/,''));
-        } else {
-          $(this).attr('svg-label', '');
-        }
-      }  // }}}
       // Calculate next position {{{
       if($(this).attr('collapsed') == undefined || $(this).attr('collapsed') == 'false') { collapsed = false; }
       else { collapsed = true; }
@@ -482,6 +498,20 @@ function WfDescription(wf_adaptor, wf_illustrator) { // Model {{{
         }
       }
       // }}}
+      // Set SVG-ID and labels {{{
+      if($(this).attr('id') == undefined) {
+        if(id_counter[tname] == undefined) id_counter[tname] = -1;
+        $(this).attr('svg-id', tname + '_' + (++id_counter[tname]));
+      } else {
+        $(this).attr('svg-id',  $(this).attr('id'));
+      }
+      if (illustrator.elements[tname].label) {
+        var lab = illustrator.elements[tname].label(this);
+        $(this).attr('svg-label', lab);
+        labels.push({row: pos.row, element_id: $(this).attr('svg-id'), label: lab});
+      } else {
+        $(this).attr('svg-label', '');
+      } // }}}
       // Draw symbol {{{
       var sym_name = '';
       if(!illustrator.elements[tname])                                         {sym_name = 'unknown';}

data/cockpit/testsets/Coopis Testset.xml

@@ -20,6 +20,7 @@
     <description xmlns="http://cpee.org/ns/description/1.0">
       <call id="a1" endpoint="bookAir">
         <parameters>
+          <label>Book Airline</label>
           <method>:post</method>
           <arguments>
             <from>data.from</from>
@@ -36,6 +37,7 @@ status.update 1, 'Hotel'</finalize>
           <parallel_branch pass="data.persons" local="p">
             <call id="a2" endpoint="bookHotel">
               <parameters>
+                <label>Book Hotel</label>
                 <method>:post</method>
                 <arguments>
                   <to>data.to</to>
@@ -48,10 +50,11 @@ data.costs += result.value('costs').to_f</finalize>
           <manipulate id="a3">data.persons -= 1</manipulate>
         </loop>
       </parallel>
-      <choose>
+      <choose mode="inclusive">
         <alternative condition="data.costs > 700">
           <call id="a4" endpoint="approve">
             <parameters>
+              <label>Approve Hotel</label>
               <method>:post</method>
               <arguments>
                 <costs>data.costs</costs>

data/cockpit/testsets/ICSOC Testset.xml

@@ -15,6 +15,7 @@
           <loop mode="pre_test" condition='data.feedback'>
             <call id="design" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Design</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>4</timeout>
@@ -23,6 +24,7 @@
             </call>
             <call id="validate" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Validate</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>2</timeout>
@@ -31,6 +33,7 @@
             </call>
             <call id="publish" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Publish</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>1</timeout>
@@ -43,6 +46,7 @@
           <loop mode="pre_test" condition='data.feedback'>
             <call id="prepare" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Prepare</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>4</timeout>
@@ -51,6 +55,7 @@
             </call>
             <call id="fab" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Fabricate</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>4</timeout>
@@ -59,6 +64,7 @@
             </call>
             <call id="evaluate" endpoint="timeout">
               <parameters><!--{{{-->
+                <label>Evaluate</label>
                 <method>:post</method>
                 <arguments>
                   <timeout>4</timeout>

data/cockpit/themes/adventure/theme.js

@@ -4,6 +4,7 @@ function WFAdaptorManifestation(adaptor) {
   this.adaptor = adaptor;
   this.elements = {};
   this.events = {};
+  this.compact = true;
 
   this.noarrow = ['alternative', 'otherwise'];
   this.source = function(rng) {

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

@@ -1,4 +1,4 @@
 <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="normal">{..}</text>
+  <text transform="translate(15,20)" class="cfill normal">{..}</text>
 </svg>