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

Add point_data and point_3d_data to Edb class. #2925

Merged
merged 4 commits into from
Apr 27, 2023
Merged
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
14 changes: 6 additions & 8 deletions _unittest/test_00_Advanced_EDB.py
Original file line number Diff line number Diff line change
Expand Up @@ -286,14 +286,13 @@ def test_07_place_on_lam_with_mold(self):
) = cellInstance.Get3DTransformation()
assert res
zeroValue = chipEdb.edb_value(0)
oneValue = chipEdb.edb_value(1)
originPoint = chipEdb.edb.Geometry.Point3DData(zeroValue, zeroValue, zeroValue)
xAxisPoint = chipEdb.edb.Geometry.Point3DData(oneValue, zeroValue, zeroValue)
originPoint = chipEdb.point_3d(0.0, 0.0, 0.0)
xAxisPoint = chipEdb.point_3d(1.0, 0.0, 0.0)
assert localOrigin.IsEqual(originPoint)
assert rotAxisFrom.IsEqual(xAxisPoint)
assert rotAxisTo.IsEqual(xAxisPoint)
assert angle.IsEqual(zeroValue)
assert loc.IsEqual(chipEdb.edb.Geometry.Point3DData(zeroValue, zeroValue, chipEdb.edb_value(170e-6)))
assert loc.IsEqual(chipEdb.point_3d(0.0, 0.0, chipEdb.edb_value(170e-6)))
finally:
chipEdb.close_edb()
laminateEdb.close_edb()
Expand Down Expand Up @@ -349,14 +348,13 @@ def test_08_place_on_bottom_of_lam_with_mold(self):
) = cellInstance.Get3DTransformation()
assert res
zeroValue = chipEdb.edb_value(0)
oneValue = chipEdb.edb_value(1)
originPoint = chipEdb.edb.Geometry.Point3DData(zeroValue, zeroValue, zeroValue)
xAxisPoint = chipEdb.edb.Geometry.Point3DData(oneValue, zeroValue, zeroValue)
originPoint = chipEdb.point_3d(0.0, 0.0, 0.0)
xAxisPoint = chipEdb.point_3d(1.0, 0.0, 0.0)
assert localOrigin.IsEqual(originPoint)
assert rotAxisFrom.IsEqual(xAxisPoint)
assert rotAxisTo.IsEqual(xAxisPoint)
assert angle.IsEqual(zeroValue)
assert loc.IsEqual(chipEdb.edb.Geometry.Point3DData(zeroValue, zeroValue, chipEdb.edb_value(-90e-6)))
assert loc.IsEqual(chipEdb.point_3d(0.0, 0.0, chipEdb.edb_value(-90e-6)))
finally:
chipEdb.close_edb()
laminateEdb.close_edb()
Expand Down
42 changes: 42 additions & 0 deletions pyaedt/edb.py
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,8 @@ def edb_value(self, val):
Instance of `Edb.Utility.Value`

"""
if isinstance(val, self.edb.Utility.Value):
return val
if isinstance(val, (int, float)):
return self.edb.Utility.Value(val)
m1 = re.findall(r"(?<=[/+-/*//^/(/[])([a-z_A-Z/$]\w*)", str(val).replace(" ", ""))
Expand All @@ -1110,6 +1112,46 @@ def edb_value(self, val):
return self.edb.Utility.Value(val, var_server_db)
return self.edb.Utility.Value(val)

@pyaedt_function_handler()
def point_3d(self, x, y, z=0.0):
"""Compute the Edb 3d Point Data.

Parameters
----------
x : float, int or str
X value.
y : float, int or str
Y value.
z : float, int or str, optional
Z value.

Returns
-------
``Geometry.Point3DData``.
"""
return self.edb.Geometry.Point3DData(self.edb_value(x), self.edb_value(y), self.edb_value(z))

@pyaedt_function_handler()
def point_data(self, x, y=None):
"""Compute the Edb Point Data.

Parameters
----------
x : float, int or str
X value.
y : float, int or str, optional
Y value.


Returns
-------
``Geometry.PointData``.
"""
if y is None:
return self.edb.Geometry.PointData(self.edb_value(x))
else:
return self.edb.Geometry.PointData(self.edb_value(x), self.edb_value(y))

@pyaedt_function_handler()
def _is_file_existing_and_released(self, filename):
if os.path.exists(filename):
Expand Down
18 changes: 7 additions & 11 deletions pyaedt/edb_core/components.py
Original file line number Diff line number Diff line change
Expand Up @@ -873,9 +873,7 @@ def _create_terminal(self, pin):
"""

pin_position = self.get_pin_position(pin) # pragma no cover
pin_pos = self._edb.Geometry.PointData(
self._get_edb_value(pin_position[0]), self._get_edb_value(pin_position[1]) # pragma no cover
)
pin_pos = self._pedb.point_data(*pin_position)
res, from_layer, _ = pin.GetLayerRange()
cmp_name = pin.GetComponent().GetName()
net_name = pin.GetNet().GetName()
Expand All @@ -902,14 +900,14 @@ def _get_closest_pin_from(self, pin, ref_pinlist):

"""
res, pin_position, pin_rot = pin.GetPositionAndRotation(
self._edb.Geometry.PointData(self._get_edb_value(0.0), self._get_edb_value(0.0)),
self._pedb.point_data(0.0, 0.0),
0.0,
)
distance = 1e3
closest_pin = ref_pinlist[0]
for ref_pin in ref_pinlist:
res, ref_pin_position, ref_pin_rot = ref_pin.GetPositionAndRotation(
self._edb.Geometry.PointData(self._get_edb_value(0.0), self._get_edb_value(0.0)),
self._pedb.point_data(0.0, 0.0),
0.0,
)
temp_distance = pin_position.Distance(ref_pin_position)
Expand Down Expand Up @@ -989,9 +987,8 @@ def add_port_on_rlc_component(self, component=None):
pins = self.get_pin_from_component(component.refdes)
if len(pins) == 2: # pragma: no cover
pos_pin_loc = self.get_pin_position(pins[0])
pt = self._pedb.edb.Geometry.PointData(
self._get_edb_value(pos_pin_loc[0]), self._get_edb_value(pos_pin_loc[1])
)
pt = self._pedb.point_data(*pos_pin_loc)

pin_layers = self._padstack._get_pin_layer_range(pins[0])
pos_pin_term = self._pedb.edb.Cell.Terminal.PointTerminal.Create(
self._active_layout,
Expand All @@ -1003,9 +1000,8 @@ def add_port_on_rlc_component(self, component=None):
if not pos_pin_term: # pragma: no cover
return False
neg_pin_loc = self.get_pin_position(pins[1])
pt = self._pedb.edb.Geometry.PointData(
self._get_edb_value(neg_pin_loc[0]), self._get_edb_value(neg_pin_loc[1])
)
pt = self._pedb.point_data(*neg_pin_loc)

neg_pin_term = self._pedb.edb.Cell.Terminal.PointTerminal.Create(
self._active_layout,
pins[1].GetNet(),
Expand Down
8 changes: 1 addition & 7 deletions pyaedt/edb_core/edb_data/padstacks_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -1016,13 +1016,7 @@ def in_polygon(self, polygon_data, include_partial=True, simple_check=False):
"""
if simple_check:
pos = [i for i in self.position]
int_val = (
1
if polygon_data.PointInPolygon(
self._pedb.edb.Geometry.PointData(self._pedb.edb_value(pos[0]), self._pedb.edb_value(pos[1]))
)
else 0
)
int_val = 1 if polygon_data.PointInPolygon(self._pedb.point_data(*pos)) else 0
else:
plane = self._pedb.modeler.Shape("rectangle", pointA=self.bounding_box[0], pointB=self.bounding_box[1])
rectangle_data = self._pedb.modeler.shape_to_polygon_data(plane)
Expand Down
20 changes: 6 additions & 14 deletions pyaedt/edb_core/layout.py
Original file line number Diff line number Diff line change
Expand Up @@ -356,9 +356,9 @@ def calc_slope(point, origin):
if check_inside:
xcoeff, ycoeff = calc_slope([point.X.ToDouble(), point.X.ToDouble()], origin)

new_points = self._edb.Geometry.PointData(
self._get_edb_value(point.X.ToString() + "{}*{}".format(xcoeff, offset_name)),
self._get_edb_value(point.Y.ToString() + "{}*{}".format(ycoeff, offset_name)),
new_points = self._pedb.point_data(
point.X.ToString() + "{}*{}".format(xcoeff, offset_name),
point.Y.ToString() + "{}*{}".format(ycoeff, offset_name),
)
poligon_data.SetPoint(i, new_points)
prev_point = point
Expand Down Expand Up @@ -431,9 +431,7 @@ def _create_path(
else:
corner_style = self._edb.Cell.Primitive.PathCornerStyle.MiterCorner # pragma: no cover

pointlists = [
self._edb.Geometry.PointData(self._get_edb_value(i[0]), self._get_edb_value(i[1])) for i in path_list.points
]
pointlists = [self._pedb.point_data(i[0], i[1]) for i in path_list.points]
polygonData = self._edb.Geometry.PolygonData(convert_py_list_to_net_list(pointlists), False)
polygon = self._edb.Cell.Primitive.Path.Create(
self._active_layout,
Expand Down Expand Up @@ -868,14 +866,8 @@ def _createPolygonDataFromPolygon(self, shape):
or endPoint[1].IsParametric()
)
arc = self._edb.Geometry.ArcData(
self._edb.Geometry.PointData(
self._get_edb_value(startPoint[0].ToDouble()),
self._get_edb_value(startPoint[1].ToDouble()),
),
self._edb.Geometry.PointData(
self._get_edb_value(endPoint[0].ToDouble()),
self._get_edb_value(endPoint[1].ToDouble()),
),
self._pedb.point_data(startPoint[0], startPoint[1]),
self._pedb.point_data(endPoint[0], endPoint[1]),
)
arcs.append(arc)
elif len(endPoint) == 5:
Expand Down
30 changes: 12 additions & 18 deletions pyaedt/edb_core/stackup.py
Original file line number Diff line number Diff line change
Expand Up @@ -1318,12 +1318,10 @@ def place_in_layout_3d_placement(

zero_data = self._edb_value(0.0)
one_data = self._edb_value(1.0)
point3d_t = self._pedb.edb.Geometry.Point3DData(_offset_x, _offset_y, h_stackup)
point_loc = self._pedb.edb.Geometry.Point3DData(zero_data, zero_data, zero_data)
point_from = self._pedb.edb.Geometry.Point3DData(one_data, zero_data, zero_data)
point_to = self._pedb.edb.Geometry.Point3DData(
self._edb_value(math.cos(_angle)), self._edb_value(-1 * math.sin(_angle)), zero_data
)
point3d_t = self._pedb.point_3d(_offset_x, _offset_y, h_stackup)
point_loc = self._pedb.point_3d(zero_data, zero_data, zero_data)
point_from = self._pedb.point_3d(one_data, zero_data, zero_data)
point_to = self._pedb.point_3d(math.cos(_angle), -1 * math.sin(_angle), zero_data)
cell_inst2.Set3DTransformation(point_loc, point_from, point_to, rotation, point3d_t)
self.refresh_layer_collection()
return True
Expand Down Expand Up @@ -1464,12 +1462,10 @@ def place_instance(

zero_data = self._edb_value(0.0)
one_data = self._edb_value(1.0)
point3d_t = self._pedb.edb.Geometry.Point3DData(_offset_x, _offset_y, h_stackup)
point_loc = self._pedb.edb.Geometry.Point3DData(zero_data, zero_data, zero_data)
point_from = self._pedb.edb.Geometry.Point3DData(one_data, zero_data, zero_data)
point_to = self._pedb.edb.Geometry.Point3DData(
self._edb_value(math.cos(_angle)), self._edb_value(-1 * math.sin(_angle)), zero_data
)
point3d_t = self._pedb.point_3d(_offset_x, _offset_y, h_stackup)
point_loc = self._pedb.point_3d(zero_data, zero_data, zero_data)
point_from = self._pedb.point_3d(one_data, zero_data, zero_data)
point_to = self._pedb.point_3d(math.cos(_angle), -1 * math.sin(_angle), zero_data)
cell_inst2.Set3DTransformation(point_loc, point_from, point_to, rotation, point3d_t)
self.refresh_layer_collection()
return True
Expand Down Expand Up @@ -1511,12 +1507,10 @@ def place_a3dcomp_3d_placement(self, a3dcomp_path, angle=0.0, offset_x=0.0, offs
"""
zero_data = self._edb_value(0.0)
one_data = self._edb_value(1.0)
local_origin = self._pedb.edb.Geometry.Point3DData(zero_data, zero_data, zero_data)
rotation_axis_from = self._pedb.edb.Geometry.Point3DData(one_data, zero_data, zero_data)
local_origin = self._pedb.point_3d(0.0, 0.0, 0.0)
rotation_axis_from = self._pedb.point_3d(1.0, 0.0, 0.0)
_angle = angle * math.pi / 180.0
rotation_axis_to = self._pedb.edb.Geometry.Point3DData(
self._edb_value(math.cos(_angle)), self._edb_value(-1 * math.sin(_angle)), zero_data
)
rotation_axis_to = self._pedb.point_3d(math.cos(_angle), -1 * math.sin(_angle), 0.0)

stackup_target = self._pedb.edb.Cell.LayerCollection(self._pedb.active_layout.GetLayerCollection())
sig_set = self._pedb.edb.Cell.LayerTypeSet.SignalLayerSet
Expand All @@ -1530,7 +1524,7 @@ def place_a3dcomp_3d_placement(self, a3dcomp_path, angle=0.0, offset_x=0.0, offs
flip_angle = self._edb_value("180deg")
elevation = target_bottom_elevation
h_stackup = self._edb_value(elevation)
location = self._pedb.edb.Geometry.Point3DData(self._edb_value(offset_x), self._edb_value(offset_y), h_stackup)
location = self._pedb.point_3d(offset_x, offset_y, h_stackup)

mcad_model = self._pedb.edb.McadModel.Create3DComp(self._pedb.active_layout, a3dcomp_path)
if mcad_model.IsNull(): # pragma: no cover
Expand Down