From c2df163b8afba2ad1960691453cc451b50b89ad9 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 18 Nov 2023 23:27:20 +0100
Subject: [PATCH] Added cell variants to polygon to edge processor

---
 src/db/db/dbCellVariants.cc           |   1 +
 src/db/db/dbRegionProcessors.cc       |   8 +++++++-
 src/db/db/dbRegionProcessors.h        |   1 +
 testdata/drc/drcGenericTests_6.drc    |   2 +-
 testdata/drc/drcGenericTests_au6d.gds | Bin 10026 -> 10480 bytes
 5 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/db/db/dbCellVariants.cc b/src/db/db/dbCellVariants.cc
index ce555dd1a..419d0fcfc 100644
--- a/src/db/db/dbCellVariants.cc
+++ b/src/db/db/dbCellVariants.cc
@@ -325,6 +325,7 @@ VariantsCollectorBase::separate_variants (db::Layout &layout, db::Cell &top_cell
           var_name += "$VAR" + tl::to_string (index);
 
           ci_var = layout.add_cell (var_name.c_str ());
+          m_called.insert (ci_var);
           layout.add_meta_info (ci_var, layout.begin_meta (*c), layout.end_meta (*c));
           copy_shapes (layout, ci_var, *c);
 
diff --git a/src/db/db/dbRegionProcessors.cc b/src/db/db/dbRegionProcessors.cc
index 5931bf3da..529a66a0a 100644
--- a/src/db/db/dbRegionProcessors.cc
+++ b/src/db/db/dbRegionProcessors.cc
@@ -118,7 +118,13 @@ void RelativeExtentsAsEdges::process (const db::Polygon &poly, std::vector<db::E
 
 const TransformationReducer *RelativeExtentsAsEdges::vars () const
 {
-  return & m_anisotropic_reducer;
+  if (fabs (m_fx1) < db::epsilon && fabs (m_fy1) < db::epsilon && fabs (1.0 - m_fx2) < db::epsilon && fabs (1.0 - m_fy2) < db::epsilon) {
+    return 0;
+  } else if (fabs (m_fx1 - m_fy1) < db::epsilon && fabs (1.0 - (m_fx1 + m_fx2)) < db::epsilon  && fabs (m_fx2 - m_fy2) < db::epsilon && fabs (1.0 - (m_fy1 + m_fy2)) < db::epsilon) {
+    return & m_isotropic_reducer;
+  } else {
+    return & m_anisotropic_reducer;
+  }
 }
 
 bool RelativeExtentsAsEdges::result_must_not_be_merged () const
diff --git a/src/db/db/dbRegionProcessors.h b/src/db/db/dbRegionProcessors.h
index 4bd978193..7bb991e42 100644
--- a/src/db/db/dbRegionProcessors.h
+++ b/src/db/db/dbRegionProcessors.h
@@ -282,6 +282,7 @@ public:
 private:
   double m_fx1, m_fy1, m_fx2, m_fy2;
   db::MagnificationAndOrientationReducer m_anisotropic_reducer;
+  db::MagnificationReducer m_isotropic_reducer;
 };
 
 /**
diff --git a/testdata/drc/drcGenericTests_6.drc b/testdata/drc/drcGenericTests_6.drc
index 34eeb7d0c..4b49eab6d 100644
--- a/testdata/drc/drcGenericTests_6.drc
+++ b/testdata/drc/drcGenericTests_6.drc
@@ -28,5 +28,5 @@ l1.drc(middle).output(110, 0)
 l1.drc(middle(as_dots)).output(111, 0)
 l1.drc(middle(as_boxes)).output(112, 0)
 l1.drc(extent_refs(0.0, 0.0, 0.25, 0.5, as_edges)).output(113, 0)
-l1.drc(extent_refs(0.0, 0.0, 0.25, 0.5, 0.5, 1.0, as_boxes)).output(114, 0)
+l1.drc(extent_refs(0.0, 0.0, 0.25, 0.5, as_boxes)).output(114, 0)
 
diff --git a/testdata/drc/drcGenericTests_au6d.gds b/testdata/drc/drcGenericTests_au6d.gds
index 8bf276f1d435179e2cb20b3b5b668f5e1a850ecf..de48275c70e1a78d6b30e1d5c3d0223ea0652bae 100644
GIT binary patch
delta 744
zcmZ4G_aQKffsKKQDS|<Uk%|2|12=;ZgE)f}gEBIkfrE+7$J2>{L4=vr&au<n``Gdi
zmM%N=7tD?dVUS_Psc&LbU_CA)x!BkO9D_ns3>jG18Sojxzz0<s<``tiKu|T%TxSnY
z9~YoXE(QjUjhCh~;&cNKR4vdEVAWhgFgNiCFf+gaiy#i!|NmdLFkqGa|NoZ?SUXs@
zp0EeOPF4Z?5aet=s6!xL#^xBTDo`ARP+<%TH=rS?uEOuA$qh^qyg--m2tk5V#c=Xw
zCRGWD+mKufb=&51Opll*Z(y@ooWssIS%=GE@*7ql=4zOn!)7-*i@Ry^8lYGX7m&?!
zV6qmw)8scmaV;K)$*;JbChKrIOkTqYRLf~Mc@?YEWEmmj$@09tlh<$n#W)-$>#*re
ze#WP;`3G+j%jPIyC&tNlgz7fW5;?#)d6tmV<QO5l#Zh9co1<hvGSWa9S&)o0P)6Er
JbCmoAb^zCvj`aWl

delta 318
zcmewmxXLezfsKKQDS|<Uk%|2&11p0pgCK)Eg9I|0frE+7$J2>{L4=vr&au<n``Gdi
zmM%N=7tD?dVUS_Psc&Lbpg0aAH%l=tXT&8r`4e-*<SIs?%^O&bF-_jaYcu&1hr{F~
zA>+wQIlU(ruscou#BDcu1Gm%SP3(-5jrbiVZ{lm1yotwQauKiH<PSVelQ#j?Z{o6>
zT)^ct*@&}Y@+TlJ0?Hfl0Oh$3Og7+an*51ZXL6Z<!sdPaNi35eh&xPPAnr6dNwjXW
of`}92=0~FY7#Ax@uuguU0F+Sx%E$p_WI-}=`xrMXC|+O(0BNOIfdBvi