minor fix gui confirm
This commit is contained in:
@@ -434,6 +434,7 @@ class FlomniSampleTransferMixin:
|
||||
ftransfer_put_sample sequence that opens them first.
|
||||
"""
|
||||
if self.console is not None:
|
||||
print("Using GUI console for confirmation dialog.")
|
||||
return self.OMNYTools.gui_yesno(message, gui=self.console, default=default)
|
||||
return self.OMNYTools.yesno(message, default)
|
||||
|
||||
@@ -1045,7 +1046,7 @@ class FlomniSampleTransferMixin:
|
||||
self.check_position_is_valid(position)
|
||||
|
||||
# this is not used for sample stage position!
|
||||
self._ftransfer_shiftx = -0.15
|
||||
self._ftransfer_shiftx = -0.1
|
||||
self._ftransfer_shiftz = -0.5
|
||||
|
||||
fsamx_pos = dev.fsamx.readback.get()
|
||||
@@ -1065,7 +1066,7 @@ class FlomniSampleTransferMixin:
|
||||
self.check_tray_in()
|
||||
|
||||
if position == 0:
|
||||
umv(dev.ftransx, 11, dev.ftransz, 3.5950)
|
||||
umv(dev.ftransx, 11.05, dev.ftransz, 3.5950)
|
||||
if position == 1:
|
||||
umv(
|
||||
dev.ftransx,
|
||||
|
||||
@@ -152,9 +152,11 @@ class OMNYTools:
|
||||
response = gui.response()
|
||||
if response == "yes":
|
||||
gui.clear_response()
|
||||
gui.message = ""
|
||||
return True
|
||||
if response == "no":
|
||||
gui.clear_response()
|
||||
gui.message = ""
|
||||
return False
|
||||
time.sleep(poll_interval)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user