From 4bc0cdee9f509922062122f28043e0ec8a716496 Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Thu, 11 Aug 2022 14:32:24 +0200
Subject: [PATCH] Update the tracking interface somewhat.
---
Src/Interfaces/IBioTrackerPlugin.h | 15 +++++++--------
Src/Interfaces/IModel/IModelTrackingAlgorithm.h | 1 -
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/Src/Interfaces/IBioTrackerPlugin.h b/Src/Interfaces/IBioTrackerPlugin.h
index e940cf3..8e828fe 100644
--- a/Src/Interfaces/IBioTrackerPlugin.h
+++ b/Src/Interfaces/IBioTrackerPlugin.h
@@ -1,6 +1,8 @@
#pragma once
-#include "QObject"
+#include <QObject>
+#include <QVector>
+#include <QMap>
#include "Interfaces/IController/IController.h"
#include "Interfaces/IModel/IModelDataExporter.h"
@@ -18,7 +20,7 @@ public:
{
}
- virtual void createPlugin() = 0;
+ virtual void init() = 0;
/**
* Hook for the tracker options to add to the GUI
@@ -45,13 +47,14 @@ private:
virtual void connectInterfaces();
Q_SIGNALS:
- void emitCvMat(cv::Mat mat, QString name);
+ void trackingImageNamesChanged(QVector<QString> imageNames);
+ void trackingImagesChanged(QMap<QString, cv::Mat> images);
+
/**
* Will be sent when tracking is doen to multiple components of the core
* app An example is the visualisation which is then updated
*/
void emitTrackingDone(uint framenumber);
- void emitChangeDisplayImage(QString str);
void emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>);
public Q_SLOTS:
@@ -62,10 +65,6 @@ public Q_SLOTS:
* tracking arena boundary
*/
virtual void receiveAreaDescriptor(IModelAreaDescriptor* areaDescr);
-
- // private Q_SLOTS:
- // virtual void receiveCvMatFromController(cv::Mat mat,
- // QString name) = 0;
};
#define IBioTrackerPlugin_iid "de.fu-berlin.mi.biorobotics.IBioTrackerPlugin"
diff --git a/Src/Interfaces/IModel/IModelTrackingAlgorithm.h b/Src/Interfaces/IModel/IModelTrackingAlgorithm.h
index 5957672..0223a7c 100644
--- a/Src/Interfaces/IModel/IModelTrackingAlgorithm.h
+++ b/Src/Interfaces/IModel/IModelTrackingAlgorithm.h
@@ -13,5 +13,4 @@ public:
signals:
void emitTrackingDone();
- void emitChangeDisplayImage(QString str);
};
--
GitLab