mirror
/
horus-gui
kopia lustrzana https://github.com/projecthorus/horus-gui
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Add altitude field for better elevation calculations

pyqt6 v0.3.6
Mark Jessop 2022-03-19 11:25:02 +10:30
rodzic 3ad17a15b4
commit 7976342c36
4 zmienionych plików z 21 dodań i 13 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
horusgui/__init__.py
Wyświetl plik

@ -1 +1 @@
__version__ = "0.3.5"
__version__ = "0.3.6"

5
horusgui/config.py
Wyświetl plik

@ -25,6 +25,7 @@ default_config = {
"habitat_call": "N0CALL",
"habitat_lat": 0.0,
"habitat_lon": 0.0,
"habitat_alt": 0.0,
"habitat_antenna": "",
"habitat_radio": "",
"horus_udp_enabled": True,
@ -72,7 +73,7 @@ def read_config(widgets):
""" Read in configuration settings from Qt """
global qt_settings, default_config
OK_VERSIONS = [__version__, '0.3.4', '0.3.1', '0.2.1']
OK_VERSIONS = [__version__, '0.3.5', '0.3.4', '0.3.1', '0.2.1']
# Try and read in the version parameter from QSettings
if qt_settings.value("version") not in OK_VERSIONS:
@ -93,6 +94,7 @@ def read_config(widgets):
widgets["userCallEntry"].setText(str(default_config["habitat_call"]))
widgets["userLatEntry"].setText(str(default_config["habitat_lat"]))
widgets["userLonEntry"].setText(str(default_config["habitat_lon"]))
widgets["userAltEntry"].setText(str(default_config["habitat_alt"]))
widgets["userAntennaEntry"].setText(str(default_config["habitat_antenna"]))
widgets["userRadioEntry"].setText(str(default_config["habitat_radio"]))
@ -148,6 +150,7 @@ def save_config(widgets):
default_config["habitat_call"] = widgets["userCallEntry"].text()
default_config["habitat_lat"] = float(widgets["userLatEntry"].text())
default_config["habitat_lon"] = float(widgets["userLonEntry"].text())
default_config["habitat_alt"] = float(widgets["userAltEntry"].text())
default_config["habitat_antenna"] = widgets["userAntennaEntry"].text()
default_config["habitat_radio"] = widgets["userRadioEntry"].text()
default_config["horus_udp_enabled"] = widgets["horusUploadSelector"].isChecked()

25
horusgui/gui.py
Wyświetl plik

@ -232,6 +232,9 @@ widgets["userLatEntry"] = QtGui.QLineEdit("0.0")
widgets["userLatEntry"].setToolTip("Station Latitude in Decimal Degrees, e.g. -34.123456")
widgets["userLonEntry"] = QtGui.QLineEdit("0.0")
widgets["userLonEntry"].setToolTip("Station Longitude in Decimal Degrees, e.g. 138.123456")
widgets["userAltitudeLabel"] = QtGui.QLabel("<b>Altitude:</b>")
widgets["userAltEntry"] = QtGui.QLineEdit("0.0")
widgets["userAltEntry"].setToolTip("Station Altitude in Metres Above Sea Level.")
widgets["userAntennaLabel"] = QtGui.QLabel("<b>Antenna:</b>")
widgets["userAntennaEntry"] = QtGui.QLineEdit("")
widgets["userAntennaEntry"].setToolTip("A text description of your station's antenna.")
@ -265,15 +268,17 @@ w1_habitat.addWidget(widgets["userCallEntry"], 2, 1, 1, 2)
w1_habitat.addWidget(widgets["userLocationLabel"], 3, 0, 1, 1)
w1_habitat.addWidget(widgets["userLatEntry"], 3, 1, 1, 1)
w1_habitat.addWidget(widgets["userLonEntry"], 3, 2, 1, 1)
w1_habitat.addWidget(widgets["userAntennaLabel"], 4, 0, 1, 1)
w1_habitat.addWidget(widgets["userAntennaEntry"], 4, 1, 1, 2)
w1_habitat.addWidget(widgets["userRadioLabel"], 5, 0, 1, 1)
w1_habitat.addWidget(widgets["userRadioEntry"], 5, 1, 1, 2)
w1_habitat.addWidget(widgets["dialFreqLabel"], 6, 0, 1, 1)
w1_habitat.addWidget(widgets["dialFreqEntry"], 6, 1, 1, 2)
w1_habitat.addWidget(widgets["habitatUploadPosition"], 7, 0, 1, 3)
w1_habitat.layout.setRowStretch(8, 1)
w1_habitat.addWidget(widgets["saveSettingsButton"], 9, 0, 1, 3)
w1_habitat.addWidget(widgets["userAltitudeLabel"], 4, 0, 1, 1)
w1_habitat.addWidget(widgets["userAltEntry"], 4, 1, 1, 2)
w1_habitat.addWidget(widgets["userAntennaLabel"], 5, 0, 1, 1)
w1_habitat.addWidget(widgets["userAntennaEntry"], 5, 1, 1, 2)
w1_habitat.addWidget(widgets["userRadioLabel"], 6, 0, 1, 1)
w1_habitat.addWidget(widgets["userRadioEntry"], 6, 1, 1, 2)
w1_habitat.addWidget(widgets["dialFreqLabel"], 7, 0, 1, 1)
w1_habitat.addWidget(widgets["dialFreqEntry"], 7, 1, 1, 2)
w1_habitat.addWidget(widgets["habitatUploadPosition"], 8, 0, 1, 3)
w1_habitat.layout.setRowStretch(9, 1)
w1_habitat.addWidget(widgets["saveSettingsButton"], 10, 0, 1, 3)
d0_habitat.addWidget(w1_habitat)
@ -892,7 +897,7 @@ def handle_new_packet(frame):
try:
_station_lat = float(widgets["userLatEntry"].text())
_station_lon = float(widgets["userLonEntry"].text())
_station_alt = 0.0
_station_alt = float(widgets["userAltEntry"].text())
if (_station_lat != 0.0) or (_station_lon != 0.0):
_position_info = position_info(

2
pyproject.toml
Wyświetl plik

@ -1,6 +1,6 @@
[tool.poetry]
name = "horusgui"
version = "0.3.5"
version = "0.3.6"
description = ""
authors = ["Mark Jessop <vk5qi@rfhead.net>"]