Skip to content

Commit

Permalink
Renamed "lsc_child_in_parent" to "lcs_child_in_parent"
Browse files Browse the repository at this point in the history
  • Loading branch information
mbwinkler committed Jun 24, 2024
1 parent ffa47f3 commit 181b1ee
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion weldx/tests/asdf_tests/test_asdf_core.py
Original file line number Diff line number Diff line change
Expand Up @@ -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])

Expand Down
4 changes: 2 additions & 2 deletions weldx/tests/transformations/test_cs_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,15 @@ 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")
csm_3.add_cs("lcs7", "lcs6", lcs[7])
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])
Expand Down
26 changes: 13 additions & 13 deletions weldx/transformations/cs_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand Down Expand Up @@ -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.
Expand All @@ -674,15 +674,15 @@ 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.
"""
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(
Expand All @@ -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.
Expand Down Expand Up @@ -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.
Expand All @@ -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(
Expand All @@ -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`.
Expand All @@ -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.
Expand Down Expand Up @@ -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):
Expand Down

0 comments on commit 181b1ee

Please sign in to comment.