From 8cc2d9f06ee62f4ff9855c80fa9cbfe61b7c9477 Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 9 Dec 2019 13:44:19 +0100
Subject: [PATCH] Allow 45/135 degrees edges in Hurricane::Rectilinear.

---
 documentation/examples/scripts/rectilinear.py | 82 +++++++++++++++++++
 hurricane/src/hurricane/Rectilinear.cpp       |  6 +-
 2 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 documentation/examples/scripts/rectilinear.py

diff --git a/documentation/examples/scripts/rectilinear.py b/documentation/examples/scripts/rectilinear.py
new file mode 100644
index 00000000..64480a9f
--- /dev/null
+++ b/documentation/examples/scripts/rectilinear.py
@@ -0,0 +1,82 @@
+#!/usr/bin/python
+
+import sys
+from   Hurricane import *
+from   CRL       import *
+
+
+def toDbU    ( l ): return DbU.fromLambda(l)
+def toMicron ( u ): return DbU.toPhysical( u, DbU.UnitPowerMicro )
+
+
+def doBreak ( level, message ):
+    UpdateSession.close()
+    Breakpoint.stop( level, message )
+    UpdateSession.open()
+
+
+def buildRectilinear ( editor ):
+    UpdateSession.open()
+
+    cell = AllianceFramework.get().createCell( 'Rectilinear' )
+    cell.setTerminal( True )
+
+    cell.setAbutmentBox( Box( toDbU(-5.0), toDbU(-5.0), toDbU(65.0), toDbU(75.0) ) )
+   #cell.setAbutmentBox( Box( toDbU(-5.0), toDbU(-5.0), toDbU(21.0), toDbU(35.0) ) )
+
+    if editor:
+      UpdateSession.close()
+      editor.setCell( cell )
+      editor.fit()
+      UpdateSession.open()
+    
+    technology = DataBase.getDB().getTechnology()
+    metal1     = technology.getLayer( "METAL1"     ) 
+    metal2     = technology.getLayer( "METAL2"     ) 
+    metal3     = technology.getLayer( "METAL3"     ) 
+    metal4     = technology.getLayer( "METAL4"     ) 
+    poly       = technology.getLayer( "POLY"       )
+    ptrans     = technology.getLayer( "PTRANS"     )
+    ntrans     = technology.getLayer( "NTRANS"     )
+    pdif       = technology.getLayer( "PDIF"       )
+    ndif       = technology.getLayer( "NDIF"       )
+    contdifn   = technology.getLayer( "CONT_DIF_N" )
+    contdifp   = technology.getLayer( "CONT_DIF_P" )
+    nwell      = technology.getLayer( "NWELL"      )
+    contpoly   = technology.getLayer( "CONT_POLY"  )
+    ntie       = technology.getLayer( "NTIE"       )
+
+
+    net = Net.create( cell, 'my_net' )
+    net.setExternal( True )
+
+    points = [ Point( toDbU(  0.0), toDbU(  0.0) )
+             , Point( toDbU(  0.0), toDbU( 10.0) )
+             , Point( toDbU( 20.0), toDbU( 30.0) )
+             , Point( toDbU( 30.0), toDbU( 30.0) )
+             , Point( toDbU( 30.0), toDbU( 20.0) )
+             , Point( toDbU( 10.0), toDbU(  0.0) ) ]
+    r = Rectilinear.create( net, metal2, points )
+
+
+   #print 'Normalized and manhattanized contour:'
+   #i = 0
+   #for point in p.getMContour():
+   #  print '| %d '%i, point \
+   #      , '[%fum %fum]' % ( toMicron(point.getX()) \
+   #                        , toMicron(point.getY()) )
+   #  i += 1
+
+    UpdateSession.close()
+
+    Gds.save( cell )
+    return
+
+
+def ScriptMain ( **kw ):
+    editor = None
+    if kw.has_key('editor') and kw['editor']:
+      editor = kw['editor']
+
+    buildRectilinear( editor )
+    return True 
diff --git a/hurricane/src/hurricane/Rectilinear.cpp b/hurricane/src/hurricane/Rectilinear.cpp
index 90c4e9f5..e43d0062 100644
--- a/hurricane/src/hurricane/Rectilinear.cpp
+++ b/hurricane/src/hurricane/Rectilinear.cpp
@@ -62,8 +62,10 @@ namespace Hurricane {
     for ( size_t i=0 ; i<points.size() ; ++i ) {
       size_t j = (i+1) % points.size();
 
-      if (   (points[i].getX() != points[j].getX())
-         and (points[i].getY() != points[j].getY()) )
+      DbU::Unit dx = std::abs( points[i].getX() - points[j].getX() );
+      DbU::Unit dy = std::abs( points[i].getY() - points[j].getY() );
+
+      if ( (dx != 0) and (dy != 0) and (dx != dy) )
          throw Error( "Rectilinear::create(): Can't create, non H/V edge (points %d:%s - %d:%s)."
                     , i, getString(points[i]).c_str(), j, getString(points[j]).c_str() );
     }