Skip to content

Commit d45b08b

Browse files
committed
test #114
1 parent dd46f74 commit d45b08b

File tree

3 files changed

+22
-19
lines changed

3 files changed

+22
-19
lines changed

src/pyedb/grpc/database/primitive/padstack_instances.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,11 +419,13 @@ def position(self, value):
419419
pos = []
420420
for v in value:
421421
if isinstance(v, (float, int, str)):
422-
pos.append(GrpcValue(v))
422+
pos.append(GrpcValue(v, self._pedb.active_cell))
423423
else:
424424
pos.append(v)
425425
point_data = GrpcPointData(pos[0], pos[1])
426-
self.set_position_and_rotation(point_data, GrpcValue(self.rotation))
426+
self.set_position_and_rotation(
427+
x=point_data.x, y=point_data.y, rotation=GrpcValue(self.rotation, self._pedb.active_cell)
428+
)
427429

428430
@property
429431
def rotation(self):

src/pyedb/grpc/edb.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3705,9 +3705,15 @@ def _apply_variable(orig_name, orig_value):
37053705
var = self._clean_string_for_variable_name(var)
37063706
if var not in self.variables:
37073707
if use_relative_variables:
3708-
self.add_design_variable(var, 0.0)
3708+
if var.startswith("$"):
3709+
self.add_project_variable(var, 0.0)
3710+
else:
3711+
self.add_design_variable(var, 0.0)
37093712
else:
3710-
self.add_design_variable(var, orig_value)
3713+
if var.startswith("$"):
3714+
self.add_project_variable(var, orig_value)
3715+
else:
3716+
self.add_design_variable(var, orig_value)
37113717
if use_relative_variables:
37123718
return f"{orig_value}+{var}", var
37133719
else:
@@ -3722,7 +3728,7 @@ def _apply_variable(orig_name, orig_value):
37223728
_layers = {k: v for k, v in self.stackup.layers.items() if k in layer_filter}
37233729
for layer_name, layer in _layers.items():
37243730
var, val = _apply_variable(f"${layer_name}", layer.thickness)
3725-
layer.thickness = var
3731+
layer.thickness = GrpcValue(var, self.active_db)
37263732
parameters.append(val)
37273733
if materials:
37283734
if not material_filter:
@@ -3732,14 +3738,14 @@ def _apply_variable(orig_name, orig_value):
37323738
for mat_name, material in _materials.items():
37333739
if material.conductivity < 1e4:
37343740
var, val = _apply_variable(f"$epsr_{mat_name}", material.permittivity)
3735-
material.permittivity = var
3741+
material.permittivity = GrpcValue(var, self.active_db)
37363742
parameters.append(val)
37373743
var, val = _apply_variable(f"$loss_tangent_{mat_name}", material.dielectric_loss_tangent)
3738-
material.dielectric_loss_tangent = var
3744+
material.dielectric_loss_tangent = GrpcValue(var, self.active_db)
37393745
parameters.append(val)
37403746
else:
37413747
var, val = _apply_variable(f"$sigma_{mat_name}", material.conductivity)
3742-
material.conductivity = var
3748+
material.conductivity = GrpcValue(var, self.active_db)
37433749
parameters.append(val)
37443750
if traces:
37453751
if not trace_net_filter:
@@ -3755,7 +3761,7 @@ def _apply_variable(orig_name, orig_value):
37553761
else:
37563762
trace_width_variable = f"{path.aedt_name}"
37573763
var, val = _apply_variable(trace_width_variable, path.width)
3758-
path.width = var
3764+
path.width = GrpcValue(var, self.active_cell)
37593765
parameters.append(val)
37603766
if not padstack_definition_filter:
37613767
if trace_net_filter:
@@ -3774,7 +3780,7 @@ def _apply_variable(orig_name, orig_value):
37743780
padstack_defs = {k: v for k, v in self.padstacks.definitions.items() if k in padstack_definition_filter}
37753781

37763782
for def_name, padstack_def in padstack_defs.items():
3777-
if not padstack_def.via_start_layer == padstack_def.via_stop_layer:
3783+
if not padstack_def.start_layer == padstack_def.stop_layer:
37783784
if via_holes: # pragma no cover
37793785
if use_relative_variables:
37803786
hole_variable = "$hole_diameter"

tests/grpc/system/test_edb_nets.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def test_nets_arc_data(self, edb_examples):
132132

133133
@pytest.mark.slow
134134
def test_nets_dc_shorts(self, edb_examples):
135-
# TODO check connected object does not return anything.
135+
# TODO get_connected_object return empty list.
136136
edbapp = edb_examples.get_si_verse()
137137
dc_shorts = edbapp.layout_validation.dc_shorts()
138138
assert dc_shorts
@@ -157,21 +157,17 @@ def test_nets_eligible_power_nets(self, edb_examples):
157157

158158
def test_nets_merge_polygon(self):
159159
"""Convert paths from net into polygons."""
160-
# TODO check bug #464 status
160+
# Done
161161
source_path = os.path.join(local_path, "example_models", test_subfolder, "test_merge_polygon.aedb")
162162
target_path = os.path.join(self.local_scratch.path, "test_merge_polygon", "test.aedb")
163163
self.local_scratch.copyfolder(source_path, target_path)
164164
edbapp = Edb(target_path, desktop_version, restart_rpc_server=True)
165165
assert edbapp.nets.merge_nets_polygons(["net1", "net2"])
166166
edbapp.close_edb()
167167

168-
def test_layout_auto_parametrization_0(self):
168+
def test_layout_auto_parametrization_0(self, edb_examples):
169169
# TODO fix parameters first
170-
source_path = os.path.join(local_path, "example_models", test_subfolder, "ANSYS-HSD_V1.aedb")
171-
target_path = os.path.join(self.local_scratch.path, "test_auto_parameters", "test.aedb")
172-
output_path = os.path.join(self.local_scratch.path, "test_auto_parameters", "test_absolute.aedb")
173-
self.local_scratch.copyfolder(source_path, target_path)
174-
edbapp = Edb(target_path, desktop_version)
170+
edbapp = edb_examples.get_si_verse()
175171
parameters = edbapp.auto_parametrize_design(
176172
layers=True,
177173
layer_filter="1_Top",
@@ -181,7 +177,6 @@ def test_layout_auto_parametrization_0(self):
181177
antipads=False,
182178
traces=False,
183179
use_relative_variables=False,
184-
output_aedb_path=output_path,
185180
open_aedb_at_end=False,
186181
)
187182
assert "$1_Top_value" in parameters

0 commit comments

Comments
 (0)