Introduce PostProcessingSettings. Remove utils/dsoStrings and add translation methods directly to the location where the relevant enums are declared. Remove union for math-channel/coupling value: Some compilers have issues here.

Author: David Graeff

openhantek/readme.md

@@ -52,8 +52,28 @@ and the graphical part.
 
 All OpenGL rendering takes place in the `GlScope` class. A helper class `GlScopeGraph` contains exactly one
 data sample snapshot including all channels for voltage and spectrum and a pointer to the respective GPU buffer.
-`GlScope` works for OpenGL 3.2 and OpenGL ES 2.0, but this needs to be decided at compile time. Usually Qt
-selects the right interface.
+`GlScope` works for OpenGL 3.2 and OpenGL ES 2.0. If both is present, OpenGL will be prefered, but can be
+overwritten by the user via a command flag.
+
+### Export
+
+All export related funtionality is within *src/exporting*.
+
+The following exporters are implemented:
+
+* Export to comma separated value file (CSV): Write to a user selected file,
+* Export to an image/pdf: Writes an image/pdf to a user selected file,
+* Print exporter: Creates a printable document and opens the print dialog.
+
+All export classes (exportcsv, exportimage, exportprint) implement the
+ExporterInterface and are registered to the ExporterRegistry in the main.cpp.
+
+Some export classes are still using the legacyExportDrawer class to
+draw the grid and paint all the labels, values and graphs.
+
+The plan is to retire this legacy class and replace the paint code with
+a `GlScope` class shared OpenGL drawing code for at least the grid and the
+scope graphs.
 
 ## Data flow
 

openhantek/src/configdialog/DsoConfigAnalysisPage.cpp

@@ -15,14 +15,14 @@ DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings, QWidget *par
     windowFunctionLabel = new QLabel(tr("Window function"));
     windowFunctionComboBox = new QComboBox();
     windowFunctionComboBox->addItems(windowFunctionStrings);
-    windowFunctionComboBox->setCurrentIndex((int)settings->scope.spectrumWindow);
+    windowFunctionComboBox->setCurrentIndex((int)settings->post.spectrumWindow);
 
     referenceLevelLabel = new QLabel(tr("Reference level"));
     referenceLevelSpinBox = new QDoubleSpinBox();
     referenceLevelSpinBox->setDecimals(1);
     referenceLevelSpinBox->setMinimum(-40.0);
     referenceLevelSpinBox->setMaximum(100.0);
-    referenceLevelSpinBox->setValue(settings->scope.spectrumReference);
+    referenceLevelSpinBox->setValue(settings->post.spectrumReference);
     referenceLevelUnitLabel = new QLabel(tr("dBm"));
     referenceLevelLayout = new QHBoxLayout();
     referenceLevelLayout->addWidget(referenceLevelSpinBox);
@@ -33,7 +33,7 @@ DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings, QWidget *par
     minimumMagnitudeSpinBox->setDecimals(1);
     minimumMagnitudeSpinBox->setMinimum(-40.0);
     minimumMagnitudeSpinBox->setMaximum(100.0);
-    minimumMagnitudeSpinBox->setValue(settings->scope.spectrumLimit);
+    minimumMagnitudeSpinBox->setValue(settings->post.spectrumLimit);
     minimumMagnitudeUnitLabel = new QLabel(tr("dBm"));
     minimumMagnitudeLayout = new QHBoxLayout();
     minimumMagnitudeLayout->addWidget(minimumMagnitudeSpinBox);
@@ -59,7 +59,7 @@ DsoConfigAnalysisPage::DsoConfigAnalysisPage(DsoSettings *settings, QWidget *par
 
 /// \brief Saves the new settings.
 void DsoConfigAnalysisPage::saveSettings() {
-    settings->scope.spectrumWindow = (Dso::WindowFunction)windowFunctionComboBox->currentIndex();
-    settings->scope.spectrumReference = referenceLevelSpinBox->value();
-    settings->scope.spectrumLimit = minimumMagnitudeSpinBox->value();
+    settings->post.spectrumWindow = (Dso::WindowFunction)windowFunctionComboBox->currentIndex();
+    settings->post.spectrumReference = referenceLevelSpinBox->value();
+    settings->post.spectrumLimit = minimumMagnitudeSpinBox->value();
 }

openhantek/src/docks/HorizontalDock.cpp

@@ -15,7 +15,6 @@
 
 #include "scopesettings.h"
 #include "sispinbox.h"
-#include "utils/dsoStrings.h"
 #include "utils/printutils.h"
 
 template<typename... Args> struct SELECT {

openhantek/src/docks/SpectrumDock.cpp

@@ -14,7 +14,6 @@
 
 #include "settings.h"
 #include "sispinbox.h"
-#include "utils/dsoStrings.h"
 #include "utils/printutils.h"
 
 template<typename... Args> struct SELECT {

openhantek/src/docks/TriggerDock.cpp

@@ -15,7 +15,6 @@
 #include "hantekdso/controlspecification.h"
 #include "settings.h"
 #include "sispinbox.h"
-#include "utils/dsoStrings.h"
 #include "utils/printutils.h"
 
 TriggerDock::TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecification *spec, QWidget *parent,

openhantek/src/docks/VoltageDock.cpp

@@ -14,7 +14,6 @@
 
 #include "settings.h"
 #include "sispinbox.h"
-#include "utils/dsoStrings.h"
 #include "utils/printutils.h"
 
 template<typename... Args> struct SELECT {
@@ -66,9 +65,9 @@ VoltageDock::VoltageDock(DsoSettingsScope *scope, const Dso::ControlSpecificatio
         dockLayout->addWidget(b.invertCheckBox, (int)channel * 3 + 2, 1);
 
         if (channel < spec->channels)
-            setCoupling(channel, scope->voltage[channel].couplingIndex);
+            setCoupling(channel, scope->voltage[channel].couplingOrMathIndex);
         else
-            setMode(scope->voltage[channel].math);
+            setMode(scope->voltage[channel].couplingOrMathIndex);
         setGain(channel, scope->voltage[channel].gainStepIndex);
         setUsed(channel, scope->voltage[channel].used);
 
@@ -80,12 +79,11 @@ VoltageDock::VoltageDock(DsoSettingsScope *scope, const Dso::ControlSpecificatio
             this->scope->voltage[channel].inverted = checked;
         });
         connect(b.miscComboBox, SELECT<int>::OVERLOAD_OF(&QComboBox::currentIndexChanged), [this,channel,spec,scope](int index){
+            this->scope->voltage[channel].couplingOrMathIndex = (unsigned)index;
             if (channel < spec->channels) {
-                this->scope->voltage[channel].couplingIndex = (unsigned)index;
                 emit couplingChanged(channel, scope->coupling(channel, spec));
             } else {
-                this->scope->voltage[channel].math = (Dso::MathMode) index;
-                emit modeChanged(this->scope->voltage[channel].math);
+                emit modeChanged(Dso::getMathMode(this->scope->voltage[channel]));
             }
         });
         connect(b.usedCheckBox, &QAbstractButton::toggled, [this,channel](bool checked) {
@@ -119,9 +117,9 @@ void VoltageDock::setGain(ChannelID channel, unsigned gainStepIndex) {
     channelBlocks[channel].gainComboBox->setCurrentIndex((unsigned)gainStepIndex);
 }
 
-void VoltageDock::setMode(Dso::MathMode mode) {
+void VoltageDock::setMode(unsigned mathModeIndex) {
     QSignalBlocker blocker(channelBlocks[spec->channels].miscComboBox);
-    channelBlocks[spec->channels].miscComboBox->setCurrentIndex((int)mode);
+    channelBlocks[spec->channels].miscComboBox->setCurrentIndex((int)mathModeIndex);
 }
 
 void VoltageDock::setUsed(ChannelID channel, bool used) {

openhantek/src/docks/VoltageDock.h

@@ -10,6 +10,7 @@
 
 #include "scopesettings.h"
 #include "hantekdso/controlspecification.h"
+#include "post/postprocessingsettings.h"
 
 class SiSpinBox;
 
@@ -28,7 +29,7 @@ class VoltageDock : public QDockWidget {
 
     /// \brief Sets the coupling for a channel.
     /// \param channel The channel, whose coupling should be set.
-    /// \param coupling The coupling-mode.
+    /// \param couplingIndex The coupling-mode index.
     void setCoupling(ChannelID channel, unsigned couplingIndex);
 
     /// \brief Sets the gain for a channel.
@@ -37,8 +38,8 @@ class VoltageDock : public QDockWidget {
     void setGain(ChannelID channel, unsigned gainStepIndex);
 
     /// \brief Sets the mode for the math channel.
-    /// \param mode The math-mode.
-    void setMode(Dso::MathMode mode);
+    /// \param mathModeIndex The math-mode index.
+    void setMode(unsigned mathModeIndex);
 
     /// \brief Enables/disables a channel.
     /// \param channel The channel, that should be enabled/disabled.

openhantek/src/docks/dockwindows.cpp

@@ -8,7 +8,7 @@
 
 #include <cmath>
 
-#include "post/enums.h"
+#include "post/postprocessingsettings.h"
 #include "hantekdso/enums.h"
 #include "hantekprotocol/types.h"
 #include "dockwindows.h"

openhantek/src/dsowidget.cpp

@@ -10,10 +10,10 @@
 
 #include "dsowidget.h"
 
+#include "post/postprocessingsettings.h"
 #include "post/graphgenerator.h"
 #include "post/ppresult.h"
 
-#include "utils/dsoStrings.h"
 #include "utils/printutils.h"
 
 #include "glscope.h"
@@ -252,10 +252,6 @@ void DsoWidget::setupSliders(DsoWidget::Sliders &sliders) {
     }
 }
 
-void DsoWidget::setExporterForNextFrame(std::unique_ptr<Exporter> exporter) {
-    this->exportNextFrame = std::move(exporter);
-}
-
 /// \brief Set the trigger level sliders minimum and maximum to the new values.
 void DsoWidget::adaptTriggerLevelSlider(DsoWidget::Sliders &sliders, ChannelID channel) {
     sliders.triggerLevelSlider->setLimits((int)channel,
@@ -422,7 +418,8 @@ void DsoWidget::updateVoltageCoupling(ChannelID channel) {
 
 /// \brief Handles modeChanged signal from the voltage dock.
 void DsoWidget::updateMathMode() {
-    measurementMiscLabel[spec->channels]->setText(Dso::mathModeString(scope->voltage[spec->channels].math));
+    measurementMiscLabel[spec->channels]->setText(
+        Dso::mathModeString(Dso::getMathMode(scope->voltage[spec->channels])));
 }
 
 /// \brief Handles gainChanged signal from the voltage dock.
@@ -486,15 +483,8 @@ void DsoWidget::updateZoom(bool enabled) {
 
 /// \brief Prints analyzed data.
 void DsoWidget::showNew(std::shared_ptr<PPresult> data) {
-    if (exportNextFrame) {
-        exportNextFrame->exportSamples(data.get());
-        exportNextFrame.reset(nullptr);
-    }
-
-    mainScope->showData(data.get());
-    mainScope->update();
-    zoomScope->showData(data.get());
-    zoomScope->update();
+    mainScope->showData(data);
+    zoomScope->showData(data);
 
     if (spec->isSoftwareTriggerDevice) {
         QPalette triggerLabelPalette = palette();

openhantek/src/dsowidget.h

@@ -8,7 +8,6 @@
 #include <QGridLayout>
 #include <memory>
 
-#include "exporting/exporter.h"
 #include "glscope.h"
 #include "levelslider.h"
 #include "hantekdso/controlspecification.h"
@@ -36,7 +35,6 @@ class DsoWidget : public QWidget {
     /// \param parent The parent widget.
     /// \param flags Flags for the window manager.
     DsoWidget(DsoSettingsScope* scope, DsoSettingsView* view, const Dso::ControlSpecification* spec, QWidget *parent = 0, Qt::WindowFlags flags = 0);
-    void setExporterForNextFrame(std::unique_ptr<Exporter> exporter);
 
     // Data arrived
     void showNew(std::shared_ptr<PPresult> data);
@@ -87,7 +85,6 @@ class DsoWidget : public QWidget {
 
     GlScope *mainScope;     ///< The main scope screen
     GlScope *zoomScope;     ///< The optional magnified scope screen
-    std::unique_ptr<Exporter> exportNextFrame;
 
   public slots:
     // Horizontal axis