Some small changes to widgets

David Graeff · David Gräff
1 parent 5add000e
Showing 4 changed files with 42 additions and 41 deletions
openhantek/src/configdialog/DsoConfigFilesPage.cpp
openhantek/src/docks/TriggerDock.cpp
openhantek/src/docks/TriggerDock.h
openhantek/src/docks/dockwindows.cpp
@@ -11,12 +11,12 @@ DsoConfigFilesPage::DsoConfigFilesPage(DsoSettings *settings, QWidget *parent) :
     imageWidthSpinBox = new QSpinBox();
     imageWidthSpinBox->setMinimum(100);
     imageWidthSpinBox->setMaximum(9999);
-    imageWidthSpinBox->setValue(settings->options.imageSize.width());
+    imageWidthSpinBox->setValue(settings->exporting.imageSize.width());
     imageHeightLabel = new QLabel(tr("Image height"));
     imageHeightSpinBox = new QSpinBox();
     imageHeightSpinBox->setMinimum(100);
     imageHeightSpinBox->setMaximum(9999);
-    imageHeightSpinBox->setValue(settings->options.imageSize.height());
+    imageHeightSpinBox->setValue(settings->exporting.imageSize.height());
     exportLayout = new QGridLayout();
     exportLayout->addWidget(screenColorCheckBox, 0, 0, 1, 2);
@@ -30,7 +30,7 @@ DsoConfigFilesPage::DsoConfigFilesPage(DsoSettings *settings, QWidget *parent) :
     // Configuration group
     saveOnExitCheckBox = new QCheckBox(tr("Save default settings on exit"));
-    saveOnExitCheckBox->setChecked(settings->options.alwaysSave);
+    saveOnExitCheckBox->setChecked(settings->alwaysSave);
     saveNowButton = new QPushButton(tr("Save default settings now"));
     configurationLayout = new QVBoxLayout();
@@ -53,8 +53,8 @@ DsoConfigFilesPage::DsoConfigFilesPage(DsoSettings *settings, QWidget *parent) :
 /// \brief Saves the new settings.
 void DsoConfigFilesPage::saveSettings() {
-    settings->options.alwaysSave = saveOnExitCheckBox->isChecked();
+    settings->alwaysSave = saveOnExitCheckBox->isChecked();
     settings->view.screenColorImages = screenColorCheckBox->isChecked();
-    settings->options.imageSize.setWidth(imageWidthSpinBox->value());
-    settings->options.imageSize.setHeight(imageHeightSpinBox->value());
+    settings->exporting.imageSize.setWidth(imageWidthSpinBox->value());
+    settings->exporting.imageSize.setHeight(imageHeightSpinBox->value());
 }
@@ -12,32 +12,30 @@
 #include "TriggerDock.h"
 #include "dockwindows.h"
+#include "hantekdso/controlspecification.h"
 #include "settings.h"
 #include "sispinbox.h"
 #include "utils/dsoStrings.h"
 #include "utils/printutils.h"
-#include "hantekdso/controlspecification.h"
-TriggerDock::TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecification* spec, QWidget *parent,
+TriggerDock::TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecification *spec, QWidget *parent,
                          Qt::WindowFlags flags)
-    : QDockWidget(tr("Trigger"), parent, flags), scope(scope), spec(spec) {
+    : QDockWidget(tr("Trigger"), parent, flags), scope(scope), mSpec(spec) {
     // Initialize lists for comboboxes
-    for (ChannelID channel = 0; channel < spec->channels; ++channel)
+    for (ChannelID channel = 0; channel < mSpec->channels; ++channel)
         this->sourceStandardStrings << tr("CH%1").arg(channel + 1);
-    for(const Dso::SpecialTriggerChannel& specialTrigger: spec->specialTriggerChannels)
+    for (const Dso::SpecialTriggerChannel &specialTrigger : mSpec->specialTriggerChannels)
         this->sourceSpecialStrings.append(QString::fromStdString(specialTrigger.name));
     // Initialize elements
     this->modeLabel = new QLabel(tr("Mode"));
     this->modeComboBox = new QComboBox();
-    for (Dso::TriggerMode mode: spec->triggerModes)
-        this->modeComboBox->addItem(Dso::triggerModeString(mode));
+    for (Dso::TriggerMode mode : mSpec->triggerModes) this->modeComboBox->addItem(Dso::triggerModeString(mode));
     this->slopeLabel = new QLabel(tr("Slope"));
     this->slopeComboBox = new QComboBox();
-    for (Dso::Slope slope: Dso::SlopeEnum)
-        this->slopeComboBox->addItem(Dso::slopeString(slope));
+    for (Dso::Slope slope : Dso::SlopeEnum) this->slopeComboBox->addItem(Dso::slopeString(slope));
     this->sourceLabel = new QLabel(tr("Source"));
     this->sourceComboBox = new QComboBox();
@@ -63,26 +61,29 @@ TriggerDock::TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecificatio
     setSource(scope->trigger.special, scope->trigger.source);
     // Connect signals and slots
-    connect(this->modeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this,spec](int index) {
-        this->scope->trigger.mode = spec->triggerModes[(unsigned)index];
-        emit modeChanged(this->scope->trigger.mode);
-    });
-    connect(this->slopeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int index) {
-        this->scope->trigger.slope = (Dso::Slope)index;
-        emit slopeChanged(this->scope->trigger.slope);
-    });
-    connect(this->sourceComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [this](int index) {
-        bool special = false;
-
-        if (index >= this->sourceStandardStrings.count()) {
-            index -= this->sourceStandardStrings.count();
-            special = true;
-        }
-
-        this->scope->trigger.source = (unsigned) index;
-        this->scope->trigger.special = special;
-        emit sourceChanged(special, (unsigned)index);
-    });
+    connect(this->modeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            [this, spec](int index) {
+                this->scope->trigger.mode = mSpec->triggerModes[(unsigned)index];
+                emit modeChanged(this->scope->trigger.mode);
+            });
+    connect(this->slopeComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            [this](int index) {
+                this->scope->trigger.slope = (Dso::Slope)index;
+                emit slopeChanged(this->scope->trigger.slope);
+            });
+    connect(this->sourceComboBox, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
+            [this](int index) {
+                bool special = false;
+
+                if (index >= this->sourceStandardStrings.count()) {
+                    index -= this->sourceStandardStrings.count();
+                    special = true;
+                }
+
+                this->scope->trigger.source = (unsigned)index;
+                this->scope->trigger.special = special;
+                emit sourceChanged(special, (unsigned)index);
+            });
 }
 /// \brief Don't close the dock, just hide it
@@ -94,7 +95,7 @@ void TriggerDock::closeEvent(QCloseEvent *event) {
 }
 void TriggerDock::setMode(Dso::TriggerMode mode) {
-    int index = std::find(spec->triggerModes.begin(),spec->triggerModes.end(), mode) - spec->triggerModes.begin();
+    int index = std::find(mSpec->triggerModes.begin(), mSpec->triggerModes.end(), mode) - mSpec->triggerModes.begin();
     QSignalBlocker blocker(modeComboBox);
     modeComboBox->setCurrentIndex(index);
 }
@@ -11,7 +11,7 @@
 #include "hantekdso/enums.h"
 class SiSpinBox;
-class DsoSettingsScope;
+struct DsoSettingsScope;
 namespace Dso {
 struct ControlSpecification;
 }
@@ -27,7 +27,7 @@ class TriggerDock : public QDockWidget {
     /// \param spec
     /// \param parent The parent widget.
     /// \param flags Flags for the window manager.
-    TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecification* spec, QWidget *parent, Qt::WindowFlags flags = 0);
+    TriggerDock(DsoSettingsScope *scope, const Dso::ControlSpecification* mSpec, QWidget *parent, Qt::WindowFlags flags = 0);
     /// \brief Changes the trigger mode if the new mode is supported.
     /// \param mode The trigger mode.
@@ -55,7 +55,7 @@ class TriggerDock : public QDockWidget {
     QComboBox *slopeComboBox;  ///< Select the slope that causes triggering
     DsoSettingsScope *scope; ///< The settings provided by the parent class
-    const Dso::ControlSpecification* spec;
+    const Dso::ControlSpecification* mSpec;
     QStringList sourceStandardStrings; ///< Strings for the standard trigger sources
     QStringList sourceSpecialStrings;  ///< Strings for the special trigger sources
@@ -8,9 +8,9 @@
 #include <cmath>
-#include "analyse/enums.h"
+#include "post/enums.h"
 #include "hantekdso/enums.h"
-#include "hantekprotocol/definitions.h"
+#include "hantekprotocol/types.h"
 #include "dockwindows.h"
 void SetupDockWidget(QDockWidget *dockWindow, QWidget *dockWidget, QLayout *layout) {