Fix "Reload Libraries macro issues"

klayout_package/python/kqcircuits/util/layout_to_code.py

@@ -357,8 +357,19 @@ def get_node_params(node: Node):
     return node_params, elem
 
 
+def remove_kqc_pcells():
+    """Remove all KQCircuits PCells."""
+
+    main_window = pya.Application.instance().main_window()
+    for vid in range(main_window.views()):
+        top_cell = main_window.view(vid).active_cellview().cell
+        for inst in top_cell.each_inst():
+            if isinstance(inst.pcell_declaration(), Element):
+                inst.delete()
+
+
 def extract_pcell_data_from_views():
-    """Remove all PCells and return their data.
+    """Iterate over all KQCircuits PCells and return their data.
 
     Returns: A list of lists. Each element corresponds to a view in KLayout and it is a list of
         ``(type, location, parameters)`` tuples. These tuples completely describe the type, position and
@@ -372,14 +383,13 @@ def extract_pcell_data_from_views():
         pcells = []
         for inst in top_cell.each_inst():
             pc = inst.pcell_declaration()
-            if pc:
+            if isinstance(pc, Element):
                 params = inst.pcell_parameters_by_name()
                 def_params = pc.__class__.get_schema()
                 for k, v in def_params.items():
                     if params[k] == v.default:
                         del params[k]
                 pcells.append((pc.__class__, inst.dtrans, params))
-                inst.delete()
         views.append(pcells)
 
     return views

klayout_package/python/scripts/macros/0system/0reload.lym

@@ -38,10 +38,14 @@ Note that this does not reload the ``defaults`` file.
 """
 
 from kqcircuits.util.library_helper import load_libraries
-from kqcircuits.util.layout_to_code import extract_pcell_data_from_views, restore_pcells_to_views
+from kqcircuits.util.layout_to_code import remove_kqc_pcells, extract_pcell_data_from_views, restore_pcells_to_views
 
 views = extract_pcell_data_from_views()
-load_libraries(flush=True)
+try:
+  load_libraries(flush=True)
+except:
+  raise RuntimeError("Failed to reload KQCircuits libraries, keeping current views.")
+remove_kqc_pcells()
 restore_pcells_to_views(views)
 </text>
 </klayout-macro>