cpee 2.1.92 → 2.1.93

data/cockpit/templates/Frames.xml

@@ -1,27 +1,23 @@
 <?xml version="1.0"?>
 <testset xmlns="http://cpee.org/ns/properties/2.0">
   <executionhandler>ruby</executionhandler>
-  <dataelements/>
+  <dataelements>
+    <qid>simple</qid>
+  </dataelements>
   <endpoints>
-    <timeout>https://cpee.org/services/timeout.php</timeout>
-    <subprocess>https://cpee.org/flow/start/url/</subprocess>
-    <frames_init>https-post://cpee.org/out/frames/simple/</frames_init>
-    <send>https-post://cpee.org/ing/correlators/message/send/</send>
-    <frames_display>https-put://cpee.org/out/frames/simple/</frames_display>
-    <receive>https-get://cpee.org/ing/correlators/message/receive/</receive>
-    <user>https-post://cpee.org/services/timeout-user.php</user>
-    <auto>https-post://cpee.org/services/timeout-auto.php</auto>
+    <frames_init>https-post://cpee.org/out/frames/</frames_init>
+    <frames_display>https-put://cpee.org/out/frames/</frames_display>
   </endpoints>
   <attributes>
+    <guarded>none</guarded>
     <info>Frames</info>
-    <creator>Christine Ashcreek</creator>
-    <author>Christine Ashcreek</author>
     <modeltype>CPEE</modeltype>
-    <guarded>none</guarded>
+    <theme>extended</theme>
+    <creator>Christine Ashcreek</creator>
     <guarded_id/>
+    <author>Christine Ashcreek</author>
     <model_uuid>5ed82f61-a382-49b5-a420-c63e01d5a9f5</model_uuid>
     <model_version/>
-    <theme>extended</theme>
     <design_dir>Templates.dir</design_dir>
     <design_stage>development</design_stage>
   </attributes>
@@ -30,6 +26,7 @@
       <call id="a1" endpoint="frames_init">
         <parameters>
           <label>"Init Frame"</label>
+          <color/>
           <arguments>
             <style_url>https://cpee.org/form/frames.css</style_url>
             <document_url/>
@@ -39,19 +36,31 @@
             <document_name>Show Info</document_name>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_init += data.qid + '/'
+p endpoints.frames_init</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -62,11 +71,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a3" endpoint="frames_display">
         <parameters>
           <label>Clear </label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>0</lx>
@@ -79,19 +92,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += data.qid + '/'</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -102,11 +126,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a6" endpoint="frames_display">
         <parameters>
           <label>Show Header</label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>0</lx>
@@ -124,19 +152,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += data.qid + '/'</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -147,11 +186,15 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <call id="a5" endpoint="frames_display">
         <parameters>
           <label>Display Graph</label>
+          <color/>
           <arguments>
             <type>set</type>
             <lx>3</lx>
@@ -169,19 +212,30 @@
             <default/>
           </arguments>
         </parameters>
+        <code>
+          <signal/>
+          <prepare>endpoints.frames_display += data.qid + '/'</prepare>
+          <finalize output="result"/>
+          <update output="result"/>
+          <rescue output="result"/>
+        </code>
         <annotations>
+          <_generic/>
           <_timing>
             <_timing_weight/>
             <_timing_avg/>
-            <_context_data_analysis>
-              <probes/>
-              <ips/>
-            </_context_data_analysis>
-            <report>
-              <url/>
-            </report>
             <explanations/>
           </_timing>
+          <_shifting>
+            <_shifting_type>Duration</_shifting_type>
+          </_shifting>
+          <_context_data_analysis>
+            <probes/>
+            <ips/>
+          </_context_data_analysis>
+          <report>
+            <url/>
+          </report>
           <_notes>
             <_notes_general/>
           </_notes>
@@ -192,6 +246,9 @@
           <implementation>
             <description/>
           </implementation>
+          <code>
+            <description/>
+          </code>
         </documentation>
       </call>
       <loop mode="post_test" condition="true">
@@ -203,6 +260,7 @@
         <call id="a2" endpoint="frames_display">
           <parameters>
             <label>Show Button</label>
+            <color/>
             <arguments>
               <type>wait</type>
               <lx>0</lx>
@@ -220,19 +278,30 @@
               <default/>
             </arguments>
           </parameters>
+          <code>
+            <signal/>
+            <prepare>endpoints.frames_display += data.qid + '/'</prepare>
+            <finalize output="result"/>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
           <annotations>
+            <_generic/>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
-              <_context_data_analysis>
-                <probes/>
-                <ips/>
-              </_context_data_analysis>
-              <report>
-                <url/>
-              </report>
               <explanations/>
             </_timing>
+            <_shifting>
+              <_shifting_type>Duration</_shifting_type>
+            </_shifting>
+            <_context_data_analysis>
+              <probes/>
+              <ips/>
+            </_context_data_analysis>
+            <report>
+              <url/>
+            </report>
             <_notes>
               <_notes_general/>
             </_notes>
@@ -243,11 +312,15 @@
             <implementation>
               <description/>
             </implementation>
+            <code>
+              <description/>
+            </code>
           </documentation>
         </call>
         <call id="a7" endpoint="frames_display">
           <parameters>
             <label>Clear Button</label>
+            <color/>
             <arguments>
               <type>set</type>
               <lx>0</lx>
@@ -260,19 +333,30 @@
               <default/>
             </arguments>
           </parameters>
+          <code>
+            <signal/>
+            <prepare>endpoints.frames_display += data.qid + '/'</prepare>
+            <finalize output="result"/>
+            <update output="result"/>
+            <rescue output="result"/>
+          </code>
           <annotations>
+            <_generic/>
             <_timing>
               <_timing_weight/>
               <_timing_avg/>
-              <_context_data_analysis>
-                <probes/>
-                <ips/>
-              </_context_data_analysis>
-              <report>
-                <url/>
-              </report>
               <explanations/>
             </_timing>
+            <_shifting>
+              <_shifting_type>Duration</_shifting_type>
+            </_shifting>
+            <_context_data_analysis>
+              <probes/>
+              <ips/>
+            </_context_data_analysis>
+            <report>
+              <url/>
+            </report>
             <_notes>
               <_notes_general/>
             </_notes>
@@ -283,6 +367,9 @@
             <implementation>
               <description/>
             </implementation>
+            <code>
+              <description/>
+            </code>
           </documentation>
         </call>
         <stop id="a4"/>

data/cockpit/themes/base.js

@@ -117,7 +117,7 @@ function WFAdaptorManifestationBase(adaptor) {
       nodes.reverse();
       var iconm = contextMenuHandling_clean_icon(self.resources['arrow']);
       var iconc = contextMenuHandling_clean_icon(self.resources['arrow']);
-      iconm.children('.rfill').addClass('menu');
+      iconm.children('.colorstyle').css('fill','var(--wfadaptor-important');
       if (myid == localStorage.getItem('marked_from')) {
         menu.push(
           {
@@ -186,8 +186,7 @@ function WFAdaptorManifestationBase(adaptor) {
 
     if(xml_node.get(0).tagName != 'description' && !self.elements[xml_node.get(0).tagName].neverdelete) {
       var icon = contextMenuHandling_clean_icon(self.elements[xml_node.get(0).tagName].illustrator.svg);
-      icon.find('.rfill').addClass('menu');
-      icon.find('.hfill').addClass('menu');
+      icon.find('.colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'] = [{
         'label': 'Remove Element',
         'function_call': function(selector,target,selected){
@@ -204,7 +203,7 @@ function WFAdaptorManifestationBase(adaptor) {
       nodes = JSON.parse(nodes);
       if (nodes && nodes.length > 0) {
         var icond = contextMenuHandling_clean_icon(self.resources['delete']);
-        icond.children('.standfat').addClass('menu');
+        icond.find('.colorstyle').css('stroke','var(--wfadaptor-important)');
         menu['Delete'].push({
           'label': 'Remove Marked Elements',
           'function_call': function(){
@@ -236,7 +235,7 @@ function WFAdaptorManifestationBase(adaptor) {
     }
     if($('> code', xml_node).length > 0 && xml_node.get(0).tagName == 'call') {
       var icon = contextMenuHandling_clean_icon(self.elements.callmanipulate.illustrator.svg);
-      icon.children('.rfill:last').addClass('menu');
+      icon.find('.part-extra .colorstyle').css('fill','var(--wfadaptor-important');
       menu['Delete'].push({
         'label': 'Remove Scripts',
         'function_call': self.adaptor.description.remove,
@@ -247,7 +246,7 @@ function WFAdaptorManifestationBase(adaptor) {
     }
     if (xml_node.get(0).tagName == "call" || xml_node.get(0).tagName == "manipulate" || xml_node.get(0).tagName == "stop") {
       var icon = contextMenuHandling_clean_icon(self.elements.call.illustrator.svg);
-      icon.children('g.replace').addClass('passive');
+      icon.find('.part-normal').addClass('passive');
       var vtarget = self.adaptor.illustrator.get_node_by_svg_id(svgid);
       if (vtarget.length > 0) {
         if (vtarget.parents('g.activities.passive, g.activities.active').length > 0) {
@@ -1337,8 +1336,8 @@ function WFAdaptorManifestationBase(adaptor) {
         let alist = []
         let plist = []
 
-        var regassi =      /data\.([a-zA-Z_]+)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
-        var reg_not_assi = /data\.([a-zA-Z_]+)\s*/g;
+        var regassi =      /data\.([a-zA-Z_][a-zA-Z0-9_]*)\s*(=[^=]|\+\=|\-\=|\*\=|\/\=|<<|>>)/g; // we do not have to check for &gt;/&lt; version of stuff as only conditions are in attributes, and conditions can not contain assignments
+        var reg_not_assi = /data\.([a-zA-Z_][a-zA-Z0-9_]*)\s*/g;
 
         $('call, manipulate, loop[condition], alternative[condition]',node).each(function(i,n) {
           let item = '';

data/cockpit/themes/control/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">

data/cockpit/themes/control/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">

data/cockpit/themes/control/rngs/manipulate.rng

@@ -16,6 +16,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>

data/cockpit/themes/control/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">

data/cockpit/themes/control/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/control/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/control/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>

data/cockpit/themes/control/symbols/callmanipulate_sensor_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>

data/cockpit/themes/control/symbols/callmanipulate_signal.svg

@@ -18,7 +18,7 @@
   </g>
   <g class="part-extra">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle hoverstylethin execstylethin colorstyle stand"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
 
     <circle cx="29" cy="10" r="7" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>
     <circle cx="29" cy="10" r="5" class="markstyle execstylethin hoverstylethin standthin colorstyle" style="stroke-dasharray: 1,2"/>

data/cockpit/themes/control/symbols/critical.svg

@@ -1,4 +1,5 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3 27 l 12 -24 l 12 24 z"/>
-  <text transform="translate(15,23)" class="small">!</text>
+  <path class="markstyle colorstyle hoverstyle execstyle stand" d="m 3.5 27 l 12 -24 l 12 24 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 11 l 0 8 l -2 0 l 0 -8 z"/>
+  <path class="normal" style="fill:#000000;" d="m 16.5 21 l 0 2 l -2 0 l 0 -2 z"/>
 </svg>

data/cockpit/themes/control/symbols/delete.svg

@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="standfat"/>
-  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="standfat"/>
+  <line x1="8.5" y1="22.5" x2="22.5" y2="8.5" class="colorstyle standfat"/>
+  <line x1="8.5" y1="8.5" x2="22.5" y2="22.5" class="colorstyle standfat"/>
 </svg>

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

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <circle cx="15" cy="15" r="14" class="colorstyle standfat"/>
+  <circle cx="15" cy="15" r="13" class="colorstyle standfat" style="stroke-width: 5;"/>
 </svg>

data/cockpit/themes/control/symbols/manipulate.svg

@@ -1,11 +1,11 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <g class="part-normal">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,21)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-start" clip-path="url(#startclip)">
     <rect x="1" y="1" width="38" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>
-    <text transform="translate(15,20.5)" class="normal">s</text>
+    <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
   </g>
   <g class="part-end" clip-path="url(#endclip)">
     <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle colorstyle stand"/>

data/cockpit/themes/control/symbols/parallel.svg

@@ -1,5 +1,6 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect transform="rotate(45,14,12)" x="7" y="3" width="21" height="21" class="colorstyle markstyle hoverstyle stand"/>
-  <text transform="translate(15.5,23)" class="normallarge">+</text>
+  <line x1="15.5" y1="9.5" x2="15.5" y2="21.5" class="stand"/>
+  <line x1="9.5" y1="15.5" x2="21.5" y2="15.5" class="stand"/>
 </svg>
 

data/cockpit/themes/control/symbols/scripts.svg

@@ -1,4 +1,4 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
   <rect x="1" y="1" width="28" height="28" rx="4" class="hoverstyle execstyle markstyle stand"/>
-  <text transform="translate(15,21)" class="normal">s</text>
+  <path transform="translate(10,10)" class="normal" style="fill:#000000;" d="M 0.09999755,7.74648 2.8538976,7.32656 q 0.17579,0.80078 0.7129,1.2207 0.5371,0.41016 1.5039,0.41016 1.06445,0 1.60156,-0.39063 0.36133,-0.27343 0.36133,-0.73242 0,-0.3125 -0.19531,-0.51758 -0.20508,-0.19531 -0.91797,-0.36132 -3.32031,-0.73243 -4.20898,-1.33789 -1.23047005,-0.83985 -1.23047005,-2.33399 0,-1.34766 1.06445005,-2.26562 Q 2.6097576,0.1 4.8460876,0.1 q 2.12891,0 3.16406,0.69336 1.03516,0.69336 1.425786,2.05078 l -2.587886,0.47851 q -0.16602,-0.60547 -0.63477,-0.92773 -0.45898,-0.32227 -1.31836,-0.32227 -1.08398,0 -1.55273,0.30274 -0.3125,0.21484 -0.3125,0.55664 0,0.29297 0.27343,0.49805 0.3711,0.27343 2.5586,0.77148 2.19726,0.49805 3.0664,1.2207 0.859379,0.73242 0.859379,2.04102 0,1.42578 -1.191409,2.45117 -1.1914,1.02539 -3.52539,1.02539 -2.11914,0 -3.35937,-0.85937 Q 0.48085755,9.22109 0.09999755,7.74648 Z"/>
 </svg>

data/cockpit/themes/dataflow/rngs/call.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">

data/cockpit/themes/dataflow/rngs/callmanipulate.rng

@@ -22,6 +22,7 @@
         <value>#e4c3e4</value>
         <value>#ded0c5</value>
         <value>#bcbbbd</value>
+        <value>#f57aa9</value>
       </choice>
     </element>
     <element name="method" rngui:label="Method">

data/cockpit/themes/dataflow/rngs/manipulate.rng

@@ -16,6 +16,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <text rngui:label="Script that is executed"/>

data/cockpit/themes/dataflow/rngs/start.rng

@@ -10,6 +10,7 @@
       <value>#e4c3e4</value>
       <value>#ded0c5</value>
       <value>#bcbbbd</value>
+      <value>#f57aa9</value>
     </choice>
   </attribute>
   <element name="_generic" rngui:header="Process Level Generic Annotations">

data/cockpit/themes/dataflow/symbols/arrow.svg

@@ -1,3 +1,3 @@
 <svg class="clickable" xmlns="http://www.w3.org/2000/svg">
-  <path class="execstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
+  <path class="colorstyle stand" d="m 5 10 l 10 0 l 0 -5 l 10 10 l -10 10 l 0 -5 l -10 0 z"/>
 </svg>

data/cockpit/themes/dataflow/symbols/callmanipulate.svg

@@ -18,6 +18,6 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
   </g>
 </svg>

data/cockpit/themes/dataflow/symbols/callmanipulate_sensor.svg

@@ -18,7 +18,8 @@
   </g>
   <g class="part-extra" transform="">
     <rect x="23" y="21" width="12" height="12" rx="2" class="markstyle execstylethin hoverstylethin stand colorstyle"/>
-    <text transform="translate(29,30.75)" class="small">s</text>
+    <path transform="translate(25.5,23.3)" class="normal" style="fill:#000000;" d="M 0,5.352539 1.9277344,5.0585937 q 0.1230468,0.5605469 0.4990234,0.8544922 0.3759766,0.2871092 1.0527344,0.2871092 0.7451172,0 1.1210937,-0.2734373 0.2529297,-0.1914063 0.2529297,-0.5126953 0,-0.21875 -0.1367187,-0.3623047 Q 4.5732422,4.915039 4.0742187,4.7988281 1.75,4.2861328 1.1279297,3.8623047 0.2666016,3.274414 0.2666016,2.2285156 q 0,-0.9433594 0.7451171,-1.5859375 Q 1.7568359,0 3.3222656,0 4.8125,0 5.5371094,0.4853515 6.2617184,0.9707031 6.5351564,1.9208984 L 4.7236328,2.2558594 Q 4.6074219,1.8320312 4.2792969,1.6064453 3.9580078,1.3808594 3.3564453,1.3808594 q -0.7587891,0 -1.0869141,0.211914 -0.21875,0.1503906 -0.21875,0.3896485 0,0.2050781 0.1914063,0.3486328 0.2597656,0.1914062 1.7910156,0.540039 1.5380863,0.3486328 2.1464843,0.8544922 0.601563,0.5126953 0.601563,1.4287109 0,0.9980473 -0.833985,1.7158203 -0.833984,0.717774 -2.4677732,0.717774 -1.4833985,0 -2.3515625,-0.601563 Q 0.2666016,6.3847661 0,5.352539 Z"/>
+
     <path class="markstyle stand" d="M 34.003906,5 V 4.1269531 c 0,-4.45934904 -3.585332,-8.0488281 -8.039062,-8.0488281 H 25"/>
     <path class="markstyle stand" d="M 31.5,5 V 4.9667969 C 31.5,1.3836953 28.618741,-1.5 25.039062,-1.5 H 25"/>
   </g>