Skip to content

Commit 0d51bc5

Browse files
authored
Merge pull request #188 from zivid/2024-11-05-update-python-samples
Samples: Automatic updates to public repository
2 parents e04e444 + b16f6c7 commit 0d51bc5

3 files changed

Lines changed: 11 additions & 8 deletions

File tree

modules/zividsamples/gui/hand_eye_verification_gui.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,9 @@ def on_hand_eye_configuration_updated(self):
285285
)
286286
self.markers_in_camera_frame_pose_widget.on_eye_in_hand_toggled(self.hand_eye_configuration.eye_in_hand)
287287
self.markers_in_robot_base_frame_pose_widget.on_eye_in_hand_toggled(self.hand_eye_configuration.eye_in_hand)
288+
self.markers_in_robot_base_frame_pose_widget.set_title(
289+
f"Marker Poses In Robot {('Base' if self.hand_eye_configuration.eye_in_hand else 'Tool')} Frame"
290+
)
288291
self.detection_visualization_widget.on_hand_eye_configuration_updated(self.hand_eye_configuration)
289292

290293
def confirm_robot_pose(self):

modules/zividsamples/gui/pose_widget.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,6 @@ def setup_base_connections(self):
185185
if self.display_mode != PoseWidgetDisplayMode.OnlyPose:
186186
self.rotation_format_selection_widget.rotation_format_update.connect(self.on_rotation_format_update)
187187

188-
def set_title(self, title: str):
189-
self.title = title
190-
191188
def get_rotation_format(self) -> RotationInformation:
192189
return self.rotation_information
193190

@@ -787,6 +784,9 @@ def update_layout(self):
787784
else:
788785
self.scroll_area.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
789786

787+
def set_title(self, title: str):
788+
self.group_box.setTitle(title)
789+
790790
def update_markers(self):
791791
self.translation_parameters = {}
792792
self.rotation_parameters = {}
@@ -850,7 +850,7 @@ def MarkersInRobotFrame(
850850
"hand-eye-robot-and-calibration-board-ee-object-pose-low-res.png"
851851
)
852852
return cls(
853-
title="Marker Poses In Robot Base Frame",
853+
title=f"Marker Poses In Robot {('Base' if eye_in_hand else 'Tool')} Frame",
854854
initial_rotation_information=initial_rotation_information,
855855
eye_in_hand=eye_in_hand,
856856
display_mode=display_mode,

source/applications/advanced/hand_eye_calibration/hand_eye_gui.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,8 @@ def connect_signals(self) -> None:
278278
self.load_from_directory.triggered.connect(self.on_load_from_data_directory_action_triggered)
279279
self.save_to_directory.triggered.connect(self.on_save_to_data_directory_action_triggered)
280280
self.save_frame_action.triggered.connect(self.on_save_last_frame_action_triggered)
281-
self.select_eye_in_hand_action.triggered.connect(self.on_hand_eye_action_triggered)
282-
self.select_eye_to_hand_action.triggered.connect(self.on_hand_eye_action_triggered)
281+
self.select_eye_in_hand_action.triggered.connect(lambda: self.on_hand_eye_action_triggered(True))
282+
self.select_eye_to_hand_action.triggered.connect(lambda: self.on_hand_eye_action_triggered(False))
283283
self.select_checkerboard_action.triggered.connect(
284284
lambda: self.on_calibration_object_action_triggered(CalibrationObject.Checkerboard)
285285
)
@@ -547,8 +547,8 @@ def on_select_hand_eye_settings_action_triggered(self) -> None:
547547
self.setup_settings()
548548
self.live2d_widget.settings_2d = self.settings.settings_2d
549549

550-
def on_hand_eye_action_triggered(self, action: QAction) -> None:
551-
self.hand_eye_configuration.eye_in_hand = action == self.select_eye_in_hand_action
550+
def on_hand_eye_action_triggered(self, eye_in_hand: bool) -> None:
551+
self.hand_eye_configuration.eye_in_hand = eye_in_hand
552552
self.hand_eye_calibration_gui.hand_eye_configuration_update(self.hand_eye_configuration)
553553
self.hand_eye_verification_gui.hand_eye_configuration_update(self.hand_eye_configuration)
554554

0 commit comments

Comments
 (0)