From 5b710fa3a44501ef003425d4cd537074f17f6cf1 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 6 Nov 2022 19:02:35 +0100
Subject: [PATCH] More stable result of antenna debug output text placement

---
 src/db/db/dbLayoutToNetlist.cc      |  20 ++++++++------------
 testdata/drc/drcSimpleTests_au5.gds | Bin 9892 -> 9892 bytes
 testdata/drc/drcSimpleTests_au6.gds | Bin 3494 -> 3494 bytes
 testdata/drc/drcSimpleTests_au7.gds | Bin 22060 -> 22060 bytes
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/db/db/dbLayoutToNetlist.cc b/src/db/db/dbLayoutToNetlist.cc
index 8a7255ae8..34e789960 100644
--- a/src/db/db/dbLayoutToNetlist.cc
+++ b/src/db/db/dbLayoutToNetlist.cc
@@ -1409,19 +1409,15 @@ get_merged_shapes_of_net (const db::hier_clusters<db::NetShape> &clusters, db::c
 
   size_t p = 0;
   for (db::recursive_cluster_shape_iterator<db::NetShape> rci (clusters, layer_id, ci, cid); !rci.at_end (); ++rci) {
-    if (p == 0) {
-      db::PolygonRef pr = (rci.trans () * rci->polygon_ref ());
-      db::PolygonRef::polygon_edge_iterator e = pr.begin_edge ();
-      if (! e.at_end ()) {
-        //  pick one reference point for the label
-        if (! any_ref || (*e).p1 () < ref) {
-          ref = (*e).p1 ();
-          any_ref = true;
-        }
-        ep.insert (pr, ++p);
+    db::PolygonRef pr = (rci.trans () * rci->polygon_ref ());
+    db::PolygonRef::polygon_edge_iterator e = pr.begin_edge ();
+    if (! e.at_end ()) {
+      //  pick one reference point for the label
+      if (! any_ref || (*e).p1 () < ref) {
+        ref = (*e).p1 ();
+        any_ref = true;
       }
-    } else {
-      ep.insert (rci.trans () * rci->polygon_ref (), ++p);
+      ep.insert (pr, ++p);
     }
   }
 
diff --git a/testdata/drc/drcSimpleTests_au5.gds b/testdata/drc/drcSimpleTests_au5.gds
index 3902b4aedf2ea902dec38825a01dc33cd2268320..c77c4e703d1679a2730ad4e832a64f384fcf1132 100644
GIT binary patch
delta 114
zcmZ4DyTn(CfsKKQDS|<Uk%|2o12>Q-#303>i_D&=q$-R>cw^L3_Q}Z{@sr~?GQqSO
gCzxjPTQfO<BZ(>E50FY=`Tzfq4v4>5in~i10I=H|J^%m!

delta 118
zcmZ4DyTn(CfsKKQDS|<Uk%|2o12+Q`gBXJz0}C>HqLQjG7U7LiOW7G)CUG1G5pk2%
lI5QbrCQsl@26NdW{`~*{4=54C@&ErH9SA#avlMriGyq3OAW8rL

diff --git a/testdata/drc/drcSimpleTests_au6.gds b/testdata/drc/drcSimpleTests_au6.gds
index 70ac9f50b12c115c3dfdd22db6342ed66e262482..0b311b67b2640b2d3c786375f59dfebd3832b586 100644
GIT binary patch
delta 160
zcmZ1`y-Zq(fsKKQDS|<Uk%|2o12>Q-#303>hs>U+q-u*rn1PFpEhNa%FPMRWg`I&x
th83p)8(V4_WpJ1f<mu<`Ke>=ec(Vc1EH)MfhR6+*<GAEDzv0-$0sw!F7-Rqd

delta 164
zcmZ1`y-Zq(fsKKQDS|<Uk%|2o12+Q;gE)geg90*pqLQjD7GVZ1Hnxx;N55bO1{QV(
y1{qeI25fApWt72TLXfAQyZ_`uCgIHnOtaWH{{R2!!N9=gF!>*+)aExFyI24msvFM$

diff --git a/testdata/drc/drcSimpleTests_au7.gds b/testdata/drc/drcSimpleTests_au7.gds
index e2e886e0026752bdbcb81ceff6d3345a39caa0ae..b96c9dd3cc9da25cf363ce92a1c5546d668b5468 100644
GIT binary patch
delta 223
zcmZ3phH=drMkNL|1}3Hm1{p>s_Gb*-K%NkT6oWo8d!mx6Ef!%0E;hE1AV<Go1_l;(
z1_l{coCa)c*~uu3#e~fPOxxI47#JcqOzz{9n|wi7dGdKq?#*GG5nK>a2XVR07lez1
wxIk(c7?}1jtePyqsjxXmZG|vI#RBWZ&6QS%`5?RkKc~r+Ryv#4dDig&02FC1c>n+a

delta 227
zcmZ3phH=drMkNL|1}3Hm1{p>s_Gb*-3@i-d4EhX;$n1$qs<v2!8MxTkLV_Iqf*BZC
z*cljPSaBM#v1KQtFcuRw2QY18<M{vorw0QAo5N;4&IMd>-ed<csm&LJi-fpf@(imc
m3veoI&QV(-j8OH!Dt2?F)nPt_$OJFD$(2?*o7Z{P@c;l_2sVBI