Merge branch 'master' into router

compiler/geometry.py

@@ -1,9 +1,9 @@
 """
 This provides a set of useful generic types for the gdsMill interface. 
 """
-import tech
 import debug
 from vector import vector
+from tech import GDS
 
 class geometry:
     """
@@ -97,14 +97,19 @@ class path(geometry):
 class label(geometry):
     """Represents a text label"""
 
-    def __init__(self, text, layerNumber, offset, zoom=1):
+    def __init__(self, text, layerNumber, offset, zoom=-1):
         """Initializes a text label for specified layer"""
         geometry.__init__(self)
         self.name = "label"
         self.text = text
         self.layerNumber = layerNumber
         self.offset = vector(offset).snap_to_grid()
-        self.zoom = zoom
+        if zoom<0:
+            self.zoom = GDS["zoom"]
+        else:
+            self.zoom = zoom
+
+
         self.size = 0
 
         debug.info(3,"creating label " + self.text + " " + str(self.layerNumber) + " " + str(self.offset))

compiler/hierarchy_layout.py

@@ -126,7 +126,7 @@ class layout:
                        offset=offset)
 
 
-    def add_label(self, text, layer, offset=[0,0],zoom=0.05):
+    def add_label(self, text, layer, offset=[0,0],zoom=-1):
         """Adds a text label on the given layer,offset, and zoom level"""
         # negative layers indicate "unused" layers in a given technology
         layerNumber = techlayer[layer]