Merge pull request #63 from amccaugh/dev

1.2.2

Author: amccaugh

README.md

@@ -7,7 +7,7 @@ PHotonic and Integrated Device Layout - GDS CAD layout and geometry creation for
 - [**Tutorial + examples**](https://github.com/amccaugh/phidl/blob/master/phidl/phidl_tutorial_example.py#L35) (or [Try now in an interactive notebook](https://mybinder.org/v2/gh/amccaugh/phidl/master?filepath=phidl_tutorial_example.ipynb))
 - [**Geometry + function documentation**](https://phidl.readthedocs.io/)
 - [About PHIDL](#about-phidl)
-- [Changelog](#changelog) (latest update 1.2.1 (January 13, 2020))
+- [Changelog](#changelog) (latest update 1.2.2 (January 17, 2020))
 
 # Installation / requirements
 - Install or upgrade with `pip install -U phidl`
@@ -79,6 +79,12 @@ You can also do things like create a backing fill to make sure the resist develo
 
 # Changelog
 
+## 1.2.2 (January 17, 2020)
+
+### Bugfixes
+- Fixed rare bug with `pg.import_gds()` causing cell name collisions
+- `pg.boolean()` no longer errors when passed empty geometries
+
 ## 1.2.1 (January 13, 2020)
 
 - Maintenance update to work with `gdspy` 1.5

phidl/device_layout.py

@@ -34,7 +34,7 @@
 import gdspy.library
 gdspy.library.use_current_library = False
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'
 
 
 
@@ -634,22 +634,30 @@ def write_gds(self, filename, unit = 1e-6, precision = 1e-9,
         # Autofix names so there are no duplicates
         if auto_rename == True:
             all_cells_sorted = sorted(all_cells, key=lambda x: x.uid)
-            used_names = {'toplevel':1}
+            all_cells_names = [c._internal_name for c in all_cells_sorted]
+            all_cells_original_names = [c.name for c in all_cells_sorted]
+            used_names = {'toplevel'}
+            n = 1
             for c in all_cells_sorted:
                 if max_cellname_length is not None:
                     new_name = c._internal_name[:max_cellname_length]
                 else:
                     new_name = c._internal_name
-                if new_name not in used_names:
-                    used_names[new_name] = 1
-                    c.name = new_name
-                else:
-                    c.name = new_name + ('%0.3i' % used_names[new_name])
-                    used_names[new_name] += 1
+                temp_name = new_name
+                while temp_name in used_names:
+                    n += 1
+                    temp_name = new_name + ('%0.3i' % n)
+                new_name = temp_name
+                used_names.add(new_name)
+                c.name = new_name
             self.name = 'toplevel'
+        # Write the gds
         gdspy.write_gds(filename, cells=all_cells, name='library',
                         unit=unit, precision=precision)
-        self.name = tempname
+        # Return cells to their original names if they were auto-renamed
+        if auto_rename == True:
+            for n,c in enumerate(all_cells_sorted):
+                c.name = all_cells_original_names[n]
         return filename
 
 

phidl/geometry.py

@@ -403,6 +403,8 @@ def boolean(A, B, operation, precision = 1e-4, num_divisions = [1,1],
     Note that 'A+B' is equivalent to 'or', 'A-B' is equivalent to 'not', and
     'B-A' is equivalent to 'not' with the operands switched
     """
+    D = Device('boolean')
+
     A_polys = []
     B_polys = []
     if type(A) is not list: A = [A]
@@ -427,16 +429,27 @@ def boolean(A, B, operation, precision = 1e-4, num_divisions = [1,1],
     elif operation not in ['not', 'and', 'or', 'xor', 'a-b', 'b-a', 'a+b']:
         raise ValueError("[PHIDL] phidl.geometry.boolean() `operation` parameter not recognized, must be one of the following:  'not', 'and', 'or', 'xor', 'A-B', 'B-A', 'A+B'")
 
-    if all(np.array(num_divisions) == np.array([1,1])):
-        p = gdspy.boolean(operand1 = A_polys, operand2 = B_polys, operation = operation, precision=precision,
-                     max_points=max_points, layer=gds_layer, datatype=gds_datatype)
+    # Check for trivial solutions
+    if (len(A_polys) == 0) or (len(B_polys) == 0):
+        if (operation == 'not'):
+            if len(A_polys) == 0:   p = None
+            elif len(B_polys) == 0: p = A_polys
+        elif (operation == 'and'):
+            p = None
+        elif (operation == 'or') or (operation == 'xor'):
+            if (len(A_polys) == 0) and (len(B_polys) == 0): p = None
+            elif len(A_polys) == 0: p = B_polys
+            elif len(B_polys) == 0: p = A_polys
     else:
-        p = _boolean_polygons_parallel(polygons_A = A_polys, polygons_B = B_polys,
-                   num_divisions = num_divisions, operation = operation,
-                   precision = precision)
-            
+        # If no trivial solutions, run boolean operation either in parallel or straight
+        if all(np.array(num_divisions) == np.array([1,1])):
+            p = gdspy.boolean(operand1 = A_polys, operand2 = B_polys, operation = operation, precision=precision,
+                         max_points=max_points, layer=gds_layer, datatype=gds_datatype)
+        else:
+            p = _boolean_polygons_parallel(polygons_A = A_polys, polygons_B = B_polys,
+                       num_divisions = num_divisions, operation = operation,
+                       precision = precision)
 
-    D = Device('boolean')
     if p is not None:
         polygons = D.add_polygon(p, layer = layer)
         [polygon.fracture(max_points = max_points, precision = precision) for polygon in polygons]
@@ -937,6 +950,7 @@ def import_gds(filename, cellname = None, flatten = False):
                         magnification = e.magnification,
                         x_reflection = e.x_reflection,
                         )
+                    dr.owner = D
                     converted_references.append(dr)
                 elif isinstance(e, gdspy.CellArray):
                     dr = CellArray(
@@ -949,6 +963,7 @@ def import_gds(filename, cellname = None, flatten = False):
                         magnification = e.magnification,
                         x_reflection = e.x_reflection,
                         )
+                    dr.owner = D
                     converted_references.append(dr)
             D.references = converted_references
             # Next convert each Polygon

setup.py

@@ -10,7 +10,7 @@
 ]
 
 setup(name='phidl',
-      version='1.2.1',
+      version='1.2.2',
       description='PHIDL',
       install_requires=install_requires,
       author='Adam McCaughan',