mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-12-25 10:28:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added persistent config for VFO offsets

Browse Source
This commit is contained in:
Ryzerth 2021-04-22 02:00:33 +02:00
parent eb8cd09e65
commit d3ad4a5035
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/config.cpp
View File

@ -59,9 +59,9 @@ void ConfigManager::disableAutoSave() {
std::lock_guard<std::mutex> lock(termMtx); std::lock_guard<std::mutex> lock(termMtx);
autoSaveEnabled = false; autoSaveEnabled = false;
termFlag = true; termFlag = true;
termCond.notify_one();
} }
autoSaveThread.join(); termCond.notify_one();
if (autoSaveThread.joinable()) { autoSaveThread.join(); }
} }
} }

2
core/src/core.cpp
View File

@ -152,6 +152,8 @@ int sdrpp_main(int argc, char *argv[]) {
defConfig["windowSize"]["h"] = 720; defConfig["windowSize"]["h"] = 720;
defConfig["windowSize"]["w"] = 1280; defConfig["windowSize"]["w"] = 1280;
defConfig["vfoOffsets"] = json::object();
#ifdef _WIN32 #ifdef _WIN32
defConfig["modulesDirectory"] = "./modules"; defConfig["modulesDirectory"] = "./modules";
defConfig["resourcesDirectory"] = "./res"; defConfig["resourcesDirectory"] = "./res";

21
core/src/gui/main_window.cpp
View File

@ -240,6 +240,15 @@ void windowInit() {
centerTuning = core::configManager.conf["centerTuning"]; centerTuning = core::configManager.conf["centerTuning"];
// Load each VFO's offset
for (auto const& [name, _vfo] : gui::waterfall.vfos) {
if (!core::configManager.conf["vfoOffsets"].contains(name)) {
continue;
}
double offset = core::configManager.conf["vfoOffsets"][name];
sigpath::vfoManager.setOffset(name, std::clamp<double>(offset, -bw/2.0, bw/2.0));
}
core::configManager.release(); core::configManager.release();
} }
@ -360,7 +369,7 @@ void drawWindow() {
gui::freqSelect.setFrequency(gui::waterfall.getCenterFrequency() + vfo->generalOffset); gui::freqSelect.setFrequency(gui::waterfall.getCenterFrequency() + vfo->generalOffset);
gui::freqSelect.frequencyChanged = false; gui::freqSelect.frequencyChanged = false;
core::configManager.aquire(); core::configManager.aquire();
core::configManager.conf["frequency"] = gui::freqSelect.frequency; core::configManager.conf["vfoOffsets"][gui::waterfall.selectedVFO] = vfo->generalOffset;
core::configManager.release(true); core::configManager.release(true);
} }
} }
@ -371,9 +380,6 @@ void drawWindow() {
gui::waterfall.selectedVFOChanged = false; gui::waterfall.selectedVFOChanged = false;
gui::freqSelect.setFrequency(vfo->generalOffset + gui::waterfall.getCenterFrequency()); gui::freqSelect.setFrequency(vfo->generalOffset + gui::waterfall.getCenterFrequency());
gui::freqSelect.frequencyChanged = false; gui::freqSelect.frequencyChanged = false;
core::configManager.aquire();
core::configManager.conf["frequency"] = gui::freqSelect.frequency;
core::configManager.release(true);
} }
if (gui::freqSelect.frequencyChanged) { if (gui::freqSelect.frequencyChanged) {
@ -385,7 +391,10 @@ void drawWindow() {
vfo->upperOffsetChanged = false; vfo->upperOffsetChanged = false;
} }
core::configManager.aquire(); core::configManager.aquire();
core::configManager.conf["frequency"] = gui::freqSelect.frequency; core::configManager.conf["frequency"] = gui::waterfall.getCenterFrequency();
if (vfo != NULL) {
core::configManager.conf["vfoOffsets"][gui::waterfall.selectedVFO] = vfo->generalOffset;
}
core::configManager.release(true); core::configManager.release(true);
} }
@ -399,7 +408,7 @@ void drawWindow() {
gui::freqSelect.setFrequency(gui::waterfall.getCenterFrequency()); gui::freqSelect.setFrequency(gui::waterfall.getCenterFrequency());
} }
core::configManager.aquire(); core::configManager.aquire();
core::configManager.conf["frequency"] = gui::freqSelect.frequency; core::configManager.conf["frequency"] = gui::waterfall.getCenterFrequency();
core::configManager.release(true); core::configManager.release(true);
} }