[dia] BPMN: optimize to combine fill and stroke

From: Hans Breuer <hans src gnome org>
To: commits-list gnome org
Cc:
Subject: [dia] BPMN: optimize to combine fill and stroke
Date: Sun, 8 Jun 2014 09:00:33 +0000 (UTC)
commit 37212b73534db98abf778e545aeb6d9689a4ab59
Author: Hans Breuer <hans breuer org>
Date:   Sat May 31 20:13:22 2014 +0200

    BPMN: optimize to combine fill and stroke
    
    also removed some superfluous extra lines which apparently where just
    added to get connection points from them.

 shapes/BPMN/Activity-Looping.shape                 |    7 +------
 shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape     |    7 +------
 shapes/BPMN/Collapsed-Sub-Process.shape            |    7 +------
 .../BPMN/Compensation-Collapsed-Sub-Process.shape  |   16 ++++------------
 shapes/BPMN/Looping-Collapsed-Sub-Process.shape    |   10 ++--------
 shapes/BPMN/Multiple-Instance-Task.shape           |   13 +++----------
 6 files changed, 12 insertions(+), 48 deletions(-)
---
diff --git a/shapes/BPMN/Activity-Looping.shape b/shapes/BPMN/Activity-Looping.shape
index aab8216..e15a805 100644
--- a/shapes/BPMN/Activity-Looping.shape
+++ b/shapes/BPMN/Activity-Looping.shape
@@ -19,14 +19,9 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
     <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 4.2 5.8 C 3.5,5.45 
3.75,4.45 4.45,4.45 C 5.15,4.45 5.5,5.35 4.75,5.85"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.175" y1="5.8" 
x2="4.125" y2="5.45"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.225" y1="5.8" 
x2="3.825" y2="5.8"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
   </svg:svg>
 </shape>
diff --git a/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape b/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
index 3d831a7..98bc1c3 100644
--- a/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
+++ b/shapes/BPMN/Ad-Hoc-Collapsed-Sub-Process.shape
@@ -19,12 +19,7 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
     <svg:rect style="fill: default" x="3.65" y="5" width="1" height="1"/>
     <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="3.65" y="5" 
width="1" height="1"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.15" y1="5.25" 
x2="4.15" y2="5.75"/>
diff --git a/shapes/BPMN/Collapsed-Sub-Process.shape b/shapes/BPMN/Collapsed-Sub-Process.shape
index 7c3856f..18c991b 100644
--- a/shapes/BPMN/Collapsed-Sub-Process.shape
+++ b/shapes/BPMN/Collapsed-Sub-Process.shape
@@ -19,15 +19,10 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
     <svg:rect style="fill: default" x="4" y="5" width="1" height="1"/>
     <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="4" y="5" width="1" 
height="1"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.5" y1="5.25" 
x2="4.5" y2="5.75"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.25" y1="5.5" 
x2="4.75" y2="5.5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
   </svg:svg>
 </shape>
diff --git a/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape 
b/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
index 8188ac0..c706501 100644
--- a/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
+++ b/shapes/BPMN/Compensation-Collapsed-Sub-Process.shape
@@ -19,19 +19,11 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
-    <svg:rect style="fill: default" x="4.45" y="4.975" width="1" height="1"/>
-    <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="4.45" y="4.975" 
width="1" height="1"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
+    <svg:rect style="fill: default; stroke-width: 0.1; stroke: #000000" x="4.45" y="4.975" width="1" 
height="1"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.95" y1="5.225" 
x2="4.95" y2="5.725"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="4.7" y1="5.475" 
x2="5.2" y2="5.475"/>
-    <svg:polygon style="fill: #000000" points="3.45,4.75 2.9625,5.25 3.45,5.75 "/>
-    <svg:polygon style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" points="3.45,4.75 
2.9625,5.25 3.45,5.75 "/>
-    <svg:polygon style="fill: #000000" points="4.0523,4.7429 3.5648,5.2429 4.0523,5.7429 "/>
-    <svg:polygon style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" 
points="4.0523,4.7429 3.5648,5.2429 4.0523,5.7429 "/>
+    <svg:polygon style="fill: #000000; stroke-width: 0.1; stroke: #000000" points="3.45,4.75 2.9625,5.25 
3.45,5.75 "/>
+    <svg:polygon style="fill: #000000; stroke-width: 0.1; stroke: #000000" points="4.0523,4.7429 
3.5648,5.2429 4.0523,5.7429 "/>
   </svg:svg>
 </shape>
diff --git a/shapes/BPMN/Looping-Collapsed-Sub-Process.shape b/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
index 3c35e67..7dbcfa4 100644
--- a/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
+++ b/shapes/BPMN/Looping-Collapsed-Sub-Process.shape
@@ -19,16 +19,10 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
-    <svg:rect style="fill: default" x="5" y="5" width="1" height="1"/>
-    <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="5" y="5" width="1" 
height="1"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
+    <svg:rect style="fill: default; stroke-width: 0.1; stroke: #000000" x="5" y="5" width="1" height="1"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="5.5" y1="5.25" 
x2="5.5" y2="5.75"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="5.25" y1="5.5" 
x2="5.75" y2="5.5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
     <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 3.7 5.75 C 3,5.4 
3.25,4.4 3.95,4.4 C 4.65,4.4 5,5.3 4.25,5.8"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="3.675" y1="5.75" 
x2="3.625" y2="5.4"/>
     <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="3.725" y1="5.75" 
x2="3.325" y2="5.75"/>
diff --git a/shapes/BPMN/Multiple-Instance-Task.shape b/shapes/BPMN/Multiple-Instance-Task.shape
index 844ac62..be77128 100644
--- a/shapes/BPMN/Multiple-Instance-Task.shape
+++ b/shapes/BPMN/Multiple-Instance-Task.shape
@@ -19,15 +19,8 @@
   <aspectratio type="free"/>
   <textbox x1="0.25" y1="0.25" x2="8.75" y2="5.75"/>
   <svg:svg>
-    <svg:path style="fill: default" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 
2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
-    <svg:path style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 
C 9,0 9,0 9,1 C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="6" x2="8" 
y2="6"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="9" y1="1" x2="9" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="0" y1="1" x2="0" 
y2="5"/>
-    <svg:line style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x1="1" y1="0" x2="8" 
y2="0"/>
-    <svg:rect style="fill: #000000" x="4.15" y="4.755" width="0.225" height="0.95"/>
-    <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="4.15" y="4.755" 
width="0.225" height="0.95"/>
-    <svg:rect style="fill: #000000" x="4.65" y="4.75" width="0.2325" height="0.95"/>
-    <svg:rect style="fill: none; fill-opacity:0; stroke-width: 0.1; stroke: #000000" x="4.65" y="4.75" 
width="0.2325" height="0.95"/>
+    <svg:path style="fill: default; stroke-width: 0.1; stroke: #000000" d="M 1 0 C 2,0 7,0 8,0 C 9,0 9,0 9,1 
C 9,2 9,4 9,5 C 9,6 9,6 8,6 C 7,6 2,6 1,6 C 0,6 0,6 0,5 C 0,4 0,2 0,1 C 0,0 0,0 1,0z"/>
+    <svg:rect style="fill: #000000; stroke-width: 0.1; stroke: #000000" x="4.15" y="4.755" width="0.225" 
height="0.95"/>
+    <svg:rect style="fill: #000000; stroke-width: 0.1; stroke: #000000" x="4.65" y="4.75" width="0.2325" 
height="0.95"/>
   </svg:svg>
 </shape>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]