From 894394909bf6283e2170a215854aa9fc4ded43e9 Mon Sep 17 00:00:00 2001 From: f4exb Date: Wed, 28 Sep 2016 13:38:38 +0200 Subject: [PATCH] Handle my geolocation --- sdrbase/mainwindow.h | 1 + sdrbase/settings/mainsettings.h | 5 +++++ sdrbase/settings/preferences.cpp | 6 ++++++ sdrbase/settings/preferences.h | 8 ++++++++ 4 files changed, 20 insertions(+) diff --git a/sdrbase/mainwindow.h b/sdrbase/mainwindow.h index ea86d5be6..d13042121 100644 --- a/sdrbase/mainwindow.h +++ b/sdrbase/mainwindow.h @@ -82,6 +82,7 @@ public: void setInputGUI(int deviceTabIndex, QWidget* gui, const QString& sourceDisplayName); const QTimer& getMasterTimer() const { return m_masterTimer; } + const MainSettings& getMainSettings() const { return m_settings; } private: enum { diff --git a/sdrbase/settings/mainsettings.h b/sdrbase/settings/mainsettings.h index 20b6d8d9e..dacaced07 100644 --- a/sdrbase/settings/mainsettings.h +++ b/sdrbase/settings/mainsettings.h @@ -25,6 +25,11 @@ public: int getSourceIndex() const { return m_preferences.getSourceIndex(); } void setSourceIndex(int value) { m_preferences.setSourceIndex(value); } + void setLatitude(float latitude) { m_preferences.setLatitude(latitude); } + void setLongitude(float longitude) { m_preferences.setLongitude(longitude); } + float getLatitude() const { return m_preferences.getLatitude(); } + float getLongitude() const { return m_preferences.getLongitude(); } + protected: Preferences m_preferences; Preset m_workingPreset; diff --git a/sdrbase/settings/preferences.cpp b/sdrbase/settings/preferences.cpp index afe8bbd47..e94557921 100644 --- a/sdrbase/settings/preferences.cpp +++ b/sdrbase/settings/preferences.cpp @@ -13,6 +13,8 @@ void Preferences::resetToDefaults() m_audioType.clear(); m_audioDevice.clear(); m_sourceIndex = 0; + m_latitude = 0.0; + m_longitude = 0.0; } QByteArray Preferences::serialize() const @@ -23,6 +25,8 @@ QByteArray Preferences::serialize() const s.writeString(3, m_audioType); s.writeString(4, m_audioDevice); s.writeS32(5, m_sourceIndex); + s.writeFloat(6, m_latitude); + s.writeFloat(7, m_longitude); return s.final(); } @@ -41,6 +45,8 @@ bool Preferences::deserialize(const QByteArray& data) d.readString(3, &m_audioType); d.readString(4, &m_audioDevice); d.readS32(5, &m_sourceIndex, 0); + d.readFloat(6, &m_latitude, 0.0); + d.readFloat(7, &m_longitude, 0.0); return true; } else { resetToDefaults(); diff --git a/sdrbase/settings/preferences.h b/sdrbase/settings/preferences.h index 5e6bec1fe..8bf8ae41a 100644 --- a/sdrbase/settings/preferences.h +++ b/sdrbase/settings/preferences.h @@ -23,6 +23,11 @@ public: void setAudioDevice(const QString& value) { m_audioDevice= value; } const QString& getAudioDevice() const { return m_audioDevice; } + void setLatitude(float latitude) { m_latitude = latitude; } + void setLongitude(float longitude) { m_longitude = longitude; } + float getLatitude() const { return m_latitude; } + float getLongitude() const { return m_longitude; } + protected: QString m_sourceType; QString m_sourceDevice; @@ -30,6 +35,9 @@ protected: QString m_audioType; QString m_audioDevice; + + float m_latitude; + float m_longitude; }; #endif // INCLUDE_PREFERENCES_H