diff --git a/Src/Interfaces/IBioTrackerPlugin.h b/Src/Interfaces/IBioTrackerPlugin.h index e940cf30e99970096b06747006604e17cf161ca5..8e828fee10ffe0cd7325bfc59735df82c5a0035d 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 5957672ff7e492da8bc5d2fa06b05f2d0e6b173c..0223a7c5687ccefe36ad66b4f62e111792a2b29b 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); };