Commit f4cb859d authored by Martin Drechsler's avatar Martin Drechsler

small changes

parent 13b3044f
...@@ -43,7 +43,9 @@ class CameraGuiMainWindow(QMainWindow): ...@@ -43,7 +43,9 @@ class CameraGuiMainWindow(QMainWindow):
def initUI(self): def initUI(self):
self.win = QtGui.QMainWindow() self.win = QtGui.QMainWindow()
self.win.setWindowTitle("Toy GUI") self.win.setWindowTitle("Camera GUI")
self.win.setWindowIcon(QtGui.QIcon('Butter_robot.png'))
self.win.resize(1000, 500) self.win.resize(1000, 500)
self.area = dockarea.DockArea() self.area = dockarea.DockArea()
......
...@@ -35,7 +35,7 @@ some_thread.start() ...@@ -35,7 +35,7 @@ some_thread.start()
time.sleep(5) time.sleep(5)
stop_loop_thread(some_thread) stop_loop_thread(some_thread)
#%% #%%########################################################################################
from PyQt5 import QtCore from PyQt5 import QtCore
def block_until_emit(signal, timeout=10000): def block_until_emit(signal, timeout=10000):
"""Block loop until signal emitted, or timeout (ms) elapses.""" """Block loop until signal emitted, or timeout (ms) elapses."""
......
...@@ -15,6 +15,9 @@ from controlGui import ControlGui ...@@ -15,6 +15,9 @@ from controlGui import ControlGui
if __name__ == "__main__": if __name__ == "__main__":
import sys import sys
app = QtGui.QApplication([]) app = QtGui.QApplication([])
app_icon = QtGui.QIcon()
app_icon.addFile('Butter_robot.png')
app.setWindowIcon(app_icon)
camera = AndorZyla(0) camera = AndorZyla(0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment