Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "Reload Libraries macro issues" #95

Merged
merged 5 commits into from
Jun 10, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions klayout_package/python/kqcircuits/util/layout_to_code.py
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ def get_node_params(node: Node):


def extract_pcell_data_from_views():
"""Remove all PCells and return their data.
"""Remove 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
Expand All @@ -372,7 +372,7 @@ 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():
Expand Down
8 changes: 6 additions & 2 deletions klayout_package/python/scripts/macros/0system/0reload.lym
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ from kqcircuits.util.library_helper import load_libraries
from kqcircuits.util.layout_to_code import extract_pcell_data_from_views, restore_pcells_to_views

views = extract_pcell_data_from_views()
load_libraries(flush=True)
restore_pcells_to_views(views)
try:
load_libraries(flush=True)
restore_pcells_to_views(views)
except:
restore_pcells_to_views(views)
raise RuntimeError("Failed to reload all KQCircuits libraries, restoring current view.")
qpavsmi marked this conversation as resolved.
Show resolved Hide resolved
</text>
</klayout-macro>