Skip to content

Commit 072018f

Browse files
committed
Move geometry_tree.py
1 parent b7b75cf commit 072018f

File tree

4 files changed

+18
-19
lines changed

4 files changed

+18
-19
lines changed

src/ansys/motorcad/core/geometry.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from math import acos, atan2, cos, degrees, fabs, floor, inf, isclose, radians, sin, sqrt
2828
import warnings
2929
from warnings import warn
30+
3031
from geometry_extrusion import ExtrusionBlockList
3132

3233
GEOM_TOLERANCE = 1e-6
@@ -2421,7 +2422,6 @@ def _entities_same_with_direction(entities_1, entities_2):
24212422
return _entities_same_with_direction(self, entities_to_compare)
24222423

24232424

2424-
24252425
def _convert_entities_to_json(entities):
24262426
"""Get entities list as a json object.
24272427

src/ansys/motorcad/core/geometry_extrusion.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
"""Geometry extrusion classes."""
2+
13
# Copyright (C) 2022 - 2025 ANSYS, Inc. and/or its affiliates.
24
# SPDX-License-Identifier: MIT
35
#
4-
#
56
# Permission is hereby granted, free of charge, to any person obtaining a copy
67
# of this software and associated documentation files (the "Software"), to deal
78
# in the Software without restriction, including without limitation the rights
@@ -20,6 +21,7 @@
2021
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
2122
# SOFTWARE.
2223

24+
2325
class ExtrusionBlock:
2426
"""Generic class for storing 3D extrusion data."""
2527

@@ -105,7 +107,7 @@ def _to_json(self):
105107
"extrusion_block_start": self.start_pos,
106108
"extrusion_block_end": self.end_pos,
107109
"extrusion_block_angle_step": self.angle_step,
108-
"extrusion_block_continuous_rotation": self.angle_continuous
110+
"extrusion_block_continuous_rotation": self.angle_continuous,
109111
}
110112

111113
return block_dict
@@ -158,4 +160,4 @@ def _from_json(self, json_list):
158160
for json_object in json_list:
159161
block = ExtrusionBlock()
160162
block._from_json(json_object)
161-
self.append(block)
163+
self.append(block)

tests/test_geometry.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2619,7 +2619,7 @@ def test_region_find_entity_from_coordinates():
26192619
assert c1.find_entity_from_coordinates(Coordinate(99, 99), Coordinate(99, 99)) is None
26202620

26212621
assert (
2622-
c1.find_entity_from_coordinates(c1.entities[0].start, c1.entities[0].end) == c1.entities[0]
2622+
c1.find_entity_from_coordinates(c1.entities[0].start, c1.entities[0].end) == c1.entities[0]
26232623
)
26242624

26252625

@@ -2819,19 +2819,19 @@ def test_set_lamination_type(mc_reset_to_default_on_teardown):
28192819
assert rotor.lamination_type == "Solid"
28202820

28212821
solid_rotor_section_file = (
2822-
get_dir_path() + r"\test_files\adaptive_template_testing_solid_rotor_region.mot"
2822+
get_dir_path() + r"\test_files\adaptive_template_testing_solid_rotor_region.mot"
28232823
)
28242824
lam_rotor_section_file = (
2825-
get_dir_path() + r"\test_files\adaptive_template_testing_lam_rotor_region.mot"
2825+
get_dir_path() + r"\test_files\adaptive_template_testing_lam_rotor_region.mot"
28262826
)
28272827

28282828
solid_rotor_section_result = (
2829-
get_dir_path() + r"\test_files\adaptive_template_testing_solid_rotor_region"
2830-
r"\FEResultsData\StaticLoadInductance_result_1.mes"
2829+
get_dir_path() + r"\test_files\adaptive_template_testing_solid_rotor_region"
2830+
r"\FEResultsData\StaticLoadInductance_result_1.mes"
28312831
)
28322832
lam_rotor_section_result = (
2833-
get_dir_path() + r"\test_files\adaptive_template_testing_lam_rotor_region"
2834-
r"\FEResultsData\StaticLoadInductance_result_1.mes"
2833+
get_dir_path() + r"\test_files\adaptive_template_testing_lam_rotor_region"
2834+
r"\FEResultsData\StaticLoadInductance_result_1.mes"
28352835
)
28362836

28372837
# load file into Motor-CAD
@@ -2855,6 +2855,3 @@ def test_region_creation_warnings(mc):
28552855
_ = Region()
28562856
with pytest.warns():
28572857
_ = Region(mc)
2858-
2859-
2860-

tests/test_geometry_extrusion.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def test_extrusion_block_to_json():
2828
"extrusion_block_start": 100.1,
2929
"extrusion_block_end": 200.2,
3030
"extrusion_block_angle_step": 1.5,
31-
"extrusion_block_continuous_rotation": 0
31+
"extrusion_block_continuous_rotation": 0,
3232
}
3333

3434
block = ExtrusionBlock()
@@ -45,7 +45,7 @@ def test_extrusion_block_from_json():
4545
"extrusion_block_start": 100,
4646
"extrusion_block_end": 200,
4747
"extrusion_block_angle_step": 0,
48-
"extrusion_block_continuous_rotation": 20
48+
"extrusion_block_continuous_rotation": 20,
4949
}
5050
block = ExtrusionBlock()
5151
block._from_json(block_dict)
@@ -60,7 +60,7 @@ def test_extrusion_block_list_to_json():
6060
"extrusion_block_start": 100,
6161
"extrusion_block_end": 200,
6262
"extrusion_block_angle_step": 0,
63-
"extrusion_block_continuous_rotation": 10
63+
"extrusion_block_continuous_rotation": 10,
6464
}
6565
]
6666

@@ -77,7 +77,7 @@ def test_extrusion_block_list_from_json():
7777
"extrusion_block_start": 100,
7878
"extrusion_block_end": 200,
7979
"extrusion_block_angle_step": 0,
80-
"extrusion_block_continuous_rotation": 20
80+
"extrusion_block_continuous_rotation": 20,
8181
}
8282
]
8383
blocks = ExtrusionBlockList()
@@ -90,4 +90,4 @@ def test_extrusion_block_list_from_json():
9090

9191
def test_block_extrusion_length():
9292
block = ExtrusionBlock(start_pos=100, end_pos=200.5, angle_continuous=0)
93-
assert block.extrusion_length == 100.5
93+
assert block.extrusion_length == 100.5

0 commit comments

Comments
 (0)