From 4b2c120478d75d44275f0fb8434869cc561684b7 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Sat, 22 May 2021 14:57:25 +0200
Subject: [PATCH] More comprehensive warning for offgrid shapes in
 GdsStream::xyToComponent().

---
 crlcore/src/ccore/gds/GdsDriver.cpp |  2 ++
 crlcore/src/ccore/gds/GdsParser.cpp | 22 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/crlcore/src/ccore/gds/GdsDriver.cpp b/crlcore/src/ccore/gds/GdsDriver.cpp
index f93f1205..93a20bb4 100644
--- a/crlcore/src/ccore/gds/GdsDriver.cpp
+++ b/crlcore/src/ccore/gds/GdsDriver.cpp
@@ -678,6 +678,7 @@ namespace {
 
   GdsStream& GdsStream::operator<< ( Points points )
   {
+  //cerr << "GdsStream::operator<<(Points&) " << points.getSize() << endl;
     GdsRecord record ( GdsRecord::XY );
     Point first = points.getFirst();
     for ( Point p : points ) {
@@ -703,6 +704,7 @@ namespace {
 
   GdsStream& GdsStream::operator<< ( const vector<Point>& points )
   {
+  //cerr << "GdsStream::operator<<(vector<Points>&) " << points.size() << endl;
     GdsRecord record ( GdsRecord::XY );
     for ( Point p : points ) {
       record.push( (int32_t)toGdsDbu(p.getX()) );
diff --git a/crlcore/src/ccore/gds/GdsParser.cpp b/crlcore/src/ccore/gds/GdsParser.cpp
index 19c6982a..1af7d891 100644
--- a/crlcore/src/ccore/gds/GdsParser.cpp
+++ b/crlcore/src/ccore/gds/GdsParser.cpp
@@ -1331,15 +1331,31 @@ namespace {
     
     vector<Point>   points;
     vector<int32_t> coordinates = _record.getInt32s();
+    vector<size_t>  offgrids;
     for ( size_t i=0 ; i<coordinates.size() ; i += 2 ) {
       points.push_back( Point( coordinates[i  ]*_scale
                              , coordinates[i+1]*_scale ) );
       if ( (points.back().getX() % oneGrid) or (points.back().getX() % oneGrid) ) {
-        cerr << Error( "GdsStream::xyToComponent(): Offgrid %s (foundry grid: %s)."
-                     , getString(points.back()).c_str()
-                     , DbU::getValueString(oneGrid).c_str() ) << endl;
+        offgrids.push_back( i );
       }
     }
+    if (not offgrids.empty()) {
+      size_t offgrid = 0;
+      ostringstream m;
+      for ( size_t i=0 ; i<points.size() ; ++i ) {
+        if (i) m << "\n";
+        m << "        | " << points[i];
+        if ((offgrid < offgrids.size()) and (i == offgrid)) {
+          m << " offgrid";
+          ++offgrid;
+        }
+      }
+      cerr << Error( "GdsStream::xyToComponent(): Offgrid points on layer \"%s\" (foundry grid: %s).\n"
+                     "%s"
+                   , getString(layer->getName()).c_str()
+                   , DbU::getValueString(oneGrid).c_str()
+                   , m.str().c_str() ) << endl;
+    } 
 
     _stream >> _record;