VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-09-27 07:16:48 -04:00
Code Issues Projects Releases Wiki Activity

Don't use gui/dmsspinbox.h for settings, as not available in server build

Browse Source
This commit is contained in:
Jon Beniston 2021-05-24 13:22:38 +01:00
parent 5f75e2578d
commit ea0ef1b95c
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/feature/startracker/startrackergui.cpp
View File

@ -32,6 +32,7 @@
#include "feature/featureuiset.h" #include "feature/featureuiset.h"
#include "feature/featurewebapiutils.h" #include "feature/featurewebapiutils.h"
#include "gui/basicfeaturesettingsdialog.h" #include "gui/basicfeaturesettingsdialog.h"
#include "gui/dmsspinbox.h"
#include "mainwindow.h" #include "mainwindow.h"
#include "device/deviceuiset.h" #include "device/deviceuiset.h"
#include "util/units.h" #include "util/units.h"
@ -304,8 +305,8 @@ void StarTrackerGUI::displaySettings()
ui->latitude->setValue(m_settings.m_latitude); ui->latitude->setValue(m_settings.m_latitude);
ui->longitude->setValue(m_settings.m_longitude); ui->longitude->setValue(m_settings.m_longitude);
ui->target->setCurrentIndex(ui->target->findText(m_settings.m_target)); ui->target->setCurrentIndex(ui->target->findText(m_settings.m_target));
ui->azimuth->setUnits(m_settings.m_azElUnits); ui->azimuth->setUnits((DMSSpinBox::DisplayUnits)m_settings.m_azElUnits);
ui->elevation->setUnits(m_settings.m_azElUnits); ui->elevation->setUnits((DMSSpinBox::DisplayUnits)m_settings.m_azElUnits);
if (m_settings.m_target == "Custom RA/Dec") if (m_settings.m_target == "Custom RA/Dec")
{ {
ui->rightAscension->setText(m_settings.m_ra); ui->rightAscension->setText(m_settings.m_ra);
@ -599,8 +600,8 @@ void StarTrackerGUI::on_displaySettings_clicked()
if (dialog.exec() == QDialog::Accepted) if (dialog.exec() == QDialog::Accepted)
{ {
applySettings(); applySettings();
ui->elevation->setUnits(m_settings.m_azElUnits); ui->elevation->setUnits((DMSSpinBox::DisplayUnits)m_settings.m_azElUnits);
ui->azimuth->setUnits(m_settings.m_azElUnits); ui->azimuth->setUnits((DMSSpinBox::DisplayUnits)m_settings.m_azElUnits);
displaySolarFlux(); displaySolarFlux();
if (ui->chartSelect->currentIndex() == 1) if (ui->chartSelect->currentIndex() == 1)
plotChart(); plotChart();

4
plugins/feature/startracker/startrackersettings.cpp
View File

@ -46,7 +46,7 @@ void StarTrackerSettings::resetToDefaults()
m_beamwidth = 25.0; m_beamwidth = 25.0;
m_enableServer = true; m_enableServer = true;
m_serverPort = 10001; m_serverPort = 10001;
m_azElUnits = DMSSpinBox::DM; m_azElUnits = DM;
m_solarFluxData = DRAO_2800; m_solarFluxData = DRAO_2800;
m_solarFluxUnits = SFU; m_solarFluxUnits = SFU;
m_updatePeriod = 1.0; m_updatePeriod = 1.0;
@ -137,7 +137,7 @@ bool StarTrackerSettings::deserialize(const QByteArray& data)
} else { } else {
m_serverPort = 10001; m_serverPort = 10001;
} }
d.readS32(9, (qint32 *)&m_azElUnits, DMSSpinBox::DM); d.readS32(9, (qint32 *)&m_azElUnits, DM);
d.readFloat(10, &m_updatePeriod, 1.0f); d.readFloat(10, &m_updatePeriod, 1.0f);
d.readBool(11, &m_jnow, false); d.readBool(11, &m_jnow, false);
d.readString(12, &m_refraction, "Positional Astronomy Library"); d.readString(12, &m_refraction, "Positional Astronomy Library");

3
plugins/feature/startracker/startrackersettings.h
View File

@ -23,7 +23,6 @@
#include <QString> #include <QString>
#include "util/message.h" #include "util/message.h"
#include "gui/dmsspinbox.h"
class Serializable; class Serializable;
@ -45,7 +44,7 @@ struct StarTrackerSettings
double m_beamwidth; // Beamwidth in degrees double m_beamwidth; // Beamwidth in degrees
uint16_t m_serverPort; uint16_t m_serverPort;
bool m_enableServer; // Enable Stellarium server bool m_enableServer; // Enable Stellarium server
enum DMSSpinBox::DisplayUnits m_azElUnits; enum AzElUnits {DMS, DM, D, Decimal} m_azElUnits; // This needs to match DMSSpinBox::DisplayUnits
enum SolarFluxData {DRAO_2800, L_245, L_410, L_610, L_1415, L2695, L_4995, L_8800, L_15400, TARGET_FREQ} m_solarFluxData; // What Solar flux density data to display enum SolarFluxData {DRAO_2800, L_245, L_410, L_610, L_1415, L2695, L_4995, L_8800, L_15400, TARGET_FREQ} m_solarFluxData; // What Solar flux density data to display
enum SolarFluxUnits {SFU, JANSKY, WATTS_M_HZ} m_solarFluxUnits; enum SolarFluxUnits {SFU, JANSKY, WATTS_M_HZ} m_solarFluxUnits;
float m_updatePeriod; float m_updatePeriod;

2
plugins/feature/startracker/startrackersettingsdialog.cpp
View File

@ -51,7 +51,7 @@ StarTrackerSettingsDialog::~StarTrackerSettingsDialog()
void StarTrackerSettingsDialog::accept() void StarTrackerSettingsDialog::accept()
{ {
m_settings->m_jnow = ui->epoch->currentIndex() == 1; m_settings->m_jnow = ui->epoch->currentIndex() == 1;
m_settings->m_azElUnits = (DMSSpinBox::DisplayUnits)ui->azElUnits->currentIndex(); m_settings->m_azElUnits = (StarTrackerSettings::AzElUnits)ui->azElUnits->currentIndex();
m_settings->m_updatePeriod = ui->updatePeriod->value(); m_settings->m_updatePeriod = ui->updatePeriod->value();
m_settings->m_serverPort = (uint16_t)ui->serverPort->value(); m_settings->m_serverPort = (uint16_t)ui->serverPort->value();
m_settings->m_enableServer = ui->enableServer->isChecked(); m_settings->m_enableServer = ui->enableServer->isChecked();