Register std::vector<unsigned> to the Qt metadata system to make it work with si…

…gnal/slots. Fixes #101

Register std::vector<unsigned> to the Qt metadata system to make it work with si…
…gnal/slots. Fixes #101
David Graeff · David Gräff
1 parent c9da580c
Showing 8 changed files with 4 additions and 20 deletions
openhantek/src/docks/HorizontalDock.h
openhantek/src/docks/SpectrumDock.cpp
openhantek/src/docks/SpectrumDock.h
openhantek/src/docks/TriggerDock.cpp
openhantek/src/docks/TriggerDock.h
openhantek/src/docks/VoltageDock.cpp
openhantek/src/docks/VoltageDock.h
openhantek/src/docks/dockwindows.cpp
@@ -5,6 +5,7 @@
 #include <QDockWidget>
 #include <QGridLayout>
  
+#include <vector>
 #include "definitions.h"
 #include "settings.h"
  
@@ -14,8 +15,8 @@ class QComboBox;
  
 class SiSpinBox;
  
-////////////////////////////////////////////////////////////////////////////////
-/// \class HorizontalDock                                          dockwindows.h
+Q_DECLARE_METATYPE(std::vector<unsigned>)
+
 /// \brief Dock window for the horizontal axis.
 /// It contains the settings for the timebase and the display format.
 class HorizontalDock : public QDockWidget {
@@ -64,9 +64,6 @@ SpectrumDock::SpectrumDock(DsoSettings *settings, QWidget *parent, Qt::WindowFla
     }
 }
  
-/// \brief Cleans up everything.
-SpectrumDock::~SpectrumDock() {}
-
 /// \brief Don't close the dock, just hide it
 /// \param event The close event that should be handled.
 void SpectrumDock::closeEvent(QCloseEvent *event) {
@@ -14,8 +14,6 @@ class QComboBox;
  
 class SiSpinBox;
  
-////////////////////////////////////////////////////////////////////////////////
-/// \class SpectrumDock                                            dockwindows.h
 /// \brief Dock window for the spectrum view.
 /// It contains the magnitude for all channels and allows to enable/disable the
 /// channels.
@@ -24,7 +22,6 @@ class SpectrumDock : public QDockWidget {
  
   public:
     SpectrumDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags flags = 0);
-    ~SpectrumDock();
  
     int setMagnitude(int channel, double magnitude);
     int setUsed(int channel, bool used);
@@ -72,9 +72,6 @@ TriggerDock::TriggerDock(DsoSettings *settings, const QStringList *specialTrigge
     this->setSource(settings->scope.trigger.special, settings->scope.trigger.source);
 }
  
-/// \brief Cleans up everything.
-TriggerDock::~TriggerDock() {}
-
 /// \brief Don't close the dock, just hide it
 /// \param event The close event that should be handled.
 void TriggerDock::closeEvent(QCloseEvent *event) {
@@ -14,8 +14,6 @@ class QComboBox;
  
 class SiSpinBox;
  
-////////////////////////////////////////////////////////////////////////////////
-/// \class TriggerDock                                             dockwindows.h
 /// \brief Dock window for the trigger settings.
 /// It contains the settings for the trigger mode, source and slope.
 class TriggerDock : public QDockWidget {
@@ -23,7 +21,6 @@ class TriggerDock : public QDockWidget {
  
   public:
     TriggerDock(DsoSettings *settings, const QStringList *specialTriggers, QWidget *parent, Qt::WindowFlags flags = 0);
-    ~TriggerDock();
  
     int setMode(Dso::TriggerMode mode);
     int setSource(bool special, unsigned int id);
@@ -84,9 +84,6 @@ VoltageDock::VoltageDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags
     }
 }
  
-/// \brief Cleans up everything.
-VoltageDock::~VoltageDock() {}
-
 /// \brief Don't close the dock, just hide it
 /// \param event The close event that should be handled.
 void VoltageDock::closeEvent(QCloseEvent *event) {
@@ -14,8 +14,6 @@ class QComboBox;
  
 class SiSpinBox;
  
-////////////////////////////////////////////////////////////////////////////////
-/// \class VoltageDock                                             dockwindows.h
 /// \brief Dock window for the voltage channel settings.
 /// It contains the settings for gain and coupling for both channels and
 /// allows to enable/disable the channels.
@@ -24,7 +22,6 @@ class VoltageDock : public QDockWidget {
  
   public:
     VoltageDock(DsoSettings *settings, QWidget *parent, Qt::WindowFlags flags = 0);
-    ~VoltageDock();
  
     int setCoupling(int channel, Dso::Coupling coupling);
     int setGain(int channel, double gain);
@@ -28,4 +28,5 @@ void registerDockMetaTypes() {
     qRegisterMetaType<Dso::ChannelMode>();
     qRegisterMetaType<Dso::WindowFunction>();
     qRegisterMetaType<Dso::InterpolationMode>();
+    qRegisterMetaType<std::vector<unsigned> >();
 }