Merge branch '240-lk-optical-flow' into 'master'

Update missing frame computation

Closes #240

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

Author: schroedtert

include/helper.h

@@ -285,4 +285,23 @@ inline clock_t getElapsedTime()
     return diffTime;
 }
 
+/**
+ * Computes the median of the values in a given vector.
+ * @tparam T any sortable type
+ * @param data vector for which the median should be computed
+ * @return median of all values in data
+ */
+template <typename T>
+T computeMedian(std::vector<T> data)
+{
+    if((data.size() % 2) != 0U)
+    {
+        std::nth_element(data.begin(), data.begin() + data.size() / 2, data.end());
+        return data[data.size() / 2];
+    }
+
+    std::nth_element(data.begin(), data.begin() + data.size() / 2, data.end());
+    std::nth_element(data.begin(), data.begin() + (data.size() - 1) / 2, data.end());
+    return 0.5 * (data[data.size() / 2] + data[(data.size() - 1) / 2]);
+}
 #endif

include/trackerReal.h

@@ -30,6 +30,12 @@
 
 class PersonStorage;
 
+struct MissingFrame
+{
+    size_t mNumber; //< frame number, where mCount of frames are missing
+    int    mCount;  //< count of frames missing between frame mNumber and mNumber+1
+};
+
 // point in x/y in cm
 class TrackPointReal : public Vec3F
 {
@@ -139,6 +145,7 @@ class TrackerReal : public QList<TrackPersonReal>
     // mControlWidget->getColorPlot()
     // petrack...mImageItem
     int calculate(
+        Petrack   *petrack,
         Tracker   *tracker,
         ImageItem *imageItem,
         ColorPlot *colorPlot,
@@ -171,8 +178,22 @@ class TrackerReal : public QList<TrackPersonReal>
         bool         exportAngleOfView,
         bool         exportUseM,
         bool         exportMarkerID);
-    void exportDat(QTextStream &out, bool alternateHeight, bool useTrackpoints); // fuer gnuplot
-    void exportXml(QTextStream &outXml, bool alternateHeight, bool useTrackpoints);
+    void                      exportDat(QTextStream &out, bool alternateHeight, bool useTrackpoints); // fuer gnuplot
+    void                      exportXml(QTextStream &outXml, bool alternateHeight, bool useTrackpoints);
+    std::vector<MissingFrame> computeDroppedFrames(Petrack *petrack);
 };
 
+namespace utils
+{
+std::vector<MissingFrame>
+detectMissingFrames(const std::vector<std::unordered_map<int, double>> &displacementsPerFrame);
+
+std::vector<std::unordered_map<int, double>> computeDisplacement(
+    int                                          minFrameNum,
+    int                                          maxFrameNum,
+    Petrack                                     *petrack,
+    const std::vector<std::vector<cv::Point2f>> &personsInFrame,
+    const std::vector<std::vector<int>>         &idsInFrame);
+} // namespace utils
+
 #endif

src/petrack.cpp

@@ -2919,6 +2919,7 @@ int Petrack::calculateRealTracker()
                                  mMultiColorMarkerWidget->autoCorrect->isChecked() &&
                                  mMultiColorMarkerWidget->autoCorrectOnlyExport->isChecked();
     int anz = mTrackerReal->calculate(
+        this,
         mTracker,
         mImageItem,
         mControlWidget->getColorPlot(),
@@ -3101,6 +3102,7 @@ void Petrack::exportTracker(QString dest) // default = ""
                 tstart = clock();
 #endif
                 mTrackerReal->calculate(
+                    this,
                     mTracker,
                     mImageItem,
                     mControlWidget->getColorPlot(),
@@ -3221,6 +3223,7 @@ void Petrack::exportTracker(QString dest) // default = ""
                     mPersonStorage.recalcHeight(mControlWidget->coordAltitude->value());
                 }
                 mTrackerReal->calculate(
+                    this,
                     mTracker,
                     mImageItem,
                     mControlWidget->getColorPlot(),
@@ -3279,6 +3282,7 @@ void Petrack::exportTracker(QString dest) // default = ""
                 }
 
                 mTrackerReal->calculate(
+                    this,
                     mTracker,
                     mImageItem,
                     mControlWidget->getColorPlot(),