Merge branch 'master' of github.com:BioroboticsLab/biotracker_interfaces

CMakeLists.txt

@@ -16,6 +16,11 @@ set(INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} CACHE STRING
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake)
 include(Headers)
 
+find_package(OpenCV 4 QUIET)
+if(NOT OpenCV_FOUND)
+    find_package(OpenCV 3 REQUIRED)
+endif()
+
 add_subdirectory(Src)
 
 export(

Src/CMakeLists.txt

@@ -26,7 +26,6 @@ target_include_directories(${target} PUBLIC
 find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
 target_link_libraries(${target}  Qt5::Core Qt5::Gui Qt5::Widgets)
 
-find_package(OpenCV 3 REQUIRED)
 target_link_libraries(${target} ${OpenCV_LIBS})
 
 set_target_properties(${target} PROPERTIES AUTOMOC ON AUTOUIC ON AUTORCC ON)

Src/Interfaces/IBioTrackerPlugin.h

@@ -44,14 +44,14 @@ private:
     virtual void connectInterfaces();
 
 Q_SIGNALS:
-    virtual void emitCvMat(std::shared_ptr<cv::Mat> mat, QString name) = 0;
+    void emitCvMat(std::shared_ptr<cv::Mat> mat, QString name);
     /**
     * Will be sent when tracking is doen to multiple components of the core app
     * An example is the visualisation which is then updated
     */
-    virtual void emitTrackingDone(uint framenumber) = 0;
-	virtual void emitChangeDisplayImage(QString str) = 0;
-	virtual void emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>) = 0;
+    void emitTrackingDone(uint framenumber);
+    void emitChangeDisplayImage(QString str);
+    void emitCorePermission(std::pair<ENUMS::COREPERMISSIONS, bool>);
 
 public Q_SLOTS:
     virtual void receiveCurrentFrameFromMainApp(std::shared_ptr<cv::Mat> mat, uint frameNumber) = 0;

Src/Interfaces/IModel/IModelAreaDescriptor.h

@@ -2,7 +2,7 @@
 
 #include "IModel.h"
 #include <string.h>
-#include <cv.h>
+#include <opencv2/opencv.hpp>
 
 class BT_INTERFACES_API IModelAreaDescriptor :public IModel
 {

cmake/biotracker-interfacesConfig.cmake.in

@@ -2,7 +2,7 @@
 
 find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets OpenGL)
 
-find_package(OpenCV 3 REQUIRED)
+find_package(OpenCV @OpenCV_VERSION_MAJOR@ REQUIRED)
 
 include(${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake)