From 181b1ee9b74d0ed32c3af0ace2a246aa3ad86dc3 Mon Sep 17 00:00:00 2001 From: Michael Winkler Date: Mon, 24 Jun 2024 20:38:09 +0200 Subject: [PATCH] Renamed "lsc_child_in_parent" to "lcs_child_in_parent" --- weldx/tests/asdf_tests/test_asdf_core.py | 2 +- .../tests/transformations/test_cs_manager.py | 4 +-- weldx/transformations/cs_manager.py | 26 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/weldx/tests/asdf_tests/test_asdf_core.py b/weldx/tests/asdf_tests/test_asdf_core.py index bf02d11d3..b2a07fd63 100644 --- a/weldx/tests/asdf_tests/test_asdf_core.py +++ b/weldx/tests/asdf_tests/test_asdf_core.py @@ -366,7 +366,7 @@ def get_coordinate_system_manager_with_subsystems(nested: bool): # robot head system csm_head = tf.CoordinateSystemManager("head", "Head system") csm_head.add_cs("torch tcp", "head", lcs[3]) - csm_head.add_cs("camera tcp", "head", lcs[4], lsc_child_in_parent=False) + csm_head.add_cs("camera tcp", "head", lcs[4], lcs_child_in_parent=False) csm_head.add_cs("scanner 1 tcp", "head", lcs[5]) csm_head.add_cs("scanner 2 tcp", "head", lcs[6]) diff --git a/weldx/tests/transformations/test_cs_manager.py b/weldx/tests/transformations/test_cs_manager.py index 90250e493..768e16ada 100644 --- a/weldx/tests/transformations/test_cs_manager.py +++ b/weldx/tests/transformations/test_cs_manager.py @@ -56,7 +56,7 @@ def list_of_csm_and_lcs_instances(): csm_1.add_cs("lcs4", "lcs0", lcs[4]) csm_2 = CSM("lcs5", "csm2") - csm_2.add_cs("lcs3", "lcs5", lcs[5], lsc_child_in_parent=False) + csm_2.add_cs("lcs3", "lcs5", lcs[5], lcs_child_in_parent=False) csm_2.add_cs("lcs6", "lcs5", lcs[6]) csm_3 = CSM("lcs6", "csm3") @@ -64,7 +64,7 @@ def list_of_csm_and_lcs_instances(): csm_3.add_cs("lcs8", "lcs6", lcs[8]) csm_4 = CSM("lcs9", "csm4") - csm_4.add_cs("lcs3", "lcs9", lcs[9], lsc_child_in_parent=False) + csm_4.add_cs("lcs3", "lcs9", lcs[9], lcs_child_in_parent=False) csm_5 = CSM("lcs7", "csm5") csm_5.add_cs("lcs10", "lcs7", lcs[10]) diff --git a/weldx/transformations/cs_manager.py b/weldx/transformations/cs_manager.py index c118b5790..5e51e9a29 100644 --- a/weldx/transformations/cs_manager.py +++ b/weldx/transformations/cs_manager.py @@ -440,7 +440,7 @@ def add_cs( coordinate_system_name: str, reference_system_name: str, lcs: LocalCoordinateSystem, - lsc_child_in_parent: bool = True, + lcs_child_in_parent: bool = True, ): """Add a coordinate system to the coordinate system manager. @@ -469,7 +469,7 @@ def add_cs( An instance of `LocalCoordinateSystem` that describes how the new coordinate system is oriented in its parent system. - lsc_child_in_parent + lcs_child_in_parent If set to `True`, the passed `LocalCoordinateSystem` instance describes the new system orientation towards is parent. If `False`, it describes how the parent system is positioned in its new child system. @@ -508,7 +508,7 @@ def add_cs( f'Can not update coordinate system. "{reference_system_name}" is ' f"not a neighbor of {coordinate_system_name}" ) - if lsc_child_in_parent: + if lcs_child_in_parent: self._update_local_coordinate_system( coordinate_system_name, reference_system_name, @@ -523,7 +523,7 @@ def add_cs( else: self._check_coordinate_system_exists(reference_system_name) self._add_coordinate_system_node(coordinate_system_name) - if lsc_child_in_parent: + if lcs_child_in_parent: self._add_edges( coordinate_system_name, reference_system_name, @@ -648,7 +648,7 @@ def create_cs( coordinates: types_coordinates = None, time: types_time_like = None, time_ref: types_timestamp_like = None, - lsc_child_in_parent: bool = True, + lcs_child_in_parent: bool = True, ): """Create a coordinate system and add it to the coordinate system manager. @@ -674,7 +674,7 @@ def create_cs( Time data for time dependent coordinate systems. time_ref : Reference time for time dependent coordinate systems - lsc_child_in_parent : + lcs_child_in_parent : If set to `True`, the passed `LocalCoordinateSystem` instance describes the new system orientation towards is parent. If `False`, it describes how the parent system is positioned in its new child system. @@ -682,7 +682,7 @@ def create_cs( """ lcs = LocalCoordinateSystem(orientation, coordinates, time, time_ref) self.add_cs( - coordinate_system_name, reference_system_name, lcs, lsc_child_in_parent + coordinate_system_name, reference_system_name, lcs, lcs_child_in_parent ) def create_cs_from_euler( @@ -695,7 +695,7 @@ def create_cs_from_euler( coordinates: types_coordinates = None, time: types_time_like = None, time_ref: types_timestamp_like = None, - lsc_child_in_parent: bool = True, + lcs_child_in_parent: bool = True, ): """Create a coordinate system and add it to the coordinate system manager. @@ -735,7 +735,7 @@ def create_cs_from_euler( Time data for time dependent coordinate systems. time_ref : Reference time for time dependent coordinate systems - lsc_child_in_parent : + lcs_child_in_parent : If set to `True`, the passed `LocalCoordinateSystem` instance describes the new system orientation towards is parent. If `False`, it describes how the parent system is positioned in its new child system. @@ -746,7 +746,7 @@ def create_cs_from_euler( sequence, angles, degrees, coordinates, time, time_ref ) self.add_cs( - coordinate_system_name, reference_system_name, lcs, lsc_child_in_parent + coordinate_system_name, reference_system_name, lcs, lcs_child_in_parent ) def create_cs_from_axis_vectors( @@ -759,7 +759,7 @@ def create_cs_from_axis_vectors( coordinates: types_coordinates = None, time: types_time_like = None, time_ref: types_timestamp_like = None, - lsc_child_in_parent: bool = True, + lcs_child_in_parent: bool = True, ): """Create a coordinate system and add it to the `CoordinateSystemManager`. @@ -784,7 +784,7 @@ def create_cs_from_axis_vectors( Time data for time dependent coordinate systems (Default value = None) time_ref : Optional reference timestamp if ``time`` is a time delta. - lsc_child_in_parent : + lcs_child_in_parent : If set to `True`, the passed `LocalCoordinateSystem` instance describes the new system orientation towards is parent. If `False`, it describes how the parent system is positioned in its new child system. @@ -812,7 +812,7 @@ def create_cs_from_axis_vectors( x, y, z, coordinates, time, time_ref ) self.add_cs( - coordinate_system_name, reference_system_name, lcs, lsc_child_in_parent + coordinate_system_name, reference_system_name, lcs, lcs_child_in_parent ) def delete_cs(self, coordinate_system_name: str, delete_children: bool = False):