improved behavior after X data range changes

Author: jirimaier

src/mainwindow/mainwindow.cpp

@@ -37,12 +37,12 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
   updateDownloadUrl = GithubReleasesUrl;
 
   auto platform = AppSettings::getPlatformInfo();
-  if(platform == "windows_portable"){
-      configFilePath = QApplication::applicationDirPath() + "/settings/config.ini";
+  if (platform == "windows_portable") {
+    configFilePath = QApplication::applicationDirPath() + "/settings/config.ini";
     updateDownloadUrl = GithubReleasesUrl;
   }
 
-  if (platform == "windows_store"){
+  if (platform == "windows_store") {
     updateDownloadUrl = MisrosoftStoreUrl;
     developerOptions->getUi()->pushButtonOpenConfig->setVisible(false);
   }
@@ -721,6 +721,10 @@ void MainWindow::mainPlotHRangeMaxChanged(QCPRange range) {
   double sizeRatio = qBound(0.0, range.size() / fullrange, 1.0);
   int zoomFactor = round(m * sizeRatio);
 
+  bool preserveFullRange = ui->dialZoom->value() == ui->dialZoom->maximum();
+  qDebug() << "preserveFullRange:" << preserveFullRange;
+  qDebug() << "zoomFactor:" << zoomFactor;
+
   ui->dialZoom->blockSignals(true);
   ui->dialZoom->setValue(zoomFactor);
   ui->dialZoom->blockSignals(false);
@@ -734,6 +738,10 @@ void MainWindow::mainPlotHRangeMaxChanged(QCPRange range) {
   ui->horizontalScrollBarHorizontal->setValue(posFactor);
   ui->horizontalScrollBarHorizontal->setSliderPosition(posFactor);
   ui->horizontalScrollBarHorizontal->blockSignals(false);
+
+  if (preserveFullRange) {
+    ui->dialZoom->setValue(ui->dialZoom->maximum());
+  }
 }
 
 void MainWindow::mainPlotVRangeChanged(QCPRange range) {

src/plots/mymainplot.cpp

@@ -144,8 +144,8 @@ void MyMainPlot::updateMinMaxTimes() {
       setMaxZoomX(QCPRange(minT, maxT + xAxis->range().size()), xRangeUnknown || maxT > maxZoomX.upper || minT < maxZoomX.lower);
       updateRollingState(maxT);
     } else {
-      double diff = abs(maxT - maxZoomX.upper) / maxZoomX.upper + abs(minT - maxZoomX.lower) / maxZoomX.lower;
-      setMaxZoomX(QCPRange(minT, maxT), xRangeUnknown || diff > 0.1);
+      double diff = abs(maxT - maxZoomX.upper) + abs(minT - maxZoomX.lower);
+      setMaxZoomX(QCPRange(minT, maxT), xRangeUnknown || false);
       if (!qFuzzyIsNull(diff))
         emit hRangeMaxChanged(maxZoomX);
     }