..

BioTracker/Plugin/BioTrackerPlugin/Controller/ControllerTrackingAlgorithm.cpp

@@ -8,20 +8,7 @@ ControllerTrackingAlgorithm::ControllerTrackingAlgorithm(QObject *parent, IBioTr
 
 void ControllerTrackingAlgorithm::connectController()
 {
-//    IController *ctrA = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::TEXTUREOBJECT);
-//    ControllerTextureObject *ctrTexture = dynamic_cast<ControllerTextureObject *>(ctrA);
-//    QObject::connect(this, &ControllerTrackingAlgorithm::emitCvMatA, ctrTexture, &ControllerTextureObject::receiveCvMat);
 
-
-//    IController *ctrB = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::PLAYER);
-//    ControllerPlayer *ctrPlayer = dynamic_cast<ControllerPlayer *>(ctrB);
-//    IModel *model = ctrPlayer->getModel();
-//    BioTracker3Player *player = dynamic_cast<BioTracker3Player *>(model);
-
-//    BioTrackerTrackingAlgorithm *alg = qobject_cast<BioTrackerTrackingAlgorithm *>(m_Model);
-//    QObject::connect(player, &BioTracker3Player::emitCurrentFrame, alg, &BioTrackerTrackingAlgorithm::doTracking);
-
-    //    QObject::connect(alg, &BioTrackerTrackingAlgorithm::emitCvMatA, ctrTexture, &ControllerTextureObject::receiveCvMat);
 }
 
 void ControllerTrackingAlgorithm::doTracking(std::shared_ptr<cv::Mat> mat)

BioTracker/Source/BioTracker/Controller/ControllerPlayer.cpp

@@ -120,6 +120,7 @@ void ControllerPlayer::connectModelController()
     QObject::connect(player, &BioTracker3Player::emitFPS, this, &ControllerPlayer::receiveFPS, Qt::BlockingQueuedConnection);
     QObject::connect(player, &BioTracker3Player::emitTotalNumbFrames, this, &ControllerPlayer::receiveTotalNumbFrames, Qt::BlockingQueuedConnection);
     QObject::connect(player, &BioTracker3Player::emitVideoControllsStates, this, &ControllerPlayer::receiveVideoControllsStates, Qt::BlockingQueuedConnection);
+    QObject::connect(player, &BioTracker3Player::emitCurrentFrameStr, this, &ControllerPlayer::receiveCurrentFrameStr, Qt::BlockingQueuedConnection);
 
     QObject::connect(player, &BioTracker3Player::emitTrackingIsActiveState, this, &ControllerPlayer::receiveTrackingIsActiveState, Qt::BlockingQueuedConnection);
 
@@ -148,6 +149,12 @@ void ControllerPlayer::receiveCurrentFrameNumber(size_t num)
     widget->setCurrentFrameNumber(num);
 }
 
+void ControllerPlayer::receiveCurrentFrameStr(std::shared_ptr<cv::Mat> mat, QString name)
+{
+    IController * ctr = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::TEXTUREOBJECT);
+    qobject_cast<ControllerTextureObject *>(ctr)->receiveCvMat(mat, name);
+}
+
 void ControllerPlayer::receiveFPS(double fps)
 {
     QPointer< BioTracker3VideoControllWidget > widget = static_cast<BioTracker3VideoControllWidget *>(m_View);

BioTracker/Source/BioTracker/Controller/ControllerPlayer.h

@@ -60,6 +60,7 @@ public Q_SLOTS:
   void receiveTrackingOperationDone();
 
   void receiveCurrentFrameNumber(size_t num);
+  void receiveCurrentFrameStr(std::shared_ptr<cv::Mat> mat, QString name);
   void receiveFPS(double fps);
   void receiveTotalNumbFrames(size_t num);
   void receiveVideoControllsStates(QVector<bool> states);

BioTracker/Source/BioTracker/Controller/ControllerTextureObject.cpp

@@ -39,10 +39,6 @@ void ControllerTextureObject::connectController()
     IController * ctr = m_BioTrackerContext->requestController(ENUMS::CONTROLLERTYPE::PLAYER);
     QPointer< ControllerPlayer > ctrPlayer = qobject_cast<ControllerPlayer *>(ctr);
 
-    QPointer< BioTracker3Player > player = qobject_cast<BioTracker3Player *>(ctrPlayer->getModel());
-    QObject::connect(player, SIGNAL(emitCurrentFrame(std::shared_ptr<cv::Mat>, QString)), this, SLOT(receiveCvMat(std::shared_ptr<cv::Mat>,QString)));
-
-
     QPointer< BioTracker3VideoControllWidget > videoView = dynamic_cast<BioTracker3VideoControllWidget *> (ctrPlayer->getView());
     videoView->setVideoViewComboboxModel(m_TextureViewNamesModel);
 

BioTracker/Source/BioTracker/View/TrackedElementView.cpp

@@ -64,3 +64,4 @@ void TrackedElementView::hoverLeaveEvent(QGraphicsSceneHoverEvent *event)
 
     QGraphicsObject::hoverLeaveEvent(event);
 }
+

BioTracker/Source/BioTracker/View/TrackedElementView.h

@@ -27,6 +27,7 @@ private:
 protected:
     void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override;
     void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override;
+
 };
 
 #endif // TRACKEDELEMENTVIEW_H