Skip to content

Commit 1d8f77b

Browse files
Robert0MartRoberto Martins
andauthored
bugfix: page hiding (#202)
Co-authored-by: Roberto Martins <roberto.martins@blockstec.com>
1 parent edce55a commit 1d8f77b

1 file changed

Lines changed: 11 additions & 7 deletions

File tree

BlocksScreen/lib/panels/widgets/probeHelperPage.py

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ def handle_start_tool(self, sender: typing.Type[OptionCard]) -> None:
439439
if "eddy" in sender.name: # type:ignore
440440
self.call_load_panel.emit(True, "Preparing Eddy Current Calibration...")
441441
self.toggle_conn_page.emit(False)
442+
self._move_to_pos(self.z_offset_safe_xy[0], self.z_offset_safe_xy[1], 100)
442443
self.run_gcode_signal.emit(
443444
f"LDC_CALIBRATE_DRIVE_CURRENT CHIP={sender.name.split(' ')[1]}" # type:ignore
444445
)
@@ -528,8 +529,16 @@ def on_manual_probe_update(self, update: dict) -> None:
528529

529530
# if update.get("z_position_lower"):
530531
# f"{update.get('z_position_lower'):.4f} mm"
531-
is_active = update.get("is_active", False)
532-
if is_active and not self.isVisible():
532+
533+
is_active = update.get("is_active", None)
534+
if update.get("z_position_upper"):
535+
self.old_offset_info.setText(f"{update.get('z_position_upper'):.4f} mm")
536+
if update.get("z_position"):
537+
self.current_offset_info.setText(f"{update.get('z_position'):.4f} mm")
538+
539+
if not is_active:
540+
return
541+
if not self.isVisible():
533542
self.request_page_view.emit()
534543
# Shared state updates
535544
self.helper_initialize = False
@@ -541,11 +550,6 @@ def on_manual_probe_update(self, update: dict) -> None:
541550
else:
542551
self._show_option_cards()
543552

544-
if update.get("z_position_upper"):
545-
self.old_offset_info.setText(f"{update.get('z_position_upper'):.4f} mm")
546-
if update.get("z_position"):
547-
self.current_offset_info.setText(f"{update.get('z_position'):.4f} mm")
548-
549553
@QtCore.pyqtSlot(list, name="handle_gcode_response")
550554
def handle_gcode_response(self, data: list) -> None:
551555
"""Parses responses from gcodes

0 commit comments

Comments
 (0)