GPSDR++ V1.0.8

uugear · uugear · commit 507951de157d · 2025-11-16T15:21:43.000+01:00
Improved map zooming: center of map view will not move when zooming; The button on top will move (previous) GPS locked location  (instead of the map tile it belongs to) to the center of map view.
Improved ADS-B mode: prevent changing frequency and tuning mode when ADS-B mode is in used.
Fixed bug: with map view activated, volume control stays disabled, demodulation modes are missing, and frequency meter not updated after quitting the ADS-B mode, until waterfall view gets activated.
diff --git a/core/src/gui/main_window.cpp b/core/src/gui/main_window.cpp
@@ -428,11 +428,14 @@ void MainWindow::draw() {
     sigpath::sinkManager.showVolumeSlider(gui::waterfall.selectedVFO, "##_sdrpp_main_volume_", 238 * style::uiScale, btnSize.y, 5, true);
 
 	// Frequency select
+    if (freqSelectLocked) { style::beginDisabled();}
     ImGui::SameLine();
     ImGui::SetCursorPosY(origY);
     gui::freqSelect.draw();
+    if (freqSelectLocked) { style::endDisabled();}
 
 	// Tuning mode button
+    if (tuningModeLocked) { style::beginDisabled();}
     ImGui::SameLine();
     ImGui::SetCursorPosY(origY);
     if (tuningMode == tuner::TUNER_MODE_CENTER) {
@@ -458,6 +461,7 @@ void MainWindow::draw() {
         }
         ImGui::PopID();
     }
+    if (tuningModeLocked) { style::endDisabled(); }
 
 	// SNR meter
     ImGui::SameLine();
@@ -600,4 +604,8 @@ void MainWindow::setFirstMenuRender() {
 
 int MainWindow::getTuningMode() {
     return tuningMode;
-}
+}
+
+void MainWindow::setTuningMode(int mode) {
+    tuningMode = mode;
+}
diff --git a/core/src/gui/main_window.h b/core/src/gui/main_window.h
@@ -30,10 +30,14 @@ class MainWindow {
 
     bool lockWaterfallControls = false;
     bool playButtonLocked = false;
+    bool freqSelectLocked = false;
+    bool tuningModeLocked = false;
+    bool waterfallLocked = false;
 
     Event<bool> onPlayStateChange;
     
     int getTuningMode();
+    void setTuningMode(int mode);
 
 private:
     static void vfoAddedHandler(VFOManager::VFO* vfo, void* ctx);
diff --git a/core/src/gui/widgets/frequency_select.cpp b/core/src/gui/widgets/frequency_select.cpp
@@ -132,7 +132,7 @@ void FrequencySelect::draw() {
         }
     }
 
-    if (!gui::mainWindow.lockWaterfallControls) {
+    if (!gui::mainWindow.lockWaterfallControls && !gui::mainWindow.freqSelectLocked) {
         ImVec2 mousePos = ImGui::GetMousePos();
         bool leftClick = ImGui::IsMouseClicked(ImGuiMouseButton_Left);
         bool rightClick = ImGui::IsMouseClicked(ImGuiMouseButton_Right);
diff --git a/core/src/gui/widgets/map_view.cpp b/core/src/gui/widgets/map_view.cpp
@@ -466,30 +466,76 @@ void MapView::draw() {
 		ImVec2 btnSize(CONTROL_BUTTON_SIZE, CONTROL_BUTTON_SIZE);
 		ImVec2 ctrlPos = ImVec2(availableRegion.x - CONTROL_BUTTON_SIZE - CONTROL_BUTTON_MARGIN, CONTROL_BUTTON_MARGIN);
 		ImGui::SetCursorPos(ctrlPos);
-		if (ImGui::ImageButton(icons::LOCATE, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0))) {
-			prevPanLon = panLon = 0.0f;
-			prevPanLat = panLat = 0.0f;
-		}
-		ctrlPos.y += CONTROL_BUTTON_SIZE + CONTROL_BUTTON_MARGIN;
-		ImGui::SetCursorPos(ctrlPos);
-		if (ImGui::ImageButton(icons::ZOOM_IN, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0), zoom < 19 ? ImVec4(0, 0, 0, 1) : ImVec4(0, 0, 0, 0.3))) {
-			if (zoom < 19) {
-				zoom ++;
-				core::configManager.acquire();
-				core::configManager.conf["zoom"] = zoom;
-				core::configManager.release(true);
-			}
-		}
-		ctrlPos.y += CONTROL_BUTTON_SIZE + CONTROL_BUTTON_MARGIN;
-		ImGui::SetCursorPos(ctrlPos);
-		if (ImGui::ImageButton(icons::ZOOM_OUT, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0), zoom > 1 ? ImVec4(0, 0, 0, 1) : ImVec4(0, 0, 0, 0.3))) {
-			if (zoom > 1) {
-				zoom --;
-				core::configManager.acquire();
-				core::configManager.conf["zoom"] = zoom;
-				core::configManager.release(true);
-			}
+
+        // Center location
+        if (ImGui::ImageButton(icons::LOCATE, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0))) {
+            ImVec2 availableRegion = ImGui::GetContentRegionAvail();
+            ImVec2 screenCenter = ImVec2(availableRegion.x * 0.5f, availableRegion.y * 0.5f);
+            panLon = screenCenter.x - ((availableRegion.x - TILE_WIDTH) * 0.5f) - pxOffsetX;
+            panLat = screenCenter.y - ((availableRegion.y - TILE_HEIGHT) * 0.5f) - pxOffsetY;
+            prevPanLon = panLon;
+            prevPanLat = panLat;
+            core::configManager.acquire();
+            core::configManager.conf["panLon"] = panLon;
+            core::configManager.conf["panLat"] = panLat;
+            core::configManager.release(true);
 		}
+
+        // Zoom in
+        ctrlPos.y += CONTROL_BUTTON_SIZE + CONTROL_BUTTON_MARGIN;
+        ImGui::SetCursorPos(ctrlPos);
+        if (ImGui::ImageButton(icons::ZOOM_IN, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0), zoom < 19 ? ImVec4(0, 0, 0, 1) : ImVec4(0, 0, 0, 0.3))) {
+            if (zoom < 19) {
+                ImVec2 screenCenter = ImVec2(availableRegion.x * 0.5f, availableRegion.y * 0.5f);
+                ImVec2 tileScreenPos = ImVec2(offsetX, offsetY);
+                float centerOffsetFromGPSX = screenCenter.x - (tileScreenPos.x + pxOffsetX);
+                float centerOffsetFromGPSY = screenCenter.y - (tileScreenPos.y + pxOffsetY);
+                zoom++;
+                centerOffsetFromGPSX *= 2.0f;
+                centerOffsetFromGPSY *= 2.0f;
+                int newTileX, newTileY, newPxOffsetX, newPxOffsetY;
+                latLonToTilePixel(latitude, longitude, newTileX, newTileY, newPxOffsetX, newPxOffsetY);
+                float newTileDefaultX = (availableRegion.x - TILE_WIDTH) * 0.5f;
+                float newTileDefaultY = (availableRegion.y - TILE_HEIGHT) * 0.5f;
+                panLon = screenCenter.x - newTileDefaultX - newPxOffsetX - centerOffsetFromGPSX;
+                panLat = screenCenter.y - newTileDefaultY - newPxOffsetY - centerOffsetFromGPSY;
+                prevPanLon = panLon;
+                prevPanLat = panLat;
+                core::configManager.acquire();
+                core::configManager.conf["zoom"] = zoom;
+                core::configManager.conf["panLon"] = panLon;
+                core::configManager.conf["panLat"] = panLat;
+                core::configManager.release(true);
+            }
+        }
+
+        // Zoom out
+        ctrlPos.y += CONTROL_BUTTON_SIZE + CONTROL_BUTTON_MARGIN;
+        ImGui::SetCursorPos(ctrlPos);
+        if (ImGui::ImageButton(icons::ZOOM_OUT, btnSize, ImVec2(0, 0), ImVec2(1, 1), 5, ImVec4(0, 0, 0, 0), zoom > 1 ? ImVec4(0, 0, 0, 1) : ImVec4(0, 0, 0, 0.3))) {
+            if (zoom > 1) {
+                ImVec2 screenCenter = ImVec2(availableRegion.x * 0.5f, availableRegion.y * 0.5f);
+                ImVec2 tileScreenPos = ImVec2(offsetX, offsetY);
+                float centerOffsetFromGPSX = screenCenter.x - (tileScreenPos.x + pxOffsetX);
+                float centerOffsetFromGPSY = screenCenter.y - (tileScreenPos.y + pxOffsetY);
+                zoom--;
+                centerOffsetFromGPSX *= 0.5f;
+                centerOffsetFromGPSY *= 0.5f;
+                int newTileX, newTileY, newPxOffsetX, newPxOffsetY;
+                latLonToTilePixel(latitude, longitude, newTileX, newTileY, newPxOffsetX, newPxOffsetY);
+                float newTileDefaultX = (availableRegion.x - TILE_WIDTH) * 0.5f;
+                float newTileDefaultY = (availableRegion.y - TILE_HEIGHT) * 0.5f;
+                panLon = screenCenter.x - newTileDefaultX - newPxOffsetX - centerOffsetFromGPSX;
+                panLat = screenCenter.y - newTileDefaultY - newPxOffsetY - centerOffsetFromGPSY;
+                prevPanLon = panLon;
+                prevPanLat = panLat;
+                core::configManager.acquire();
+                core::configManager.conf["zoom"] = zoom;
+                core::configManager.conf["panLon"] = panLon;
+                core::configManager.conf["panLat"] = panLat;
+                core::configManager.release(true);
+            }
+        }
 		
 		// OpenStreetMap attribution
 		ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
diff --git a/core/src/gui/widgets/waterfall.cpp b/core/src/gui/widgets/waterfall.cpp
@@ -887,7 +887,7 @@ namespace ImGui {
         window->DrawList->AddRect(widgetPos, widgetEndPos, IM_COL32(50, 50, 50, 255), 0.0, 0, style::uiScale);
         //window->DrawList->AddLine(ImVec2(widgetPos.x, freqAreaMax.y), ImVec2(widgetPos.x + widgetSize.x, freqAreaMax.y), IM_COL32(50, 50, 50, 255), style::uiScale);
 
-        if (!gui::mainWindow.lockWaterfallControls) {
+        if (!gui::mainWindow.lockWaterfallControls && !gui::mainWindow.waterfallLocked) {
             inputHandled = false;
             InputHandlerArgs args;
             args.fftRectMin = fftAreaMin;
diff --git a/core/src/version.h b/core/src/version.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#define VERSION_STR "1.0.7"
+#define VERSION_STR "1.0.8"
diff --git a/decoder_modules/mode_s_decoder/src/main.cpp b/decoder_modules/mode_s_decoder/src/main.cpp
@@ -73,61 +73,73 @@ class ModeSDecoderModule : public ModuleManager::Instance {
 private:
 	static void onStart(ModeSDecoderModule* _this) {
 		_this->rtlSdrWasRunning = gui::mainWindow.isPlaying();
-		if (_this->rtlSdrWasRunning) {
-			gui::mainWindow.setPlayState(false);
-		}
-
-		if (sigpath::vfoManager.vfoExists("Radio")) {
-			_this->radioWasEnabled = true;
-			core::moduleManager.disableInstance("Radio");
-		}
 
-		core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_GET_SAMPLE_RATE_INDEX, NULL, &_this->oldSampleRateId);
+		core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_GET_SAMPLE_RATE_INDEX, NULL, &_this->savedSampleRateId);
 		int newSampleRateId = 5;    // Index for 2MHz in RTLSDRSource's sampleRates
 		core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_SET_SAMPLE_RATE_INDEX, &newSampleRateId, NULL);
 
-		_this->oldTuningFreq = gui::waterfall.getCenterFrequency();
-		gui::waterfall.setCenterFrequency(MODE_S_DEFAULT_FREQ);
-		gui::waterfall.centerFreqMoved = true;
+        _this->savedSelectedVFO = gui::waterfall.selectedVFO;
+        _this->savedFreq = gui::freqSelect.frequency;
+        _this->savedTuningMode = gui::mainWindow.getTuningMode();
+        if (gui::waterfall.selectedVFO != "") {
+            ImGui::WaterfallVFO* vfo = gui::waterfall.vfos[gui::waterfall.selectedVFO];
+            _this->savedSelectedVFOOffset = vfo->generalOffset;
+        }
 
-		_this->decoder.init(ModeSPage::getInstance().getContext(), sigpath::sourceManager.getSelectedSource()->stream);
-		_this->decoder.start();
+        gui::mainWindow.setTuningMode(tuner::TUNER_MODE_CENTER);
+        gui::mainWindow.waterfallLocked = true;
+        gui::mainWindow.freqSelectLocked = true;
+        gui::mainWindow.tuningModeLocked = true;
 
-		gui::mainWindow.setPlayState(true);
-		
-		ModeSPage::getInstance().addLog("Start");
+        if (_this->rtlSdrWasRunning) {  
+            gui::mainWindow.setPlayState(false);  
+        }  
+
+        if (sigpath::vfoManager.vfoExists("Radio")) {  
+            _this->radioWasEnabled = true;  
+            core::moduleManager.disableInstance("Radio");  
+        }  
+
+        tuner::tune(tuner::TUNER_MODE_CENTER, gui::waterfall.selectedVFO, MODE_S_DEFAULT_FREQ);  
+
+        _this->decoder.init(ModeSPage::getInstance().getContext(), sigpath::sourceManager.getSelectedSource()->stream);  
+        _this->decoder.start();  
+
+        gui::mainWindow.setPlayState(true);  
+
+        ModeSPage::getInstance().addLog("Start");  
 	}
 	
 	static void onStop(ModeSDecoderModule* _this) {
 		// If stop decoder here, pressing the "Play" button later will freeze the GUI, why?
 		//_this->decoder.stop();
 
 		gui::mainWindow.setPlayState(false);
-
-		gui::waterfall.setCenterFrequency(_this->oldTuningFreq);
-
-		core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_SET_SAMPLE_RATE_INDEX, &_this->oldSampleRateId, NULL);
-
-		if (_this->radioWasEnabled) {
+		
+        if (_this->radioWasEnabled) {
 			core::moduleManager.enableInstance("Radio");
 		}
 
+        core::modComManager.callInterface("RTL-SDR", RTL_SDR_SOURCE_IFACE_CMD_SET_SAMPLE_RATE_INDEX, &_this->savedSampleRateId, NULL);
+
+        gui::waterfall.selectedVFO = _this->savedSelectedVFO;
+        
+        if (gui::waterfall.selectedVFO != "") {
+            ImGui::WaterfallVFO* vfo = gui::waterfall.vfos[gui::waterfall.selectedVFO];
+            vfo->generalOffset = _this->savedSelectedVFOOffset;
+        }
+        
+        gui::mainWindow.setTuningMode(_this->savedTuningMode);
+        tuner::tune(_this->savedTuningMode, gui::waterfall.selectedVFO, _this->savedFreq);
+
 		if (_this->rtlSdrWasRunning) {
 			gui::mainWindow.setPlayState(true);
 		}
-		
-		// Save restored frequency here
-        core::configManager.acquire();
-        core::configManager.conf["frequency"] = gui::waterfall.getCenterFrequency();
-        ImGui::WaterfallVFO* vfo = NULL;
-        if (gui::waterfall.selectedVFO != "") {
-            vfo = gui::waterfall.vfos[gui::waterfall.selectedVFO];
-        }
-        if (vfo != NULL) {
-            core::configManager.conf["vfoOffsets"][gui::waterfall.selectedVFO] = vfo->generalOffset;
-        }
-        core::configManager.release(true);
-		
+
+        gui::mainWindow.waterfallLocked = false;
+        gui::mainWindow.freqSelectLocked = false;
+        gui::mainWindow.tuningModeLocked = false;
+
 		ModeSPage::getInstance().addLog("Stop");
 	}
 
@@ -170,8 +182,11 @@ class ModeSDecoderModule : public ModuleManager::Instance {
     bool run = false;
     bool radioWasEnabled = false;
     bool rtlSdrWasRunning = false;
-    int oldSampleRateId = 0;
-    double oldTuningFreq = 0;
+    int savedSampleRateId = 0;
+    double savedFreq = 0;
+    int savedTuningMode;
+    std::string savedSelectedVFO;
+    double savedSelectedVFOOffset = 0.0f;
 
     dsp::ModeSDecoder decoder;
 };

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ void FrequencySelect::draw() {`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`
`135`		`- if (!gui::mainWindow.lockWaterfallControls) {`
	`135`	`+ if (!gui::mainWindow.lockWaterfallControls && !gui::mainWindow.freqSelectLocked) {`
`136`	`136`	`ImVec2 mousePos = ImGui::GetMousePos();`
`137`	`137`	`bool leftClick = ImGui::IsMouseClicked(ImGuiMouseButton_Left);`
`138`	`138`	`bool rightClick = ImGui::IsMouseClicked(ImGuiMouseButton_Right);`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#pragma once`
`2`	`2`
`3`		`-#define VERSION_STR "1.0.7"`
	`3`	`+#define VERSION_STR "1.0.8"`