From a81a8cdbc8c204bc8d7e271536b1612169a8cebc Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 10 Feb 2019 16:03:46 +0100
Subject: [PATCH] Modified edge transformation to maintain the orientation
 paradigm

When the transformation is mirroring, edges now swap their
points to maintain the right-is-inside paradigm.
---
 src/db/db/dbEdge.h               |  20 +++++++++++++++++---
 src/db/unit_tests/dbEdge.cc      |   8 +++++++-
 testdata/algo/deep_edges_au1.gds | Bin 0 -> 7406 bytes
 testdata/algo/deep_edges_au2.gds | Bin 0 -> 1898 bytes
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 testdata/algo/deep_edges_au1.gds
 create mode 100644 testdata/algo/deep_edges_au2.gds

diff --git a/src/db/db/dbEdge.h b/src/db/db/dbEdge.h
index e3959c620..923125e52 100644
--- a/src/db/db/dbEdge.h
+++ b/src/db/db/dbEdge.h
@@ -336,7 +336,14 @@ public:
   template <class Tr>
   edge<C> &transform (const Tr &t)
   {
-    *this = edge<C> (t * m_p1, t * m_p2);
+    if (t.is_mirror ()) {
+      //  NOTE: in case of mirroring transformations we swap p1 and p2. The reasoning is that
+      //  this way we maintain the orientation semantics: "right" of the edge is "inside" of
+      //  an area.
+      *this = edge<C> (t * m_p2, t * m_p1);
+    } else {
+      *this = edge<C> (t * m_p1, t * m_p2);
+    }
     return *this;
   }
 
@@ -353,7 +360,14 @@ public:
   template <class Tr>
   edge<typename Tr::target_coord_type> transformed (const Tr &t) const
   {
-    return edge<typename Tr::target_coord_type> (t * m_p1, t * m_p2);
+    if (t.is_mirror ()) {
+      //  NOTE: in case of mirroring transformations we swap p1 and p2. The reasoning is that
+      //  this way we maintain the orientation semantics: "right" of the edge is "inside" of
+      //  an area.
+      return edge<typename Tr::target_coord_type> (t * m_p2, t * m_p1);
+    } else {
+      return edge<typename Tr::target_coord_type> (t * m_p1, t * m_p2);
+    }
   }
 
   /**
@@ -914,7 +928,7 @@ public:
   }
 
   /**
-   *  @brief Swap the points of the edge
+   *  @brief Swaps the points of the edge
    */
   edge<C> &swap_points () 
   {
diff --git a/src/db/unit_tests/dbEdge.cc b/src/db/unit_tests/dbEdge.cc
index 940e7a474..319fd1f5f 100644
--- a/src/db/unit_tests/dbEdge.cc
+++ b/src/db/unit_tests/dbEdge.cc
@@ -29,6 +29,7 @@
 TEST(1) 
 {
   db::Edge e (0, 0, 100, 200);
+  db::Edge ee;
   db::Edge empty;
 
   EXPECT_EQ (empty.is_degenerate (), true);
@@ -53,6 +54,12 @@ TEST(1)
   EXPECT_EQ (e.to_string (), "(0,0;100,200)");
   EXPECT_EQ (e.swapped_points ().to_string (), "(100,200;0,0)");
   EXPECT_EQ (e.to_string (), "(0,0;100,200)");
+  EXPECT_EQ (e.transformed (db::Trans (1)).to_string (), "(0,0;-200,100)");
+  EXPECT_EQ (e.transformed (db::Trans (5)).to_string (), "(200,100;0,0)");   //  mirroring transformations swap points
+  ee = e;
+  ee.transform (db::Trans (5));
+  EXPECT_EQ (ee.to_string (), "(200,100;0,0)");
+  EXPECT_EQ (e.swapped_points ().to_string (), "(100,200;0,0)");
   e.swap_points ();
   EXPECT_EQ (e.to_string (), "(100,200;0,0)");
 
@@ -66,7 +73,6 @@ TEST(1)
   EXPECT_EQ (e.shifted (2).to_string (), "(0,4;10,12)");
   EXPECT_EQ (e.shifted (1).to_string (), "(0,3;10,11)");
 
-  db::Edge ee;
   ee = e;
   ee.shift (2);
   EXPECT_EQ (ee.to_string (), "(0,4;10,12)");
diff --git a/testdata/algo/deep_edges_au1.gds b/testdata/algo/deep_edges_au1.gds
new file mode 100644
index 0000000000000000000000000000000000000000..5400803328cc8e406195caf88e9674d89c83e63c
GIT binary patch
literal 7406
zcmb7|&5ImW6vb~>byt66l4#Pa5JZE5f<`e>kzkle#0(>&j6=|7Ao&9n1SN>51Y#f>
zgn+K1iy#;maU}?W%u2+?tg>(+C=zfj3}iKf)8)DM)~$3^=2hJ{&~qE!`PDh^qu#4(
z$|y<RqJy2J{|_ZJqP=v0_RoH&L6W_;@G{Xj?Hxby`3sA`{jl-k$(v7K`)0C22YX>|
zlw~W+CzjqM>JEvr-3hLr?MVpVAL0Lly(#|Vx(}pzzI`swr;l+Z>ikLF2c49tDfz-r
zk*QJH)91yMCA^R7hWj;5pkBuZHNRf*YN7J$p#F}cM6J|x-R%X+5=KxwgA<Ubo#)+N
zqUMBAl&F=WiQ5a5CG=8AbqGG|TD|jCs;M*e&lf0FOZAStQkF1+I>e*FN%3*cSE)wA
zC`#2rMT|TsOIV|_@cp&DhWYvo`^Fj)eq31_jTEafSC7U}s%DBky<V#3gnkMm@t3Gk
z{Rx>8H6<rws6q`YCSjqrq_aDA8lJEGLZ1J32V;1FD1EpxhK-b{i9YdD7!6gUvZv3B
zDNA^d>Qm!MH^{PurPI$+cSJPWXQ$pApKH_ia79w@om)p6JG5p8I_HUS1<d1>z!hp5
zyH0V|23LPEl4Gsjd!|%V`eV%6D%3({E0sBDN(c|ADS1cg?AmIe3bjzf54>JXK~3rJ
zQk`CfTB!b-*NZ8rsW+DD^eWUs(b((76x4i|admlN#XpHPyUNu+8m7h`_jL@VYNpuJ
zn^4u3)Jx(1r}QW&)b6)26x75!q?anyLZwH2UP@WQ8r85fZr{aTnqds@;(@yQ%-2Y<
z8l(Pi45ezO*t62F1}{}}LO+EaX1}OW{Rx>8H6^=as6q`YCSjqrq_g)|a5Qiy;)KTR
zO0BJ^7Amj~8>nK{?z9eDC`;&HhnuUsQ|CF?+I|@HGBs8dPDwwdYNcvtN`n_umas+*
z!p|#Pm*8_e&$ljNb^TIV^Np0KsrR9u!l|HYRQB|FF=Yw;l=f$MSnJ$RKCe<ONxhWz
z3u>W;hkahAwxkuR(==aLNdu+!{1HPzEeX9;sTQg~@Odd^32Rg@)Gw?eytkzvY3-h_
zc(qVa%bQpPg*P#y;5oaqHF<%ugkB0ez<0PSuWId|^Ld#Xv-~M$+fAujsqCuPiz!Q3
zqxzxw!a0KXoarsC`Og)v77A*42k}y+TBzwQpO;dW&`WWDKrU+SyyEjJ)kui7=%hHI
zsHM`P&r2yw=%qB_@P^jW_dc&uEeXApCWKn3;SHacsV%9GQuVH5TIZgNp`ez8UaC|J
zwd<JAODRieRLlD|epy~#SbFt!Y*Tor9_-V%Z+TnB_4rTrta{t%jd0ueTDa|@jd0r&
z^WnB5SHf*C-3hmydM4bqd_LT^di!2m+phrn>}AhGwP&y3JGN4N{F1fx>wQmb4V0>t
zsy%zPP?oSpH9UK5p2B`TkEE#m+m%(=LP1RvJcD_uQY}<A@AFd168fn#k8{6>xcU<o
zYC3x}hAPxT`4ci_32RitnYZ~BsLPly)c(cF7`9OTi&#-##!#wOD!c6UV#*SFDWbQJ
zFs0SouTo8ur~LiGic+;ye?q1#p`SYQzEWKM{VLRS_T3n&Pz&Wx$Q1XhNGfLmPLyt!
F{s%gFouvQ(

literal 0
HcmV?d00001

diff --git a/testdata/algo/deep_edges_au2.gds b/testdata/algo/deep_edges_au2.gds
new file mode 100644
index 0000000000000000000000000000000000000000..022d4132e7bc8c8094ebf31e19bed99350e80be7
GIT binary patch
literal 1898
zcmb7EJud`N6g~TPyxkqF_0?=dC=@D!L_`Q8VMCUzjfnUWDxE~4qS907`~`(tL8GUT
zNOY1-RN~_~civ7IJf3FmWX?JFdoDDTT0>V#W$vI5q6OpV`}~fq(u<`Tpd;NdIlVW!
zaDGx7n>`&kK3uP&tHG@cwXRmC%PT;T19Y=^*LelL_sTQdlID|s3u$9sw~Tq~6APrS
z5wv=!0JR^nX+@n-HM(P&T_D}V$lH<q9LuQ^wlOca#+Y5PHdY3|b|9;Dsk}ObAOym;
zxEoDU@7pFlvPP-%XEdz+fa+pu2cQSmec<r$g%kVvdj`+<wwpomKQj<^uG1J%=Q<NJ
zaL$`W7wx>C@4rpXsj@MeE=A2ITqa^UC&!(7w3B;%1o8!c6<73v**%E$RS7#^5Y@+)
z)I0x6hQc=5W@@xwEY7Gsib3mNm#Ct8pql;b;-5w~dq?YEmu0h_C{zEsaKry{gxgIU
z9Qk&m&W4)(kE+g&RE+6)3q%!X=&Lg3X@jS)YHjAsFILRvM)6|!t1R29bk#SOsNxJ`
z)gL#GSH4mz&n>a(ykprmd-0+R72PL(uiv-?7A_~QR|4xec4OT&H`YJp#)c2v*u<?H
Tn;&#zl^r*>arJ?*gF%3IEfw?l

literal 0
HcmV?d00001