From febf0650748953dfc6031c21629a36ef054bf96a Mon Sep 17 00:00:00 2001 From: Martin Date: Tue, 17 Mar 2020 21:53:20 +0100 Subject: [PATCH] upversion, small histogram ui improvement Signed-off-by: Martin --- CHANGELOG | 12 ++++++++ openhantek/src/OH_BUILD.h | 2 +- openhantek/src/OH_VERSION.h | 2 +- openhantek/src/mainwindow.cpp | 4 +++ openhantek/src/post/graphgenerator.h | 2 +- openhantek/translations/openhantek_de.ts | 38 ++++++++++++------------ openhantek/translations/openhantek_fr.ts | 38 ++++++++++++------------ openhantek/translations/openhantek_it.ts | 38 ++++++++++++------------ openhantek/translations/openhantek_pt.ts | 38 ++++++++++++------------ 9 files changed, 95 insertions(+), 79 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e03ff904..e473ea1a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +3.0.3 +2020-03-17 +FW 0205 +Fix histogram issue when switching TY -> XY + +3.0.2 +2020-03-01 +Apply realtime prio and scheduler +Histogram for TY voltage traces +Variable probe gain setting +French translation complete + 3.0.1 2019-12-13 More robust USB handling for all OSs diff --git a/openhantek/src/OH_BUILD.h b/openhantek/src/OH_BUILD.h index cfaecd44..5e99a29b 100644 --- a/openhantek/src/OH_BUILD.h +++ b/openhantek/src/OH_BUILD.h @@ -1,2 +1,2 @@ // Do not edit, will be re-created at each commit! -#define OH_BUILD "20200315 build 616" +#define OH_BUILD "20200317 build 617" diff --git a/openhantek/src/OH_VERSION.h b/openhantek/src/OH_VERSION.h index e0951f95..a73d75cc 100644 --- a/openhantek/src/OH_VERSION.h +++ b/openhantek/src/OH_VERSION.h @@ -1,7 +1,7 @@ // define the version that is shown on top of the program // if undefined (for development commits) the build will be shown by OpenHantek -// #define OH_VERSION "3.0.2" +#define OH_VERSION "3.0.3" # ifdef OH_VERSION diff --git a/openhantek/src/mainwindow.cpp b/openhantek/src/mainwindow.cpp index 60705478..329c0c2b 100644 --- a/openhantek/src/mainwindow.cpp +++ b/openhantek/src/mainwindow.cpp @@ -151,6 +151,9 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, Expo connect(horizontalDock, &HorizontalDock::calfreqChanged, [dsoControl, this]() { dsoControl->setCalFreq(dsoSettings->scope.horizontal.calfreq); }); + connect(horizontalDock, &HorizontalDock::formatChanged, [this]( Dso::GraphFormat format ) { + ui->actionHistogram->setEnabled( format == Dso::GraphFormat::TY ); + }); connect(triggerDock, &TriggerDock::modeChanged, dsoControl, &HantekDsoControl::setTriggerMode); connect(triggerDock, &TriggerDock::modeChanged, dsoWidget, &DsoWidget::updateTriggerMode); @@ -298,6 +301,7 @@ MainWindow::MainWindow(HantekDsoControl *dsoControl, DsoSettings *settings, Expo this->ui->actionHistogram->setStatusTip(tr("Show histogram")); }); ui->actionHistogram->setChecked(dsoSettings->scope.histogram); + ui->actionHistogram->setEnabled( scope->horizontal.format == Dso::GraphFormat::TY ); connect(ui->actionZoom, &QAction::toggled, [this](bool enabled) { dsoSettings->view.zoom = enabled; diff --git a/openhantek/src/post/graphgenerator.h b/openhantek/src/post/graphgenerator.h index 3c3dd371..2e8dba87 100644 --- a/openhantek/src/post/graphgenerator.h +++ b/openhantek/src/post/graphgenerator.h @@ -24,11 +24,11 @@ class GraphGenerator : public QObject, public Processor { public: GraphGenerator(const DsoSettingsScope *scope ); - void generateGraphsXY(PPresult *result); private: void generateGraphsTYvoltage(PPresult *result); void generateGraphsTYspectrum(PPresult *result); + void generateGraphsXY(PPresult *result); bool ready = false; const DsoSettingsScope *scope; diff --git a/openhantek/translations/openhantek_de.ts b/openhantek/translations/openhantek_de.ts index 23e28d30..eaaa8937 100644 --- a/openhantek/translations/openhantek_de.ts +++ b/openhantek/translations/openhantek_de.ts @@ -653,93 +653,93 @@ - + Stop - + Stop the oscilloscope - + Start - + Start the oscilloscope - + Open file - - + + Settings (*.ini) - + Save settings - + Disable fading of previous graphs - + Enable fading of previous graphs - + Hide histogram - + Show histogram - + Hide magnified scope - + Show magnified scope - + Hide measurements - + Show measurements - + About OpenHantek6022 (%1) - + <p>Open source software for Hantek6022 USB oscilloscopes</p><p>Copyright &copy; 2010, 2011 Oliver Haag</p><p>Copyright &copy; 2012-2020 OpenHantek community<br/><a href='https://github.com/OpenHantek'>https://github.com/OpenHantek</a></p><p>Open source firmware copyright &copy; 2019-2020 Ho-Ro<br/><a href='https://github.com/Ho-Ro/Hantek6022API'>https://github.com/Ho-Ro/Hantek6022API</a></p> - + %1: %2 diff --git a/openhantek/translations/openhantek_fr.ts b/openhantek/translations/openhantek_fr.ts index 20042f2d..3e9f210b 100644 --- a/openhantek/translations/openhantek_fr.ts +++ b/openhantek/translations/openhantek_fr.ts @@ -653,93 +653,93 @@ - + Stop - + Stop the oscilloscope - + Start - + Start the oscilloscope - + Open file - - + + Settings (*.ini) - + Save settings - + Disable fading of previous graphs - + Enable fading of previous graphs - + Hide histogram - + Show histogram - + Hide magnified scope - + Show magnified scope - + Hide measurements - + Show measurements - + About OpenHantek6022 (%1) - + <p>Open source software for Hantek6022 USB oscilloscopes</p><p>Copyright &copy; 2010, 2011 Oliver Haag</p><p>Copyright &copy; 2012-2020 OpenHantek community<br/><a href='https://github.com/OpenHantek'>https://github.com/OpenHantek</a></p><p>Open source firmware copyright &copy; 2019-2020 Ho-Ro<br/><a href='https://github.com/Ho-Ro/Hantek6022API'>https://github.com/Ho-Ro/Hantek6022API</a></p> - + %1: %2 diff --git a/openhantek/translations/openhantek_it.ts b/openhantek/translations/openhantek_it.ts index 49b7a513..55614525 100644 --- a/openhantek/translations/openhantek_it.ts +++ b/openhantek/translations/openhantek_it.ts @@ -653,93 +653,93 @@ - + Stop - + Stop the oscilloscope - + Start - + Start the oscilloscope - + Open file - - + + Settings (*.ini) - + Save settings - + Disable fading of previous graphs - + Enable fading of previous graphs - + Hide histogram - + Show histogram - + Hide magnified scope - + Show magnified scope - + Hide measurements - + Show measurements - + About OpenHantek6022 (%1) - + <p>Open source software for Hantek6022 USB oscilloscopes</p><p>Copyright &copy; 2010, 2011 Oliver Haag</p><p>Copyright &copy; 2012-2020 OpenHantek community<br/><a href='https://github.com/OpenHantek'>https://github.com/OpenHantek</a></p><p>Open source firmware copyright &copy; 2019-2020 Ho-Ro<br/><a href='https://github.com/Ho-Ro/Hantek6022API'>https://github.com/Ho-Ro/Hantek6022API</a></p> - + %1: %2 diff --git a/openhantek/translations/openhantek_pt.ts b/openhantek/translations/openhantek_pt.ts index fe68d617..53911be4 100644 --- a/openhantek/translations/openhantek_pt.ts +++ b/openhantek/translations/openhantek_pt.ts @@ -653,93 +653,93 @@ - + Stop - + Stop the oscilloscope - + Start - + Start the oscilloscope - + Open file - - + + Settings (*.ini) - + Save settings - + Disable fading of previous graphs - + Enable fading of previous graphs - + Hide histogram - + Show histogram - + Hide magnified scope - + Show magnified scope - + Hide measurements - + Show measurements - + About OpenHantek6022 (%1) - + <p>Open source software for Hantek6022 USB oscilloscopes</p><p>Copyright &copy; 2010, 2011 Oliver Haag</p><p>Copyright &copy; 2012-2020 OpenHantek community<br/><a href='https://github.com/OpenHantek'>https://github.com/OpenHantek</a></p><p>Open source firmware copyright &copy; 2019-2020 Ho-Ro<br/><a href='https://github.com/Ho-Ro/Hantek6022API'>https://github.com/Ho-Ro/Hantek6022API</a></p> - + %1: %2