Compare commits
No commits in common. "d6335e69bbc2c4825792277c159389117ce96066" and "bda14780395ee1b7c6e6b7937fcd90e02e65c395" have entirely different histories.
d6335e69bb
...
bda1478039
@ -6,7 +6,6 @@ import time
|
|||||||
import tempfile
|
import tempfile
|
||||||
import hashlib
|
import hashlib
|
||||||
import zlib
|
import zlib
|
||||||
import logging
|
|
||||||
|
|
||||||
import serial
|
import serial
|
||||||
import serial.tools.list_ports
|
import serial.tools.list_ports
|
||||||
@ -63,8 +62,7 @@ class QThread(QtCore.QThread):
|
|||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
if self.error:
|
if self.error:
|
||||||
self.error.emit(str(exc))
|
self.error.emit(str(exc))
|
||||||
# raise here causes windows builds to just die. ¯\_(ツ)_/¯
|
raise
|
||||||
logging.exception('Unhandled exception')
|
|
||||||
|
|
||||||
|
|
||||||
class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
||||||
@ -74,7 +72,6 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
|
|
||||||
def __init__(self, parent=None, app=None):
|
def __init__(self, parent=None, app=None):
|
||||||
super(MainWindow, self).__init__(parent)
|
super(MainWindow, self).__init__(parent)
|
||||||
self.setWindowFlags(QtCore.Qt.Dialog)
|
|
||||||
|
|
||||||
# FIXME: dirty hack to solve relative paths in *.ui
|
# FIXME: dirty hack to solve relative paths in *.ui
|
||||||
oldcwd = os.getcwd()
|
oldcwd = os.getcwd()
|
||||||
@ -273,12 +270,9 @@ class MainWindow(QtWidgets.QMainWindow, mainwindow.Ui_MainWindow):
|
|||||||
@QtCore.Slot()
|
@QtCore.Slot()
|
||||||
def on_expertModeBox_clicked(self):
|
def on_expertModeBox_clicked(self):
|
||||||
self.expertForm.setVisible(self.expertModeBox.checkState())
|
self.expertForm.setVisible(self.expertModeBox.checkState())
|
||||||
self.centralwidget.setFixedHeight(self.centralwidget.sizeHint().height())
|
|
||||||
self.setFixedHeight(self.sizeHint().height())
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
logging.basicConfig(level=logging.INFO)
|
|
||||||
app = QtWidgets.QApplication(sys.argv)
|
app = QtWidgets.QApplication(sys.argv)
|
||||||
window = MainWindow(app=app)
|
window = MainWindow(app=app)
|
||||||
window.show()
|
window.show()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user