Merge branch 's8_update' into dev

Add lpp to addText(), remove reference to specific technology in gdsMill

compiler/base/geometry.py

@@ -329,6 +329,7 @@ class label(geometry):
         debug.info(4, "writing label (" + str(self.layerNumber) + "): " + self.text)
         new_layout.addText(text=self.text,
                            layerNumber=self.layerNumber,
+                           purposeNumber=self.layerPurpose,
                            offsetInMicrons=self.offset,
                            magnification=self.zoom,
                            rotate=None)

compiler/base/pin_layout.py

@@ -378,6 +378,7 @@ class pin_layout:
         # imported into Magic.
         newLayout.addText(text=self.name,
                           layerNumber=layer_num,
+                          purposeNumber=purpose,
                           offsetInMicrons=self.center(),
                           magnification=GDS["zoom"],
                           rotate=None)

compiler/gdsMill/gdsMill/gdsPrimitives.py

@@ -1,12 +1,5 @@
 import math
 
-from globals import OPTS
-# default purpose layer is used for addText() in vlsiLayout.py
-if OPTS.tech_name == "s8":
-    purposeLayer=20
-else:
-    purposeLayer=0
-
 class GdsStructure:
     """Class represent a GDS Structure Object"""
     def __init__(self):
@@ -147,7 +140,7 @@ class GdsText:
         self.elementFlags=""
         self.plex=""
         self.drawingLayer=""
-        self.purposeLayer=purposeLayer
+        self.purposeLayer=0
         self.transFlags=[0,0,0]
         self.magFactor=""
         self.rotateAngle=""

compiler/gdsMill/gdsMill/vlsiLayout.py

@@ -406,10 +406,11 @@ class VlsiLayout:
         #add the sref to the root structure
         self.structures[self.rootStructureName].paths.append(pathToAdd)
 
-    def addText(self, text, layerNumber=0, offsetInMicrons=(0,0), magnification=0.1, rotate = None):
+    def addText(self, text, layerNumber=0, purposeNumber=0, offsetInMicrons=(0,0), magnification=0.1, rotate = None):
         offsetInLayoutUnits = (self.userUnits(offsetInMicrons[0]),self.userUnits(offsetInMicrons[1]))
         textToAdd = GdsText()
         textToAdd.drawingLayer = layerNumber
+        textToAdd.purposeLayer = purposeNumber
         textToAdd.coordinates = [offsetInLayoutUnits]
         textToAdd.transFlags = [0,0,0]
         textToAdd.textString = self.padText(text)
@@ -910,4 +911,3 @@ def boundaryArea(A):
     """
     area_A=(A[2]-A[0])*(A[3]-A[1])
     return area_A
-