fixed a couple of bugs

Author: wsteffe

grain.xml

@@ -3,7 +3,7 @@
  <name>layoutDD</name>
  <token/>
  <hidden>false</hidden>
- <version>0.4.2</version>
+ <version>0.4.3</version>
  <api-version/>
  <title>layoutDD</title>
  <doc>Provides commands for Decomposition of Layout in a set of Subdomains.</doc>

pymacros/layoutDD.lym

@@ -28,6 +28,10 @@ if sys.platform=="win32":
   FCbinPath =os.path.realpath(FCdir+"/bin")
   if not FCbinPath in sys.path:
      sys.path.append(FCbinPath)
+elif sys.platform=="linux":
+  FCpath=os.path.realpath("/usr/local/lib/")
+  if not FCpath in sys.path:
+     sys.path.append(FCpath)
 
 #pya.MessageBox.info("Information", "This is the new macro created with the sample macro package", pya.MessageBox.Ok)
 

python/layoutDD/loaders.py

@@ -8,8 +8,18 @@ def saveFlatDXF(fpath):
     tdoc = ezdxf.new()
     importer = Importer(sdoc,tdoc)
     smsp= sdoc.modelspace()
-    exploded=disassemble.recursive_decompose(smsp)
-    importer.import_entities(exploded)
+    tmsp= tdoc.modelspace()
+    decomposed=disassemble.recursive_decompose(smsp)
+    to_keep=["LINE","POINT","VERTEX","SPLINE","CIRCLE","ARC","ELLIPSE","POLYLINE","LWPOLYLINE"]
+    to_explode=["POLYLINE","LWPOLYLINE"]
+    for entity in decomposed:
+        if entity.dxftype() in to_keep:
+            importer.import_entity(entity)
+    for entity in tmsp:
+        if entity.dxftype() in to_explode:
+            entity.explode()
+
+#   importer.import_entities(decomposed)
     tdoc.saveas(fpath+"_flat.dxf")
 
 def saveStack(stack_path,stack):
@@ -129,7 +139,7 @@ def openProject():
         cellView = layoutView.cellview(cellViewId)
         cellLayout= cellView.layout()
         if os.path.exists(partitionPath+".lyp"):
-           cellView.load_layer_props(partitionPath+".lyp",cellViewId)
+           layoutView.load_layer_props(partitionPath+".lyp",cellViewId)
 
 
 

python/layoutDD/subdomains.py

@@ -284,7 +284,11 @@ def interceptedLayer(layerName,cellName):
     if cellName not in globalVar.partition_stack:
         return False
     [prefix,z0,z1,op,order]=globalVar.stack[layerName]
+    z0=float(z0)
+    z1=float(z1)
     [cell_z0,cell_z1]=globalVar.partition_stack[cellName]
+    cell_z0=float(cell_z0)
+    cell_z1=float(cell_z1)
     return z0<=cell_z1 and z1>=cell_z0
 
 
@@ -625,7 +629,7 @@ def makeLayerFaces2(lname,FCclipShape,FClayerShape,FC_unit,db_unit,useAllClipPol
        else:
           slicedFace=[]
        layerFaces=[]
-       shift=2/FC_unit #2 um
+       shift=3/FC_unit #3 um
        for face in slicedFace:
          Pc=getPointInFace(face,shift)
          xc=Pc[0]*FC_unit/db_unit
@@ -785,8 +789,16 @@ def addHSurf(doc,profile):
       z1i=float(z1i)
       z0i=max(cell_z0,z0i)
       z1i=min(cell_z1,z1i)
+      if opi=='vsurf' or opi=='hsurf':
+         shapeType="surf"
+      elif opi=='add' or opi=='ins':
+         shapeType="solid"
+      else:
+         shapeType="solid"
       if z1i<z0i:
           continue
+      if z1i==z0i and shapeType=="solid":
+          continue
       if prefix:
          label=prefix+"_"+lname
       else:
@@ -885,12 +897,6 @@ def addHSurf(doc,profile):
          surf=addHSurf(FCdoc,wires)
          surf.Label = f'{lname}_surf'
          layerBody.addObject(surf)
-      if opi=='vsurf' or opi=='hsurf':
-         shapeType="surf"
-      elif opi=='add' or opi=='ins':
-         shapeType="solid"
-      else:
-         shapeType="solid"
       FCdoc.recompute()
       if opi=='ins' or opi=='cut' and shapeType=="solid":
            tool=None
@@ -1036,16 +1042,16 @@ def extractSubdomainDXF(cellName,layoutView,dxf_unit):
       for entity in msp:
          if not entity.dxf.hasattr("layer"):
              continue
-         if interceptedLayer(entity.dxf.layer,cell.name):
-            interceptedLayers.add(entity.dxf.layer)
-            if entity.dxftype() in extractedTypes:
-              bb = bbox.extents([entity])
-              ll=bb.extmin
-              ur=bb.extmax
-              kbb= pya.Box(ll[0]*dxf_unit/dbu,ll[1]*dxf_unit/dbu,ur[0]*dxf_unit/dbu,ur[1]*dxf_unit/dbu)
-              touchPoly=[poly for poly in cellShape.each_touching(kbb)]
-              if len(touchPoly)>0:
-                 exporter.write(entity)
+         if entity.dxftype() in extractedTypes:
+            if interceptedLayer(entity.dxf.layer,cell.name):
+               interceptedLayers.add(entity.dxf.layer)
+               bb = bbox.extents([entity])
+               ll=bb.extmin
+               ur=bb.extmax
+               kbb= pya.Box(ll[0]*dxf_unit/dbu,ll[1]*dxf_unit/dbu,ur[0]*dxf_unit/dbu,ur[1]*dxf_unit/dbu)
+               touchPoly=[poly for poly in cellShape.each_touching(kbb)]
+               if len(touchPoly)>0:
+                  exporter.write(entity)
     finally:
       exporter.close()
       mainDoc.close()