blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-31 08:50:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add GPS source selection to settings dialog

Browse source
This commit is contained in:
Dan Paulat 2024-05-15 23:13:42 -05:00
parent f263011e97
commit d4515f08e0
2 changed files with 242 additions and 187 deletions
Download patch file Download diff file Expand all files Collapse all files

56
scwx-qt/source/scwx/qt/ui/settings_dialog.cpp
View file

@ -22,6 +22,7 @@
#include <scwx/qt/types/time_types.hpp> #include <scwx/qt/types/time_types.hpp>
#include <scwx/qt/ui/county_dialog.hpp> #include <scwx/qt/ui/county_dialog.hpp>
#include <scwx/qt/ui/radar_site_dialog.hpp> #include <scwx/qt/ui/radar_site_dialog.hpp>
#include <scwx/qt/ui/serial_port_dialog.hpp>
#include <scwx/qt/ui/settings/hotkey_settings_widget.hpp> #include <scwx/qt/ui/settings/hotkey_settings_widget.hpp>
#include <scwx/qt/ui/settings/unit_settings_widget.hpp> #include <scwx/qt/ui/settings/unit_settings_widget.hpp>
#include <scwx/qt/util/color.hpp> #include <scwx/qt/util/color.hpp>
@ -102,6 +103,7 @@ public:
explicit SettingsDialogImpl(SettingsDialog* self) : explicit SettingsDialogImpl(SettingsDialog* self) :
self_ {self}, self_ {self},
radarSiteDialog_ {new RadarSiteDialog(self)}, radarSiteDialog_ {new RadarSiteDialog(self)},
gpsSourceDialog_ {new SerialPortDialog(self)},
countyDialog_ {new CountyDialog(self)}, countyDialog_ {new CountyDialog(self)},
fontDialog_ {new QFontDialog(self)}, fontDialog_ {new QFontDialog(self)},
fontCategoryModel_ {new QStandardItemModel(self)}, fontCategoryModel_ {new QStandardItemModel(self)},
@ -193,10 +195,11 @@ public:
RadarSiteLabel(std::shared_ptr<config::RadarSite>& radarSite); RadarSiteLabel(std::shared_ptr<config::RadarSite>& radarSite);
static void SetBackgroundColor(const std::string& value, QFrame* frame); static void SetBackgroundColor(const std::string& value, QFrame* frame);
SettingsDialog* self_; SettingsDialog* self_;
RadarSiteDialog* radarSiteDialog_; RadarSiteDialog* radarSiteDialog_;
CountyDialog* countyDialog_; SerialPortDialog* gpsSourceDialog_;
QFontDialog* fontDialog_; CountyDialog* countyDialog_;
QFontDialog* fontDialog_;
QStandardItemModel* fontCategoryModel_; QStandardItemModel* fontCategoryModel_;
@ -332,6 +335,32 @@ void SettingsDialogImpl::ConnectSignals()
} }
}); });
QObject::connect(self_->ui->gpsSourceSelectButton,
&QAbstractButton::clicked,
self_,
[this]() { gpsSourceDialog_->show(); });
QObject::connect(gpsSourceDialog_,
&SerialPortDialog::accepted,
self_,
[this]()
{
std::string serialPort = gpsSourceDialog_->serial_port();
int baudRate = gpsSourceDialog_->baud_rate();
if (!serialPort.empty() && serialPort != "?")
{
std::string source =
fmt::format("serial:{}", serialPort);
nmeaSource_.StageValue(source);
}
if (baudRate > 0)
{
self_->ui->nmeaBaudRateSpinBox->setValue(baudRate);
}
});
// Update the Radar Site dialog "map" location with the currently selected // Update the Radar Site dialog "map" location with the currently selected
// radar site // radar site
auto& defaultRadarSite = *defaultRadarSite_.GetSettingsVariable(); auto& defaultRadarSite = *defaultRadarSite_.GetSettingsVariable();
@ -559,6 +588,25 @@ void SettingsDialogImpl::SetupGeneralTab()
types::GetDefaultTimeZoneName); types::GetDefaultTimeZoneName);
defaultTimeZone_.SetResetButton(self_->ui->resetDefaultTimeZoneButton); defaultTimeZone_.SetResetButton(self_->ui->resetDefaultTimeZoneButton);
QObject::connect(
self_->ui->positioningPluginComboBox,
&QComboBox::currentTextChanged,
self_,
[this](const QString& text)
{
types::PositioningPlugin positioningPlugin =
types::GetPositioningPlugin(text.toStdString());
bool gpsSourceEnabled =
positioningPlugin == types::PositioningPlugin::Nmea;
self_->ui->nmeaSourceLineEdit->setEnabled(gpsSourceEnabled);
self_->ui->gpsSourceSelectButton->setEnabled(gpsSourceEnabled);
self_->ui->nmeaBaudRateSpinBox->setEnabled(gpsSourceEnabled);
self_->ui->resetNmeaSourceButton->setEnabled(gpsSourceEnabled);
self_->ui->resetNmeaBaudRateButton->setEnabled(gpsSourceEnabled);
});
positioningPlugin_.SetSettingsVariable(generalSettings.positioning_plugin()); positioningPlugin_.SetSettingsVariable(generalSettings.positioning_plugin());
SCWX_SETTINGS_COMBO_BOX(positioningPlugin_, SCWX_SETTINGS_COMBO_BOX(positioningPlugin_,
self_->ui->positioningPluginComboBox, self_->ui->positioningPluginComboBox,

373
scwx-qt/source/scwx/qt/ui/settings_dialog.ui
View file

@ -159,6 +159,48 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item row="13" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>MapTiler API Key</string>
</property>
</widget>
</item>
<item row="6" column="4">
<widget class="QToolButton" name="resetGridHeightButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="11" column="2">
<widget class="QComboBox" name="mapProviderComboBox"/>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Default Time Zone</string>
</property>
</widget>
</item>
<item row="12" column="4">
<widget class="QToolButton" name="resetMapboxApiKeyButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="6" column="2">
<widget class="QSpinBox" name="gridHeightSpinBox"/>
</item>
<item row="4" column="4"> <item row="4" column="4">
<widget class="QToolButton" name="resetDefaultTimeZoneButton"> <widget class="QToolButton" name="resetDefaultTimeZoneButton">
<property name="text"> <property name="text">
@ -170,8 +212,18 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="4"> <item row="11" column="0">
<widget class="QToolButton" name="resetMapboxApiKeyButton"> <widget class="QLabel" name="label_7">
<property name="text">
<string>Map Provider</string>
</property>
</widget>
</item>
<item row="4" column="2">
<widget class="QComboBox" name="defaultTimeZoneComboBox"/>
</item>
<item row="18" column="4">
<widget class="QToolButton" name="resetThemeButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
@ -181,21 +233,51 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="2">
<widget class="QLabel" name="label_20"> <widget class="QComboBox" name="clockFormatComboBox"/>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="radarSiteComboBox"/>
</item>
<item row="9" column="3">
<widget class="QToolButton" name="gpsSourceSelectButton">
<property name="text"> <property name="text">
<string>Clock Format</string> <string>...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="0"> <item row="12" column="2">
<widget class="QLabel" name="label_25"> <widget class="QLineEdit" name="mapboxApiKeyLineEdit">
<property name="text"> <property name="echoMode">
<string>NMEA Source</string> <enum>QLineEdit::EchoMode::Password</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="4"> <item row="8" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>GPS Plugin</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>GPS Baud Rate</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QSpinBox" name="gridWidthSpinBox"/>
</item>
<item row="3" column="3">
<widget class="QToolButton" name="radarSiteSelectButton">
<property name="text">
<string>...</string>
</property>
</widget>
</item>
<item row="21" column="4">
<widget class="QToolButton" name="resetWarningsProviderButton"> <widget class="QToolButton" name="resetWarningsProviderButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -206,10 +288,47 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="5" column="0">
<widget class="QLabel" name="label_4"> <widget class="QLabel" name="label_2">
<property name="text"> <property name="text">
<string>Mapbox API Key</string> <string>Grid Width</string>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLineEdit" name="nmeaSourceLineEdit"/>
</item>
<item row="18" column="2">
<widget class="QComboBox" name="themeComboBox"/>
</item>
<item row="8" column="2">
<widget class="QComboBox" name="positioningPluginComboBox"/>
</item>
<item row="9" column="0">
<widget class="QLabel" name="label_25">
<property name="text">
<string>GPS Source</string>
</property>
</widget>
</item>
<item row="21" column="2">
<widget class="QLineEdit" name="warningsProviderLineEdit"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Default Radar Site</string>
</property>
</widget>
</item>
<item row="3" column="4">
<widget class="QToolButton" name="resetRadarSiteButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
@ -220,84 +339,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3"> <item row="2" column="4">
<widget class="QToolButton" name="radarSiteSelectButton"> <widget class="QToolButton" name="resetDefaultAlertActionButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget> </widget>
</item> </item>
<item row="18" column="0"> <item row="18" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Warnings Provider</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QComboBox" name="clockFormatComboBox"/>
</item>
<item row="5" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Grid Width</string>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QComboBox" name="radarSiteComboBox"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="defaultAlertActionLabel">
<property name="text">
<string>Default Alert Action</string>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Default Time Zone</string>
</property>
</widget>
</item>
<item row="13" column="0">
<widget class="QLabel" name="label_24">
<property name="text">
<string>NMEA Baud Rate</string>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="defaultAlertActionComboBox"/>
</item>
<item row="10" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>MapTiler API Key</string>
</property>
</widget>
</item>
<item row="15" column="2">
<widget class="QComboBox" name="themeComboBox"/>
</item>
<item row="15" column="0">
<widget class="QLabel" name="label_5"> <widget class="QLabel" name="label_5">
<property name="text"> <property name="text">
<string>Theme</string> <string>Theme</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="2">
<widget class="QComboBox" name="positioningPluginComboBox"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label">
<property name="text">
<string>Default Radar Site</string>
</property>
</widget>
</item>
<item row="1" column="4"> <item row="1" column="4">
<widget class="QToolButton" name="resetClockFormatButton"> <widget class="QToolButton" name="resetClockFormatButton">
<property name="text"> <property name="text">
@ -309,83 +368,27 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="12" column="0">
<widget class="QSpinBox" name="gridHeightSpinBox"/> <widget class="QLabel" name="label_4">
</item>
<item row="3" column="4">
<widget class="QToolButton" name="resetRadarSiteButton">
<property name="text"> <property name="text">
<string>...</string> <string>Mapbox API Key</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="1" column="0">
<widget class="QComboBox" name="defaultTimeZoneComboBox"/> <widget class="QLabel" name="label_20">
</item>
<item row="10" column="4">
<widget class="QToolButton" name="resetMapTilerApiKeyButton">
<property name="text"> <property name="text">
<string>...</string> <string>Clock Format</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property> </property>
</widget> </widget>
</item> </item>
<item row="18" column="2"> <item row="13" column="2">
<widget class="QLineEdit" name="warningsProviderLineEdit"/> <widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
</item>
<item row="6" column="4">
<widget class="QToolButton" name="resetGridHeightButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="15" column="4">
<widget class="QToolButton" name="resetThemeButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="9" column="2">
<widget class="QLineEdit" name="mapboxApiKeyLineEdit">
<property name="echoMode"> <property name="echoMode">
<enum>QLineEdit::EchoMode::Password</enum> <enum>QLineEdit::EchoMode::Password</enum>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2">
<widget class="QComboBox" name="mapProviderComboBox"/>
</item>
<item row="2" column="4">
<widget class="QToolButton" name="resetDefaultAlertActionButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QSpinBox" name="gridWidthSpinBox"/>
</item>
<item row="5" column="4"> <item row="5" column="4">
<widget class="QToolButton" name="resetGridWidthButton"> <widget class="QToolButton" name="resetGridWidthButton">
<property name="text"> <property name="text">
@ -397,7 +400,45 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="4"> <item row="13" column="4">
<widget class="QToolButton" name="resetMapTilerApiKeyButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../../scwx-qt.qrc">
<normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</normaloff>:/res/icons/font-awesome-6/rotate-left-solid.svg</iconset>
</property>
</widget>
</item>
<item row="2" column="2">
<widget class="QComboBox" name="defaultAlertActionComboBox"/>
</item>
<item row="21" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Warnings Provider</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QSpinBox" name="nmeaBaudRateSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999999999</number>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="defaultAlertActionLabel">
<property name="text">
<string>Default Alert Action</string>
</property>
</widget>
</item>
<item row="11" column="4">
<widget class="QToolButton" name="resetMapProviderButton"> <widget class="QToolButton" name="resetMapProviderButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -408,41 +449,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="0"> <item row="8" column="4">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Map Provider</string>
</property>
</widget>
</item>
<item row="10" column="2">
<widget class="QLineEdit" name="mapTilerApiKeyLineEdit">
<property name="echoMode">
<enum>QLineEdit::EchoMode::Password</enum>
</property>
</widget>
</item>
<item row="11" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Positioning Plugin</string>
</property>
</widget>
</item>
<item row="14" column="2">
<widget class="QLineEdit" name="nmeaSourceLineEdit"/>
</item>
<item row="13" column="2">
<widget class="QSpinBox" name="nmeaBaudRateSpinBox">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>999999999</number>
</property>
</widget>
</item>
<item row="11" column="4">
<widget class="QToolButton" name="resetPositioningPluginButton"> <widget class="QToolButton" name="resetPositioningPluginButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
@ -453,8 +460,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="13" column="4"> <item row="9" column="4">
<widget class="QToolButton" name="resetNmeaBaudRateButton"> <widget class="QToolButton" name="resetNmeaSourceButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>
@ -464,8 +471,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="4"> <item row="10" column="4">
<widget class="QToolButton" name="resetNmeaSourceButton"> <widget class="QToolButton" name="resetNmeaBaudRateButton">
<property name="text"> <property name="text">
<string>...</string> <string>...</string>
</property> </property>