GNOME.org
 

[dia] [custom] a bug was hiding some main point misplacements

commit 97add178fedc641344cb813edb682c45c8c4817f
Author: Hans Breuer <hans breuer org>
Date:   Sun Jun 30 11:57:09 2013 +0200

    [custom] a bug was hiding some main point misplacements
    
    The main point is supposed to be within the object, but
    to check against that first it had to be detected as such.
    
    The semi-automatic adding of main points some years ago
    left some room for improvement.
    
    Also fix some shape definitions regarding their line vs.
    polygon/beziergon use.

 shapes/Assorted/arrow-left-up.shape   |    2 +-
 shapes/ChemEng/centrifuge.shape       |    2 +-
 shapes/Cisco/dot_dot.shape            |    2 --
 shapes/Cisco/pad.shape                |    2 +-
 shapes/Cisco/terminal_server.shape    |    2 +-
 shapes/Civil/bvrest.shape             |    3 ++-
 shapes/Civil/hrest.shape              |    2 +-
 shapes/Civil/vrest.shape              |    2 +-
 shapes/MSE/demultiplexer.shape        |    6 ++----
 shapes/MSE/large_extension_node.shape |   11 ++---------
 shapes/MSE/multiplexer.shape          |    6 ++----
 shapes/MSE/tacsat.shape               |    8 ++------
 shapes/Map/Isometric/Corner1.shape    |    2 +-
 shapes/Map/Isometric/Corner2.shape    |    2 +-
 14 files changed, 18 insertions(+), 34 deletions(-)
---
diff --git a/shapes/Assorted/arrow-left-up.shape b/shapes/Assorted/arrow-left-up.shape
index dfd8b89..add7e1f 100644
--- a/shapes/Assorted/arrow-left-up.shape
+++ b/shapes/Assorted/arrow-left-up.shape
@@ -50,7 +50,7 @@
     <point x="1" y="6"/>
     <point x="2" y="6.5"/>
     <point x="4" y="6"/>
-    <point x="3.47826086956522" y="3.56521739130435" main="yes"/>
+    <point x="5" y="5" main="yes"/>
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg>
diff --git a/shapes/ChemEng/centrifuge.shape b/shapes/ChemEng/centrifuge.shape
index 3f8cc0e..a0b943d 100644
--- a/shapes/ChemEng/centrifuge.shape
+++ b/shapes/ChemEng/centrifuge.shape
@@ -15,7 +15,7 @@
     <point x="2" y="3.5"/>
     <point x="2.5" y="3.5"/>
     <point x="3" y="3.5"/>
-    <point x="2.375" y="1.5" main="yes"/>
+    <point x="2.5" y="3" main="yes"/>
   </connections>
   <svg:svg>
     <svg:polygon style="fill:default; stroke:none" points="0,0 1,0 1,2.5 3.5,2.5 3.5,0 4.5,0 4.5,3.5 0,3.5"/>
diff --git a/shapes/Cisco/dot_dot.shape b/shapes/Cisco/dot_dot.shape
index ab52bf2..b43d591 100644
--- a/shapes/Cisco/dot_dot.shape
+++ b/shapes/Cisco/dot_dot.shape
@@ -20,7 +20,5 @@
 <point x="4482" y="-7019"/>
 <point x="4316" y="-7029"/>
 <point x="4492" y="-7029"/>
-
-<point x="4403.4" y="-7029" main="yes"/>
 </connections>
 </shape>
diff --git a/shapes/Cisco/pad.shape b/shapes/Cisco/pad.shape
index dab8b74..b3abeba 100644
--- a/shapes/Cisco/pad.shape
+++ b/shapes/Cisco/pad.shape
@@ -44,7 +44,7 @@
 <point x="0" y="1854"/>
 <point x="0" y="2934"/>
 <point x="6510" y="2192"/>
-<point x="1400.71428571429" y="2359.28571428571" main="yes"/>
+<point x="3400" y="2360" main="yes"/>
 </connections>
 
 </shape>
diff --git a/shapes/Cisco/terminal_server.shape b/shapes/Cisco/terminal_server.shape
index 8d980ec..19731de 100644
--- a/shapes/Cisco/terminal_server.shape
+++ b/shapes/Cisco/terminal_server.shape
@@ -44,7 +44,7 @@
 <point x="0" y="1162"/>
 <point x="0" y="2325"/>
 <point x="5825" y="1602"/>
-<point x="1517.57142857143" y="1723.57142857143" main="yes"/>
+<point x="2517.57142857143" y="1723.57142857143" main="yes"/>
 </connections>
 
 </shape>
diff --git a/shapes/Civil/bvrest.shape b/shapes/Civil/bvrest.shape
index 43e304c..7e9f191 100644
--- a/shapes/Civil/bvrest.shape
+++ b/shapes/Civil/bvrest.shape
@@ -6,7 +6,8 @@
 
   <connections>
     <point x="0" y="-.7"/>
-  <point x="0.35" y="0.35" main="yes"/></connections>
+    <point x="0" y="-0.3" main="yes"/>
+  </connections>
 
   <aspectratio type="fixed"/>
 
diff --git a/shapes/Civil/hrest.shape b/shapes/Civil/hrest.shape
index 3f1edfd..65a7ba4 100644
--- a/shapes/Civil/hrest.shape
+++ b/shapes/Civil/hrest.shape
@@ -6,7 +6,7 @@
 
   <connections>
     <point x="-.7" y="0"/>
-  <point x="0.35" y="0.35" main="yes"/></connections>
+  <point x="-0.35" y="0" main="yes"/></connections>
 
   <aspectratio type="fixed"/>
 
diff --git a/shapes/Civil/vrest.shape b/shapes/Civil/vrest.shape
index 8ca18d2..f5fcff1 100644
--- a/shapes/Civil/vrest.shape
+++ b/shapes/Civil/vrest.shape
@@ -6,7 +6,7 @@
 
   <connections>
     <point x="0" y="-0.7"/>
-  <point x="0.35" y="0.35" main="yes"/></connections>
+    <point x="0" y="-0.35" main="yes"/></connections>
 
   <aspectratio type="fixed"/>
 
diff --git a/shapes/MSE/demultiplexer.shape b/shapes/MSE/demultiplexer.shape
index 0456fce..1eac6b1 100644
--- a/shapes/MSE/demultiplexer.shape
+++ b/shapes/MSE/demultiplexer.shape
@@ -16,11 +16,9 @@
     <point x="0" y="8"/>
     <point x="0" y="9"/>
     <point x="0" y="10"/>
-    <point x="5" y="5" main="yes"/>
+    <point x="4" y="5" main="yes"/>
   </connections>
   <svg:svg width="10" height="10">
-    <svg:line x1="10" y1="5" x2="0" y2="0"/>
-    <svg:line x1="10" y1="5" x2="0" y2="10"/>
-    <svg:line x1="0" y1="0" x2="0" y2="10"/>
+    <svg:polygon style="fill: default; stroke: foreground" points="10,5 0,0 0,10 "/>
   </svg:svg>
 </shape>
diff --git a/shapes/MSE/large_extension_node.shape b/shapes/MSE/large_extension_node.shape
index 945f4bf..1834f4e 100644
--- a/shapes/MSE/large_extension_node.shape
+++ b/shapes/MSE/large_extension_node.shape
@@ -15,14 +15,7 @@
     <point x="4" y="3" main="yes"/>
   </connections>
   <svg:svg width="8" height="6">
-    <svg:line x1="0" y1="0" x2="8" y2="0"/>
-    <svg:line x1="0" y1="6" x2="8" y2="6"/>
-    <svg:line x1="0" y1="0" x2="0" y2="6"/>
-    <svg:line x1="8" y1="0" x2="8" y2="6"/>
-
-    <svg:line x1="1" y1="1" x2="7" y2="1"/>
-    <svg:line x1="1" y1="5" x2="7" y2="5"/>
-    <svg:line x1="1" y1="1" x2="1" y2="5"/>
-    <svg:line x1="7" y1="1" x2="7" y2="5"/>
+    <svg:rect style="fill: default; stroke:foreground" x="0" y="0" width="8" height="6" />
+    <svg:rect style="fill: default; stroke:foreground" x="1" y="1" width="6" height="4" />
   </svg:svg>
 </shape>
diff --git a/shapes/MSE/multiplexer.shape b/shapes/MSE/multiplexer.shape
index d6ad537..0f0ae07 100644
--- a/shapes/MSE/multiplexer.shape
+++ b/shapes/MSE/multiplexer.shape
@@ -16,11 +16,9 @@
     <point x="10" y="8"/>
     <point x="10" y="9"/>
     <point x="10" y="10"/>
-    <point x="5" y="5" main="yes"/>
+    <point x="6" y="5" main="yes"/>
   </connections>
   <svg:svg width="10" height="10">
-    <svg:line x1="0" y1="5" x2="10" y2="0"/>
-    <svg:line x1="0" y1="5" x2="10" y2="10"/>
-    <svg:line x1="10" y1="0" x2="10" y2="10"/>
+    <svg:polygon style="fill: default; stroke: foreground" points="0,5 10,0 10,10 "/>
   </svg:svg>
 </shape>
diff --git a/shapes/MSE/tacsat.shape b/shapes/MSE/tacsat.shape
index 8fe23cb..f00e9e3 100644
--- a/shapes/MSE/tacsat.shape
+++ b/shapes/MSE/tacsat.shape
@@ -11,16 +11,12 @@
     <point x="6" y="5" main="yes"/>
   </connections>
   <svg:svg width="12" height="10">
-    <svg:line x1="1" y1="10" x2="5" y2="6"/>
-    <svg:line x1="5" y1="6" x2="9" y2="10"/>
-    <svg:line x1="1" y1="10" x2="9" y2="10"/>
-
-    <svg:line x1="3" y1="0" x2="11" y2="8"/>
+    <svg:polygon style="fill: default; stroke: foreground" points="5,6 9,10 1,10 "/>
+    <svg:path style="fill: default; stroke: foreground" d="M 3 0 C 6.5,3.5 9.10593,5.9646 11,8 C 8.5,10.5 
0.5,2.5 3,0z"/>
 
     <svg:line x1="7" y1="4" x2="12" y2="0"/>
 
     <svg:circle style="fill: #020202" cx="12" cy="0" r=".3"/>
 
-    <svg:path d="M 3,0 C 0.5,2.5 8.5,10.5 11,8"/>
   </svg:svg>
 </shape>
diff --git a/shapes/Map/Isometric/Corner1.shape b/shapes/Map/Isometric/Corner1.shape
index f7c8398..2837cdf 100644
--- a/shapes/Map/Isometric/Corner1.shape
+++ b/shapes/Map/Isometric/Corner1.shape
@@ -28,7 +28,7 @@
     <point x="2.5" y="1.25"/>
     <point x="2.5" y="1.75"/>
     <point x="3" y="2.5"/>
-    <point x="2.40909090909091" y="1.43181818181818" main="yes"/>
+    <point x="1.7" y="1.5" main="yes"/>
   </connections>
 
   <aspectratio type="fixed"/>
diff --git a/shapes/Map/Isometric/Corner2.shape b/shapes/Map/Isometric/Corner2.shape
index e5b6282..433943e 100644
--- a/shapes/Map/Isometric/Corner2.shape
+++ b/shapes/Map/Isometric/Corner2.shape
@@ -27,7 +27,7 @@
     <point x="3" y="0.5"/>
     <point x="4" y="0.5"/>
     <point x="3" y="1.5"/>
-    <point x="2.09090909090909" y="0.772727272727273" main="yes"/>
+    <point x="1.5" y="1" main="yes"/>
   </connections>
   <aspectratio type="fixed"/>
   <svg:svg>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]