Compare revisions

d.kilic · d.kilic · d.kilic · d.kilic · d.kilic · Schrödter, Tobias
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -381,6 +381,8 @@ target_sources(petrack_core PRIVATE
    include/autosave.h
    include/manualTrackpointMover.h
    include/frameRange.h
+    include/pdoublespinbox.h
+    include/pspinbox.h
    )

 target_sources(petrack_core PRIVATE
@@ -442,6 +444,8 @@ target_sources(petrack_core PRIVATE
    src/personStorage.cpp
    src/autosave.cpp
    src/manualTrackpointMover.cpp
+    src/pdoublespinbox.cpp
+    src/pspinbox.cpp
    ui/about.ui
    ui/codeMarker.ui
    ui/colorMarker.ui

--- a/cmake_modules/install_helper.cmake
+++ b/cmake_modules/install_helper.cmake
@@ -15,6 +15,7 @@ if (WIN32)
        message(\"\${CMAKE_INSTALL_PREFIX}/petrack.exe\")
        execute_process(COMMAND ${WINDEPLOYQT_APP} \"\${CMAKE_INSTALL_PREFIX}/bin/petrack.exe\")
    ")
+    set(OFFSCREEN_PLUGIN "${Qt5Core_DIR}/../../../plugins/platforms/qoffscreen.dll")

    install(FILES "${OpenCV_LIB_PATH}/../bin/opencv_videoio_ffmpeg${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}_64.dll" DESTINATION ${CMAKE_INSTALL_BINDIR})

@@ -24,6 +25,7 @@ if (WIN32)
    install(FILES "${OpenCV_DIR}/LICENSE/" DESTINATION "Licenses/OpenCV_Licenses")
    install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/ezc3d/LICENSE" DESTINATION "Licenses/ezc3d_license/")
    install(FILES "${CMAKE_SOURCE_DIR}/.zenodo.json" DESTINATION "bin")
+    install(FILES "${OFFSCREEN_PLUGIN}" DESTINATION "bin/platforms")

    # install Qwt and OpenCV
    install(CODE "

--- a/include/pdoublespinbox.h
+++ b/include/pdoublespinbox.h
+/*
+ * PeTrack - Software for tracking pedestrians movement in videos
+ * Copyright (C) 2010-2022 Forschungszentrum Jülich GmbH,
+ * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
+ * Deniz Kilic, Paul Lieberenz, Daniel Salden, Tobias Schrödter, Ann Katrin Seemann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef PDOUBLESPINBOX_H
+#define PDOUBLESPINBOX_H
+
+#include <QDoubleSpinBox>
+
+class PDoubleSpinBox : public QDoubleSpinBox
+{
+    Q_OBJECT
+public:
+    PDoubleSpinBox(QWidget *parent) : QDoubleSpinBox(parent) {}
+
+protected:
+    void wheelEvent(QWheelEvent *event) override;
+};
+
+#endif // PDOUBLESPINBOX_H
--- a/include/pspinbox.h
+++ b/include/pspinbox.h
+/*
+ * PeTrack - Software for tracking pedestrians movement in videos
+ * Copyright (C) 2010-2022 Forschungszentrum Jülich GmbH,
+ * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
+ * Deniz Kilic, Paul Lieberenz, Daniel Salden, Tobias Schrödter, Ann Katrin Seemann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#ifndef PSPINBOX_H
+#define PSPINBOX_H
+
+#include <QSpinBox>
+
+class PSpinBox : public QSpinBox
+{
+    Q_OBJECT
+public:
+    PSpinBox(QWidget *parent) : QSpinBox(parent){};
+
+protected:
+    void wheelEvent(QWheelEvent *event) override;
+};
+
+#endif // PSPINBOX_H
--- a/src/backgroundFilter.cpp
+++ b/src/backgroundFilter.cpp
@@ -25,11 +25,9 @@
 // nur temporaer fuer anzeige
 #include "helper.h"

+#include <QFileDialog>
 #include <opencv2/highgui.hpp>

-// TODO spaeter entfernen naechsten beiden zeilen
-#include "control.h"
-extern Control *cw;

 /// Entfernung zum Hintergrund, um als Vordergrund angesehen zu werden
 /// darf nicht zu gross werden, da sonst an waenden problem

--- a/src/extrCalibration.cpp
+++ b/src/extrCalibration.cpp
@@ -101,6 +101,36 @@ bool ExtrCalibration::openExtrCalibFile()
    return false;
 }

+// following function copied from OpenCV
+static bool isPlanarObjectPoints(cv::InputArray _objectPoints, double threshold = 1e-3)
+{
+    CV_CheckType(
+        _objectPoints.type(),
+        _objectPoints.type() == CV_32FC3 || _objectPoints.type() == CV_64FC3,
+        "Type of _objectPoints must be CV_32FC3 or CV_64FC3");
+    cv::Mat objectPoints;
+    if(_objectPoints.type() == CV_32FC3)
+    {
+        _objectPoints.getMat().convertTo(objectPoints, CV_64F);
+    }
+    else
+    {
+        objectPoints = _objectPoints.getMat();
+    }
+
+    cv::Scalar meanValues          = mean(objectPoints);
+    int        nbPts               = objectPoints.checkVector(3, CV_64F);
+    cv::Mat    objectPointsCentred = objectPoints - meanValues;
+    objectPointsCentred            = objectPointsCentred.reshape(1, nbPts);
+
+    cv::Mat w, u, vt;
+    cv::Mat MM = objectPointsCentred.t() * objectPointsCentred;
+    SVDecomp(MM, w, u, vt);
+
+    return (w.at<double>(2) < w.at<double>(1) * threshold);
+}
+
+
 /**
 * @brief Loads the extrinsic calibration from mExtrCalibFile
 *
@@ -237,12 +267,24 @@ bool ExtrCalibration::loadExtrCalibFile()
                PCritical(
                    mMainWindow,
                    QObject::tr("PeTrack"),
-                    QObject::tr("Error: Not enough points given: %1 (minimum 4 needed!). Please check your extrinsic "
+                    QObject::tr("Error: Not enough points given: %1 (minimum 4 (coplanar) or 6 (not coplanar) "
+                                "needed!). Please check your extrinsic "
+                                "calibration file!")
+                        .arg(points3D_tmp.size()));
+                all_ok = false;
+            }
+            else if(!isPlanarObjectPoints(points3D_tmp) && points3D_tmp.size() < 6)
+            {
+                // Non-planar points use DLT - we need at least 6 points; not only 4
+                PCritical(
+                    mMainWindow,
+                    QObject::tr("PeTrack"),
+                    QObject::tr("Error: Not enough points given: %1 (minimum 4 (coplanar) or 6 (not coplanar) "
+                                "needed!). Please check your extrinsic "
                                "calibration file!")
                        .arg(points3D_tmp.size()));
                all_ok = false;
            }
-
            // Check if 2D points delivered and if the number of 2D and 3D points agree
            else if(points2D_tmp.size() > 0 && points2D_tmp.size() != points3D_tmp.size())
            {

--- a/src/pdoublespinbox.cpp
+++ b/src/pdoublespinbox.cpp
+/*
+ * PeTrack - Software for tracking pedestrians movement in videos
+ * Copyright (C) 2010-2022 Forschungszentrum Jülich GmbH,
+ * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
+ * Deniz Kilic, Paul Lieberenz, Daniel Salden, Tobias Schrödter, Ann Katrin Seemann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "pdoublespinbox.h"
+
+#include <QWheelEvent>
+
+void PDoubleSpinBox::wheelEvent(QWheelEvent *event)
+{
+    event->ignore();
+}
--- a/src/petrack.cpp
+++ b/src/petrack.cpp
@@ -68,10 +68,6 @@
 #include <iomanip>
 #include <opencv2/opencv.hpp>

-// temp muss spaeter herausgenommen werden,
-//  dient dazu, in anderen dateien um schnell ueber cw->temp1->value() an einstellbare daten zu kommen
-Control *cw;
-
 int Petrack::trcVersion = 0;

 // Reihenfolge des anlegens der objekte ist sehr wichtig
@@ -122,7 +118,6 @@ Petrack::Petrack() :
    mRecognitionRoiItem->setZValue(5); // groesser heisst weiter oben

    mControlWidget = new Control(*this, *mScene, mReco, *mTrackingRoiItem, *mRecognitionRoiItem);
-    cw             = mControlWidget; // muss spaeter geloescht werden

    mStereoWidget = new StereoWidget(this);
    mStereoWidget->setWindowFlags(Qt::Window);
@@ -311,7 +306,6 @@ Petrack::Petrack() :
 Petrack::~Petrack()
 {
    delete mImage;
-    delete cw;
    // hier muessten weitere stehen insb die im konstruktor erzeugt werden
    // aber da petrack nur vernichtet wird, wenn programm beendet wird, kann man sich das auch schenken
 }

--- a/src/pspinbox.cpp
+++ b/src/pspinbox.cpp
+/*
+ * PeTrack - Software for tracking pedestrians movement in videos
+ * Copyright (C) 2010-2022 Forschungszentrum Jülich GmbH,
+ * Maik Boltes, Juliane Adrian, Ricardo Martin Brualla, Arne Graf, Paul Häger, Daniel Hillebrand,
+ * Deniz Kilic, Paul Lieberenz, Daniel Salden, Tobias Schrödter, Ann Katrin Seemann
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "pspinbox.h"
+
+#include <QWheelEvent>
+
+void PSpinBox::wheelEvent(QWheelEvent *event)
+{
+    event->ignore();
+}
--- a/ui/control.ui
+++ b/ui/control.ui
No results found