fix #374 start / stop roll mode sampling (almost) immediately

this small change was implemented despite feature freeze Signed-off-by: Martin <Ho-Ro@users.noreply.github.com>
OpenHantek · Aug 9, 2023 · b98f23d · b98f23d
1 parent 9a3d953
commit b98f23d
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 11 deletions.
diff --git a/openhantek/src/hantekdso/hantekdsocontrol.cpp b/openhantek/src/hantekdso/hantekdsocontrol.cpp
@@ -438,10 +438,12 @@ void HantekDsoControl::restartSampling() {
 
 /// \brief Start sampling process.
 void HantekDsoControl::enableSamplingUI( bool enabled ) {
-    if ( verboseLevel > 4 )
-        qDebug() << "    HDC::enableSampling()" << enabled;
+    if ( verboseLevel > 3 )
+        qDebug() << "   HDC::enableSampling()" << enabled;
     if ( enabled && controlsettings.trigger.mode == Dso::TriggerMode::SINGLE )
         triggering->resetTriggeredPositionRaw(); // invalidate previous result, wait for new trigger
+    else if ( controlsettings.trigger.mode == Dso::TriggerMode::ROLL )
+        samplingStarted = enabled; // start / stop roll mode sampling (almost) immediately
     samplingUI = enabled;
     updateSamplerateLimits();
     emit showSamplingStatus( enabled );

diff --git a/openhantek/translations/openhantek_de.ts b/openhantek/translations/openhantek_de.ts
@@ -941,7 +941,7 @@
         <translation type="vanished">Konnte Kanalpegeldaten des Oszilloskops nicht lesen</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Konnte Kalibrierdaten des Oszilloskops nicht lesen, benutze eine config-Datei für die Kalibrierung!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_es.ts b/openhantek/translations/openhantek_es.ts
@@ -785,7 +785,7 @@
         <translation type="vanished">No se pudieron obtener los datos de calibración del osciloscopio</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>No se pudieron obtener los datos de calibración del osciloscopio. ¡Usa un archivo de configuración para la calibración!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_fr.ts b/openhantek/translations/openhantek_fr.ts
@@ -889,7 +889,7 @@
         <translation type="vanished">Impossible d&apos;obtenir les données de niveau du canal depuis l&apos;oscilloscope</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Impossible d&apos;obtenir les données de niveau du canal depuis l&apos;oscilloscope. Utilisez un fichier de configuration pour la calibration !</translation>
     </message>

diff --git a/openhantek/translations/openhantek_it.ts b/openhantek/translations/openhantek_it.ts
@@ -685,7 +685,7 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Impossibile ottenere i dati di calibrazione dall&apos;EEPROM dell&apos;oscilloscopio. Utilizzare un file di configurazione per la calibrazione!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_pl.ts b/openhantek/translations/openhantek_pl.ts
@@ -901,7 +901,7 @@
         <translation type="vanished">Nie można uzyskać danych o poziomie kanału z oscyloskopu</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Nie można pobrać danych kalibracyjnych z pamięci EEPROM oscyloskopu. Użyj pliku konfiguracyjnego do kalibracji!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_pt.ts b/openhantek/translations/openhantek_pt.ts
@@ -884,7 +884,7 @@
         <translation type="vanished">Não foi possível obter dados do canal do osciloscópio</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Não foi possível obter dados de calibração a partir da EEPROM do osciloscópio. Use um arquivo de configuração para a calibração!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_ru.ts b/openhantek/translations/openhantek_ru.ts
@@ -839,7 +839,7 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Не удалось получить данные калибровки из EEPROM осциллографа. Используйте файл конфигурации для калибровки!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_sv.ts b/openhantek/translations/openhantek_sv.ts
@@ -701,7 +701,7 @@
 <context>
     <name>HantekDsoControl</name>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>Kunde inte hämta kalibreringsdata från oscilloskopets EEPROM. Använd en konfigurationsfil för kalibrering!</translation>
     </message>

diff --git a/openhantek/translations/openhantek_zh.ts b/openhantek/translations/openhantek_zh.ts
@@ -897,7 +897,7 @@
         <translation type="vanished">获取示波器通道数据失败</translation>
     </message>
     <message>
-        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="572"/>
+        <location filename="../src/hantekdso/hantekdsocontrol.cpp" line="574"/>
         <source>Couldn&apos;t get calibration data from oscilloscope&apos;s EEPROM. Use a config file for calibration!</source>
         <translation>从示波器EEPOM获取校准数据失败，请使用配置文件进行校准！</translation>
     </message>