Skip to content

FIX: Fix bug #1328 #1330

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all 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
17 changes: 7 additions & 10 deletions src/pyedb/dotnet/database/modeler.py
Original file line number Diff line number Diff line change
Expand Up @@ -289,20 +289,20 @@ def get_primitive_by_layer_and_point(self, point=None, layer=None, nets=None):
if not isinstance(point, list) and len(point) == 2:
self._logger.error("Provided point must be a list of two values")
return False
pt = self._edb.geometry.point_data(point[0], point[1])
if isinstance(nets, str):
nets = [nets]
elif nets and not isinstance(nets, list) and len(nets) == len([net for net in nets if isinstance(net, str)]):
pt = self._edb.geometry.point_data(self._pedb.edb_value(point[0]), self._pedb.edb_value(point[1]))
if nets:
if isinstance(nets, str):
nets = [nets]
_nets = []
for net in nets:
if net not in self._pedb.nets:
self._logger.error(
self._logger.warning(
f"Net {net} used to find primitive from layer point and net not found, skipping it."
)
else:
_nets.append(self._pedb.nets[net].net_obj)
if _nets:
nets = _nets
nets = convert_py_list_to_net_list(_nets)
_obj_instances = list(self._pedb.layout_instance.FindLayoutObjInstance(pt, None, nets).Items)
returned_obj = []
if layer:
Expand All @@ -324,10 +324,7 @@ def get_primitive_by_layer_and_point(self, point=None, layer=None, nets=None):
else:
for obj in _obj_instances:
obj_id = obj.GetLayoutObj().GetId()
[
returned_obj.append(Primitive(p, self._pedb))
for p in [obj for obj in self.primitives if obj.id == obj_id]
]
[returned_obj.append(p) for p in [obj for obj in self.primitives if obj.id == obj_id]]
return returned_obj

def get_polygon_bounding_box(self, polygon):
Expand Down
2 changes: 2 additions & 0 deletions tests/legacy/system/test_edb_modeler.py
Original file line number Diff line number Diff line change
Expand Up @@ -550,6 +550,8 @@ def test_get_primitives_by_point_layer_and_nets(self, edb_examples):
assert primitives[0].type.lower() == "polygon"
primitives = edbapp.modeler.get_primitive_by_layer_and_point(point=[20e-3, 30e-3])
assert len(primitives) == 3
primitives = edbapp.modeler.get_primitive_by_layer_and_point(point=[20e-3, 30e-3], nets=["GND"])
assert len(primitives) == 2
edbapp.close()

def test_arbitrary_wave_ports(self):
Expand Down
Loading