Merge branch 'include-helper-h' into 'master'

include cleanup

See merge request ped-dyn-emp/petrack!384

src/IO/skeletonTree.h

@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <cstdint>
 #include <memory>
+#include <opencv2/core/affine.hpp>
 #include <opencv2/core/matx.hpp>
 #include <opencv2/core/types.hpp>
 #include <stdexcept>

src/calibration/stereoContext.cpp

@@ -25,6 +25,7 @@
 #include "pMessageBox.h"
 #include "person.h"
 #include "petrack.h"
+#include "stereoItem.h"
 #include "stereoWidget.h"
 
 #include <QDir>

src/petrack.cpp

@@ -55,6 +55,7 @@
 #include "person.h"
 #include "petrack.h"
 #include "player.h"
+#include "recognition.h"
 #include "roiItem.h"
 #include "stereoItem.h"
 #include "stereoWidget.h"

src/petrack.h

@@ -43,7 +43,6 @@
 #include "moCapController.h"
 #include "moCapPerson.h"
 #include "personStorage.h"
-#include "recognition.h"
 #include "swapFilter.h"
 #include "trackerReal.h"
 

src/recognition/recognition.h

@@ -21,6 +21,7 @@
 
 #include "vector.h"
 
+#include <QColor>
 #include <QList>
 #include <QObject>
 #include <opencv2/objdetect/aruco_detector.hpp>

src/tracking/tracker.cpp

@@ -19,6 +19,7 @@
 #include "tracker.h"
 
 #include "animation.h"
+#include "control.h"
 #include "helper.h"
 #include "logger.h"
 #include "multiColorMarkerWidget.h"

src/ui/dialogs/codeMarkerWidget.cpp

@@ -20,6 +20,7 @@
 
 #include "importHelper.h"
 #include "pMessageBox.h"
+#include "petrack.h"
 #include "recognition.h"
 #include "ui_codeMarker.h"
 

src/ui/dialogs/codeMarkerWidget.h

@@ -20,17 +20,16 @@
 #define CODEMARKERWIDGET_H
 
 #include "codeMarkerItem.h"
-#include "petrack.h"
 #include "recognition.h"
 
+#include <QDomElement>
 #include <QtWidgets>
-#include <opencv2/objdetect/aruco_detector.hpp>
 
 namespace Ui
 {
 class CodeMarker;
 }
-
+class Petrack;
 
 class CodeMarkerWidget : public QWidget
 {

src/ui/dialogs/colorMarkerWidget.cpp

@@ -18,7 +18,10 @@
 
 #include "colorMarkerWidget.h"
 
+#include "colorMarkerItem.h"
 #include "importHelper.h"
+#include "petrack.h"
+
 
 ColorMarkerWidget::ColorMarkerWidget(QWidget *parent) : QWidget(parent)
 {
@@ -153,6 +156,94 @@ void ColorMarkerWidget::getXml(QDomElement &elem)
     }
 }
 
+void ColorMarkerWidget::on_showMask_stateChanged(int i)
+{
+    mMainWindow->getColorMarkerItem()->setVisible(i);
+    mMainWindow->getScene()->update();
+}
+
+void ColorMarkerWidget::on_maskMask_stateChanged(int)
+{
+    mMainWindow->getScene()->update();
+}
+
+void ColorMarkerWidget::on_opacity_valueChanged(int)
+{
+    mMainWindow->getScene()->update();
+}
+
+void ColorMarkerWidget::on_inversHue_stateChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_useOpen_stateChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_useClose_stateChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_closeRadius_valueChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_openRadius_valueChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_minArea_valueChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_maxArea_valueChanged(int)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
+void ColorMarkerWidget::on_maxRatio_valueChanged(double)
+{
+    mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
+    if(!mMainWindow->isLoading())
+    {
+        mMainWindow->updateImage();
+    }
+}
+
 void ColorMarkerWidget::on_fromTriangle_colorChanged(const QColor &col)
 {
     fromHue             = col.hue();

src/ui/dialogs/colorMarkerWidget.h

@@ -19,11 +19,12 @@
 #ifndef COLORMARKERWIDGET_H
 #define COLORMARKERWIDGET_H
 
-#include "colorMarkerItem.h"
-#include "petrack.h"
 #include "ui_colorMarker.h"
 
-#include <QtWidgets>
+#include <QDomElement>
+
+class QDomElement;
+class Petrack;
 
 class ColorMarkerWidget : public QWidget, public Ui::ColorMarker
 {
@@ -48,87 +49,27 @@ class ColorMarkerWidget : public QWidget, public Ui::ColorMarker
 private slots:
 
     // Functions which just modifies the visual
-    void on_showMask_stateChanged(int i)
-    {
-        mMainWindow->getColorMarkerItem()->setVisible(i);
-        mMainWindow->getScene()->update();
-    }
+    void on_showMask_stateChanged(int i);
 
-    void on_maskMask_stateChanged(int /*i*/) { mMainWindow->getScene()->update(); }
-    void on_opacity_valueChanged(int /*i*/) { mMainWindow->getScene()->update(); }
+    void on_maskMask_stateChanged(int /*i*/);
+    void on_opacity_valueChanged(int /*i*/);
 
     // functions which force a new recognition
-    void on_inversHue_stateChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_useOpen_stateChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_useClose_stateChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_closeRadius_valueChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_openRadius_valueChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_minArea_valueChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_maxArea_valueChanged(int /*i*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
-
-    void on_maxRatio_valueChanged(double /*d*/)
-    {
-        mMainWindow->setRecognitionChanged(true); // flag indicates that changes of recognition parameters happens
-        if(!mMainWindow->isLoading())
-        {
-            mMainWindow->updateImage();
-        }
-    }
+    void on_inversHue_stateChanged(int /*i*/);
+
+    void on_useOpen_stateChanged(int /*i*/);
+
+    void on_useClose_stateChanged(int /*i*/);
+
+    void on_closeRadius_valueChanged(int /*i*/);
+
+    void on_openRadius_valueChanged(int /*i*/);
+
+    void on_minArea_valueChanged(int /*i*/);
+
+    void on_maxArea_valueChanged(int /*i*/);
+
+    void on_maxRatio_valueChanged(double /*d*/);
 
     void on_fromTriangle_colorChanged(const QColor &col);
     void on_toTriangle_colorChanged(const QColor &col);

src/ui/dialogs/colorRangeWidget.cpp

@@ -19,6 +19,8 @@
 #include "colorRangeWidget.h"
 
 #include "control.h"
+#include "petrack.h"
+
 
 ColorRangeWidget::ColorRangeWidget(QWidget *parent) : QWidget(parent)
 {

src/ui/dialogs/colorRangeWidget.h

@@ -20,11 +20,12 @@
 #define COLORRANGEWIDGET_H
 
 #include "colorPlot.h"
-#include "petrack.h"
 #include "ui_colorRange.h"
 
 #include <QtWidgets>
 
+class Petrack;
+
 class ColorRangeWidget : public QWidget, public Ui::ColorRange
 {
     Q_OBJECT

src/ui/dialogs/logwindow.cpp

@@ -24,10 +24,10 @@
 #include "ui_logwindow.h"
 
 #include <QFileDialog>
+#include <QTextStream>
 
 LogWindow::LogWindow(QWidget *parent, Ui::LogWindow *ui) : QWidget(parent)
 {
-    mMainWindow = (class Petrack *) parent;
     if(!ui)
     {
         mUi = new Ui::LogWindow();

src/ui/dialogs/logwindow.h

@@ -25,7 +25,6 @@
 #include "spdlog/sinks/qt_sinks.h"
 
 #include <QWidget>
-#include <petrack.h>
 
 namespace Ui
 {
@@ -48,7 +47,6 @@ class LogWindow : public QWidget
 
 private:
     Ui::LogWindow                                        *mUi;
-    Petrack                                              *mMainWindow;
     std::shared_ptr<spdlog::sinks::dist_sink<std::mutex>> distSink;
     std::shared_ptr<spdlog::sinks::qt_sink<std::mutex>>   qtSink;
 };