[ref] tracking: refactore class member

FastTrackOrg · Mar 17, 2022 · 27fadfd · 27fadfd
1 parent 02bbe59
commit 27fadfd
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/FastTrack.pri b/FastTrack.pri
@@ -1 +1 @@
-VERSION = 6.2.4.2
+VERSION = 6.2.4.3
diff --git a/src/tracking.cpp b/src/tracking.cpp
@@ -694,17 +694,18 @@ void Tracking::imageProcessing() {
   while (m_im < m_stopImage) {
     try {
       // Reads the next image in the image sequence and applies the image processing workflow
-      if (!video->getNext(m_visuFrame)) {
+      UMat visuFrame;
+      if (!video->getNext(visuFrame)) {
         m_error += QString::number(m_im) + ", ";
         m_im++;
         emit progress(m_im);
         continue;
       }
       if (param_registration != 0) {
-        registration(m_background, m_visuFrame, param_registration - 1);
+        registration(m_background, visuFrame, param_registration - 1);
       }
 
-      (statusBinarisation) ? (subtract(m_background, m_visuFrame, m_binaryFrame)) : (subtract(m_visuFrame, m_background, m_binaryFrame));
+      (statusBinarisation) ? (subtract(m_background, visuFrame, m_binaryFrame)) : (subtract(visuFrame, m_background, m_binaryFrame));
       binarisation(m_binaryFrame, 'b', param_thresh);
 
       if (param_kernelSize != 0 && param_morphOperation != 8) {
@@ -714,7 +715,7 @@ void Tracking::imageProcessing() {
 
       if (m_ROI.width != 0 || m_ROI.height != 0) {
         m_binaryFrame = m_binaryFrame(m_ROI);
-        m_visuFrame = m_visuFrame(m_ROI);
+        visuFrame = visuFrame(m_ROI);
       }
 
       // Detects the objects and extracts  parameters
@@ -856,9 +857,10 @@ void Tracking::startProcess() {
     }
 
     // First frame
-    video->getImage(m_im, m_visuFrame);
+    UMat visuFrame;
+    video->getImage(m_im, visuFrame);
 
-    (statusBinarisation) ? (subtract(m_background, m_visuFrame, m_binaryFrame)) : (subtract(m_visuFrame, m_background, m_binaryFrame));
+    (statusBinarisation) ? (subtract(m_background, visuFrame, m_binaryFrame)) : (subtract(visuFrame, m_background, m_binaryFrame));
 
     binarisation(m_binaryFrame, 'b', param_thresh);
 
@@ -869,7 +871,7 @@ void Tracking::startProcess() {
 
     if (m_ROI.width != 0) {
       m_binaryFrame = m_binaryFrame(m_ROI);
-      m_visuFrame = m_visuFrame(m_ROI);
+      visuFrame = visuFrame(m_ROI);
     }
 
     m_out = objectPosition(m_binaryFrame, param_minArea, param_maxArea);

diff --git a/src/tracking.h b/src/tracking.h
@@ -139,7 +139,6 @@ class Tracking : public QObject {
   static bool importTrackingResult(const QString &path, QSqlDatabase db);
 
   UMat m_binaryFrame;                /*!< Binary image CV_8U */
-  UMat m_visuFrame;                  /*!< Image 8 bit CV_8U */
   vector<vector<Point3d>> m_out;     /*!< Objects information at iteration minus one */
   vector<vector<Point3d>> m_outPrev; /*!< Objects information at current iteration */