diff --git a/startup.py b/horus-gui.py similarity index 100% rename from startup.py rename to horus-gui.py diff --git a/horus-gui.spec b/horus-gui.spec new file mode 100644 index 0000000..3d2cee8 --- /dev/null +++ b/horus-gui.spec @@ -0,0 +1,37 @@ +# -*- mode: python ; coding: utf-8 -*- + +block_cipher = None + + +a = Analysis(['horus-gui.py'], + pathex=['.'], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) +exe = EXE(pyz, + a.scripts, + [], + exclude_binaries=True, + name='startup', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=True ) +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='horus-gui') diff --git a/horusgui/__init__.py b/horusgui/__init__.py index 485f44a..b3f4756 100755 --- a/horusgui/__init__.py +++ b/horusgui/__init__.py @@ -1 +1 @@ -__version__ = "0.1.1" +__version__ = "0.1.2" diff --git a/horusgui/gui.py b/horusgui/gui.py index 39cf051..3bd3a02 100644 --- a/horusgui/gui.py +++ b/horusgui/gui.py @@ -278,13 +278,15 @@ d2_snr.addWidget(w3_snr) # Telemetry Data w4_data = pg.LayoutWidget() widgets["latestRawSentenceLabel"] = QtGui.QLabel("Latest Packet (Raw):") -widgets["latestRawSentenceData"] = QtGui.QLabel("NO DATA") -widgets["latestRawSentenceData"].setFont(QtGui.QFont("Courier New", 18, QtGui.QFont.Bold)) -widgets["latestRawSentenceData"].setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse) +widgets["latestRawSentenceData"] = QtGui.QLineEdit("NO DATA") +widgets["latestRawSentenceData"].setReadOnly(True) +#widgets["latestRawSentenceData"].setFont(QtGui.QFont("Courier New", 18, QtGui.QFont.Bold)) +#widgets["latestRawSentenceData"].setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse) widgets["latestDecodedSentenceLabel"] = QtGui.QLabel("Latest Packet (Decoded):") -widgets["latestDecodedSentenceData"] = QtGui.QLabel("NO DATA") -widgets["latestDecodedSentenceData"].setFont(QtGui.QFont("Courier New", 18, QtGui.QFont.Bold)) -widgets["latestDecodedSentenceData"].setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse) +widgets["latestDecodedSentenceData"] = QtGui.QLineEdit("NO DATA") +widgets["latestDecodedSentenceData"].setReadOnly(True) +#widgets["latestDecodedSentenceData"].setFont(QtGui.QFont("Courier New", 18, QtGui.QFont.Bold)) +#widgets["latestDecodedSentenceData"].setTextInteractionFlags(QtCore.Qt.TextSelectableByMouse) w4_data.addWidget(widgets["latestRawSentenceLabel"], 0, 0, 1, 1) w4_data.addWidget(widgets["latestRawSentenceData"], 0, 1, 1, 6) w4_data.addWidget(widgets["latestDecodedSentenceLabel"], 1, 0, 1, 1) @@ -292,30 +294,31 @@ w4_data.addWidget(widgets["latestDecodedSentenceData"], 1, 1, 1, 6) d3_data.addWidget(w4_data) w4_position = pg.LayoutWidget() +POSITION_LABEL_FONT_SIZE = 16 widgets["latestPacketCallsignLabel"] = QtGui.QLabel("Callsign") widgets["latestPacketCallsignValue"] = QtGui.QLabel("---") -widgets["latestPacketCallsignValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketCallsignValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketTimeLabel"] = QtGui.QLabel("Time") widgets["latestPacketTimeValue"] = QtGui.QLabel("---") -widgets["latestPacketTimeValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketTimeValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketLatitudeLabel"] = QtGui.QLabel("Latitude") widgets["latestPacketLatitudeValue"] = QtGui.QLabel("---") -widgets["latestPacketLatitudeValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketLatitudeValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketLongitudeLabel"] = QtGui.QLabel("Longitude") widgets["latestPacketLongitudeValue"] = QtGui.QLabel("---") -widgets["latestPacketLongitudeValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketLongitudeValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketAltitudeLabel"] = QtGui.QLabel("Altitude") widgets["latestPacketAltitudeValue"] = QtGui.QLabel("---") -widgets["latestPacketAltitudeValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketAltitudeValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketBearingLabel"] = QtGui.QLabel("Bearing") widgets["latestPacketBearingValue"] = QtGui.QLabel("---") -widgets["latestPacketBearingValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketBearingValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketElevationLabel"] = QtGui.QLabel("Elevation") widgets["latestPacketElevationValue"] = QtGui.QLabel("---") -widgets["latestPacketElevationValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketElevationValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) widgets["latestPacketRangeLabel"] = QtGui.QLabel("Range (km)") widgets["latestPacketRangeValue"] = QtGui.QLabel("---") -widgets["latestPacketRangeValue"].setFont(QtGui.QFont("Courier New", 16, QtGui.QFont.Bold)) +widgets["latestPacketRangeValue"].setFont(QtGui.QFont("Courier New", POSITION_LABEL_FONT_SIZE, QtGui.QFont.Bold)) w4_position.addWidget(widgets["latestPacketCallsignLabel"], 0, 0, 1, 2) w4_position.addWidget(widgets["latestPacketCallsignValue"], 1, 0, 1, 2) @@ -686,7 +689,6 @@ def processQueues(): # Once initialised, enable the start button widgets["startDecodeButton"].setEnabled(True) - gui_update_timer = QtCore.QTimer() gui_update_timer.timeout.connect(processQueues) gui_update_timer.start(100) diff --git a/pyproject.toml b/pyproject.toml index 2baee57..9c6fe5a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "horusgui" -version = "0.1.1" +version = "0.1.2" description = "" authors = ["Mark Jessop "]