cpee 2.1.91 → 2.1.93

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7826a9cc5914c6a2d2c33e1fbfc64bef917aef446ca899599edaf13dc9c52fdd
-  data.tar.gz: 9c25629356d3c85efe04ce7fd6b1317bfc053465ecd3384fd0d3a2bfc0df6190
+  metadata.gz: cf5b0ca7b67e6dbadba9928fa0eda969239240a09d0ea58294f7a066e8588899
+  data.tar.gz: e062395a4e937c3911a65631cdef394adebfc69595af72b6fdb2a2e99965479d
 SHA512:
-  metadata.gz: 86cc1b6157b1e05dcd6bde0417f15e027e565e032cc4aa9714de25506a3dd3b1dd5802580552ab047c1e776b9f0a8f0286a9935f3a84edea6428720443519db3
-  data.tar.gz: 6b23dd951e896591748d05ff281fa673710d0eb5828c5e93d1fb64e03276092b26bbb49b86840576c91dc658e2bb63352fe8e585d7557b2e315e74c026bbdddb
+  metadata.gz: fb94ceeb111ba2e7bef92d1916699280192502b15f270d0a80b72b15ffb2d55d650b6ee62e34780ae2caf02193e662eaaa4550bd9f6fefb0663e87c24fc3c9c6
+  data.tar.gz: d107315d6c39cb2f61dbbe7e85efdfc5d1d8b2f9319932376a3fb85d1cf7a6ce569bbd95c887a4201d904ca344da9434b33489c832ead6e44b8beeb34e95ce20

data/Rakefile

@@ -25,6 +25,13 @@ task :install => :gem do |r|
   `gem install pkg/cpee.gem`
 end
 
+# task :release => :gem do |r|
+#   GIT_COMMITTER_DATE="$(git show develop --format=%aD | head -1)" \
+#   git tag -a "v1.7.0" develop -m "tag v1.7.0" \
+#   && git push --tags origin develop \
+#   && git --no-pager tag --list --format='%(refname)   %(taggerdate)'
+# end
+
 desc "Clean instances"
 task :clean do
   Dir.glob("server/instances/*").collect{ |i| i if i =~ /\/\d+$/ }.compact.each do |i|

data/cockpit/css/llm.css

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

data/cockpit/css/resources-label.css

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

data/cockpit/css/ui.css

@@ -3,7 +3,7 @@ body {
   -moz-user-select: -moz-none;
   -ms-user-select: none;
   user-select: none;
-  font-family: sans-serif;
+  font-family: adawaita-sans;
   font-size: 1em;
 }
 
@@ -31,9 +31,9 @@ body {
   background-color: #e9e9e9;
 }
 
-#instance ui-content { height: 7em; }
+#instance ui-content { height: 6em; }
 
-#areanew td:nth-child(2)       { padding-top: 0.4em; padding-bottom: 0.4em; }
+#areanew td:nth-child(2)       { padding-top: 0.2em; padding-bottom: 0.2em; }
 #areanew td:nth-child(1)       { width: 7em; padding-right: 1em; }
 #areanew td:nth-child(3)       { width: 16em; padding-left: 1em; }
 #areanew input                 {
@@ -46,8 +46,8 @@ body {
   -webkit-box-sizing: border-box;
 }
 
-#areanew button[name=base]     { width: 100%; padding: 0.5em 1em; margin-bottom: 0.1em; }
-#areanew button[name=instance] { width: 100%; padding: 0.5em 1em; }
+#areanew button[name=base]     { width: 100%; padding: 0.3em 1em; margin-bottom: 0.1em; }
+#areanew button[name=instance] { width: 100%; padding: 0.3em 1em; }
 
 ui-tabbed ui-tabbar ui-behind button {
   margin-left: 0.5em;
@@ -124,7 +124,7 @@ ui-tabbed ui-tabbar ui-behind button {
 #areaexecution table.x-ui-compact tbody.exe tr:first-child td { padding-top: 0.5em; }
 #areaexecution table.x-ui-compact tbody.exe { border-top: 1px solid var(--x-ui-border-color); }
 
-#areaexecution table.x-ui-compact tbody.exe td { height: 2.2em; }
+#areaexecution table.x-ui-compact tbody.exe td { height: 2em; }
 
 #arealog > div {  padding-left: 1em; padding-top: 1em; }
 

data/cockpit/css/wfadaptor.css

@@ -23,13 +23,23 @@
   --wfadaptor-highlight: #0081c7;
   --wfadaptor-base: #000000;
   --wfadaptor-base-light: #A9A9A9;
-  --wfadaptor-label: #d4d4d4;
+  --wfadaptor-label: #e4e4e4;
   --wfadaptor-mark: #d4d4d4;
-  --wfadaptor-selected: #f57900;
+
+/*--wfadaptor-selected: #f57900;*/
+/*--wfadaptor-hover: #f57900;*/
+
+/*--wfadaptor-selected: #4ee7d1;*/
+/*--wfadaptor-hover: #4ee7d1;*/
+
+  --wfadaptor-selected: #000000;
+  --wfadaptor-selected-text: #f57900;
+  --wfadaptor-hover: #000000;
+
   --wfadaptor-stripe: #e9e9e9;
   --wfadaptor-background: #ffffff;
-  --wfadaptor-menu: #ef2929;
   --wfadaptor-border: #a1a1a1;
+  --wfadaptor-important: #ef2929;
 }
 
 svg {
@@ -38,16 +48,14 @@ svg {
   padding:0;
 }
 
+svg .duration {
+  stroke: var(--wfadaptor-label);
+}
+
 svg rect.group {
   fill: var(--wfadaptor-highlight);
   fill-opacity: 0.2;
 }
-
-svg g.passive .rfill {
-  fill: var(--wfadaptor-exec-passive);
-  fill-opacity:1;
-}
-
 svg rect.stripe.even {
   fill: var(--wfadaptor-background);
 }
@@ -55,34 +63,45 @@ svg rect.stripe.odd {
   fill: var(--wfadaptor-stripe);
 }
 
-svg g.active .rfill {
-  fill: var(--wfadaptor-exec-active);
-  fill-opacity:1;
-}
-svg g.vote .rfill {
-  fill: var(--wfadaptor-exec-vote);
-  fill-opacity:1;
-}
-svg g.passive .rline {
+svg g.passive .execstyle {
   stroke: var(--wfadaptor-exec-passive);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.active .rline {
+svg g.active .execstyle {
   stroke: var(--wfadaptor-exec-active);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg g.vote .rline {
+svg g.vote .execstyle {
   stroke: var(--wfadaptor-exec-vote);
+  stroke-width: 4;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
 
-svg .rfill.menu {
-  fill: var(--wfadaptor-menu);
-  fill-opacity:1;
+svg g.passive .execstylethin {
+  stroke: var(--wfadaptor-exec-passive);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
-svg .hfill.menu {
-  fill: var(--wfadaptor-menu);
-  fill-opacity:1;
+svg g.active .execstylethin {
+  stroke: var(--wfadaptor-exec-active);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+}
+svg g.vote .execstylethin {
+  stroke: var(--wfadaptor-exec-vote);
+  stroke-width: 2;
+  stroke-linecap:round;
+  stroke-linejoin:round;
 }
 
-svg line.ourline, svg path.ourline {
+svg line.edge, svg path.edge {
   stroke-opacity:1;
   stroke: var(--wfadaptor-base);
   stroke-width: 2;
@@ -126,7 +145,7 @@ svg .standthin {
   fill: var(--wfadaptor-background);
   fill-opacity:1;
   stroke: var(--wfadaptor-base);
-  stroke-width:1.0;
+  stroke-width: 1.0 !important;
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
@@ -155,9 +174,6 @@ svg .greyfat {
   stroke-opacity:1;
   stroke-dasharray:none;
 }
-svg .standfat.menu {
-  stroke: var(--wfadaptor-menu);
-}
 svg .normal {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
@@ -207,18 +223,8 @@ svg .marked text.label {
   color: var(--wfadaptor-label);
   fill: var(--wfadaptor-label);
 }
-svg .marked .cfill {
-  fill: var(--wfadaptor-mark);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-mark);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}
-svg .marked .cline {
+
+svg .marked .markstyle {
   stroke: var(--wfadaptor-mark);
   stroke-linecap:round;
   stroke-linejoin:round;
@@ -231,33 +237,19 @@ svg.labelsrow text.label {
   cursor: pointer;
 }
 svg.labelsrow text.label:hover, svg.labelsrow text.label.hover {
-  fill: var(--wfadaptor-selected);
+  fill: var(--wfadaptor-selected-text);
 }
 svg text.label.selected {
-  fill: var(--wfadaptor-selected);
-}
-svg .selected text.label {
-  color: var(--wfadaptor-selected);
-  fill: var(--wfadaptor-selected);
-}
-svg .selected .cfill {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
+  fill: var(--wfadaptor-selected-text);
 }
-svg .selected .cline {
+svg .selected .markstyle {
   stroke: var(--wfadaptor-selected);
   stroke-linecap:round;
   stroke-linejoin:round;
   stroke-miterlimit:4;
   stroke-opacity:1;
-  stroke-dasharray:none;
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
 
 svg .unknown {
@@ -291,38 +283,6 @@ svg .standwithout {
 svg .standtrans {
   fill: var(--wfadaptor-background);
 }
-svg text.normal {
-  font-size:20px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
-}
-svg text.inverted {
-  font-size:20px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-background);
-  fill: var(--wfadaptor-background);
-  fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
-}
 
 svg text.super {
   font-size:11px;
@@ -338,15 +298,40 @@ svg text.super {
   fill: var(--wfadaptor-base);
   fill-opacity:1;
   stroke:none;
-  font-family:Arial;
+  font-family: adawaita-sans;
+}
+svg tspan.exec {
+  fill: var(--wfadaptor-exec-active-text);
+  display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.active {
   fill: var(--wfadaptor-exec-active-text);
   display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.vote {
   fill: var(--wfadaptor-exec-vote-text);
   display: none;
+
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
 }
 svg tspan.colon {
   display: none;
@@ -355,40 +340,6 @@ svg tspan.necessary {
   display: inline;
 }
 
-svg text.normallarge {
-  font-size:25px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
-}
-
-svg text.small {
-  font-size:14px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
-}
-
 svg text.label {
   font-size:14px;
   font-style:normal;
@@ -401,25 +352,21 @@ svg text.label {
   color: var(--wfadaptor-base);
   fill: var(--wfadaptor-base);
   fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
 }
-
-svg text.smaller {
+svg text.label tspan {
   font-size:12px;
-  font-style:normal;
-  font-variant:normal;
-  font-weight:bold;
-  font-stretch:normal;
-  text-align:center;
-  line-height:125%;
-  writing-mode:horizontal-tb;
-  text-anchor:middle;
-  color: var(--wfadaptor-base);
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke:none;
-  font-family:Arial;
+}
+
+svg text.label.standalone {
+  stroke: var(--wfadaptor-background);
+  stroke-width: 3px;
+  stroke-linecap:round;
+  stroke-linejoin:round;
+  paint-order: stroke markers fill;
+  font-family: adawaita-sans;
+}
+svg text.label.rotate {
+  transform: translateY(10px) rotate(-30deg);
 }
 
 #arrow {
@@ -428,54 +375,21 @@ svg text.smaller {
   fill: var(--wfadaptor-base);
 }
 
-svg g.element[element-id].hover .hfill {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
+svg g.element[element-id].hover {
   cursor: pointer;
 }
-svg g.element[element-id].hover .hline {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-  cursor: pointer;
+
+svg g.element[element-id].hover .hoverstyle {
+  stroke: var(--wfadaptor-hover);
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
-svg g.element[element-id].hover .htext {
-  fill: var(--wfadaptor-selected);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-selected);
-  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 .hoverstylethin {
+  stroke: var(--wfadaptor-hover);
+  stroke-dasharray: 1,2;
+  stroke-width: 1.6;
 }
 svg g.element[element-id].hover > text.label {
   color: var(--wfadaptor-selected);
   fill: var(--wfadaptor-selected);
 }
-svg g.element[element-id].hover .cfill {
-  fill: var(--wfadaptor-base);
-  fill-opacity:1;
-  stroke: var(--wfadaptor-base);
-  stroke-width:0.2;
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}
-svg g.element[element-id].hover .cline {
-  stroke: var(--wfadaptor-base);
-  stroke-linecap:round;
-  stroke-linejoin:round;
-  stroke-miterlimit:4;
-  stroke-opacity:1;
-  stroke-dasharray:none;
-}

data/cockpit/edit.html

@@ -176,8 +176,8 @@
             </div><div class='section'>
               <a id="savetestsetfile" href="" download=""></a>
               <a id="savesvgfile" href="" download=""></a>
-              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
-              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg<br>graph</button>
             </div><div class='section' id='modifiers'>
               <template id="item">
                 <div>

data/cockpit/index.html

@@ -19,6 +19,7 @@
   <head>
     <meta charset="utf-8"/>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <link rel="icon" type="image/png" href="/favicon.png">
     <title>CPEE Cockpit</title>
 
     <!-- libs, do not modify. When local than load local libs. -->
@@ -177,8 +178,8 @@
             </div><div class='section'>
               <a id="savetestsetfile" href="" download=""></a>
               <a id="savesvgfile" href="" download=""></a>
-              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save testset</button>
-              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg graph</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savetestsetfile">save<br>testset</button>
+              <button title='a testset includes various settings, subscriptions and a model' name="savesvgfile">save svg<br>graph</button>
             </div><div class='section' id='modifiers'>
               <template id="item">
                 <div>

data/cockpit/js/details.js

@@ -13,6 +13,10 @@ $(document).ready(function() {
       e.preventDefault()
     }
   });
+  $(document).on('change','#dat_details input',function(e){
+    clearTimeout(timer);
+    setTimeout(do_main_save, 1);
+  });
   $(document).on('relaxngui_remove', '#dat_details', function(e){
     clearTimeout(timer);
     do_main_save();
@@ -68,6 +72,13 @@ function do_main_work(svgid) { //{{{
     nnew[0].removeAttribute('xmlns');
   }
 
+  // copy all elements from different namespaces
+  [...node[0].attributes].forEach(attr =>{
+    if (attr && attr.namespaceURI && attr.namespaceURI != 'http://cpee.org/ns/description/1.0') {
+      nnew[0].setAttributeNS(attr.namespaceURI,attr.nodeName,attr.nodeValue);
+    }
+  });
+
   node.replaceWith(nnew);
 
   var ttarget = manifestation.adaptor.illustrator.get_node_by_svg_id(svgid);
@@ -106,7 +117,6 @@ function do_main_work(svgid) { //{{{
         },
         data: desc.get_description()
       });
-      adaptor_update();
       format_instance_pos();
 
       document.dispatchEvent(graph_changed);