Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
ccBrita committed Jul 4, 2023
1 parent 16816a9 commit 9a92391
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 13 deletions.
6 changes: 3 additions & 3 deletions Software/AddOnModules/Hardware.py
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,9 @@ def initUI(self):
#name the window
self.setWindowTitle('Hardware Functions')

self.AoTable.itemChanged.connect(lambda: self.triggerSave)
self.AiTable.itemChanged.connect(lambda: self.triggerSave)
self.DxTable.itemChanged.connect(lambda: self.triggerSave)
self.AoTable.itemChanged.connect(lambda: self.triggerSave())
self.AiTable.itemChanged.connect(lambda: self.triggerSave())
self.DxTable.itemChanged.connect(lambda: self.triggerSave())

#scans for hardware, either for the first time automatically or on a button press from the hardware module
def rescanHardware(self):
Expand Down
26 changes: 16 additions & 10 deletions eye4nanomi/eye4nanomi.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import json
import csv
import signal
import concurrent.futures

__version__ = '0.2'

Expand Down Expand Up @@ -125,7 +126,7 @@ def update_shutter_speed(self):
self.shutterspeed.set_value(self.shutterspeedSettings[self.shutterspeedBox.currentIndex()])
self.camera.set_config(self.config)
print("shutterspeed is updated to", self.shutterspeed.get_value())
except:
except Exception:
print("Failed to change shutter speed, there was IO process in camera, please retry")
QtWidgets.QMessageBox.question(self,'I/O in progress', 'Failed to change shutter speed, there was IO process in camera, please retry', QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Ok)
if self.hold_live:
Expand All @@ -140,7 +141,7 @@ def update_iso(self):
self.iso.set_value(self.isoSettings[self.isoBox.currentIndex()])
self.camera.set_config(self.config)
print("iso is updated to", self.iso.get_value())
except:
except Exception:
print("Failed to change ISO, there was IO process in camera, please retry")
QtWidgets.QMessageBox.question(self,'I/O in progress', 'Failed to change ISO, there was IO process in camera, please retry', QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Ok)
if self.hold_live:
Expand Down Expand Up @@ -265,17 +266,22 @@ def stack_image(self, directory):
kwargs['data_model'] = data_model
np.savez(directory, **kwargs)

def recieve_settings(self):
def receive_settings(self):
self.socket.send_json(json.dumps({'request':'get'}))
data = self.socket.recv_json()
# Set a receive timeout (in milliseconds)
self.socket.setsockopt(zmq.RCVTIMEO, 15000)
try:
data = self.socket.recv_json()
return data
except zmq.error.Again:
raise TimeoutError()

return data

def save_settings(self, filename):
signal.signal(signal.SIGALRM, signal_handler)
signal.alarm(15) # Ten seconds
try:
data = self.recieve_settings()
except:
data = self.receive_settings()
except TimeoutError:
QtWidgets.QMessageBox.question(self,'Time Out', 'Time out when recieve microscope settings, please check NanoMi control software see if ZMQ server is enabled', QtWidgets.QMessageBox.Ok, QtWidgets.QMessageBox.Ok)
print("Time out when recieve microscope settings, please check NanoMi control software see if ZMQ server is enabled!")
return -1
Expand Down Expand Up @@ -308,8 +314,8 @@ def closeEvent(self,event):
else:
event.ignore()

def signal_handler(signum, frame):
raise Exception("Timed out!")
# def signal_handler(signum, frame):
# raise Exception("Timed out!")


if __name__ == '__main__':
Expand Down

0 comments on commit 9a92391

Please sign in to comment.