H3DS-72 Added support for multiple interfaces in the plugin system

state-of-the-art · Jul 26, 2020 · 756d5ae · 756d5ae
1 parent 6d3882b
commit 756d5ae
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 22 deletions.
diff --git a/common.cmake b/common.cmake
@@ -6,7 +6,7 @@ if(CMAKE_VERSION VERSION_LESS "3.7.0")
   set(CMAKE_INCLUDE_CURRENT_DIR ON)
 endif()
 
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_definitions(-DPROJECT_VERSION="${PROJECT_VERSION}")

diff --git a/include/PluginInterface.h b/include/PluginInterface.h
@@ -1,6 +1,7 @@
 #ifndef PLUGININTERFACE_H
 #define PLUGININTERFACE_H
 
+#include <QtPlugin>
 #include <QStringList>
 
 /**
@@ -11,10 +12,15 @@ class PluginInterface
 public:
     virtual ~PluginInterface() {};
 
+    /**
+     * Return plugin type
+     */
+    static QLatin1String type() { return QLatin1String("io.stateoftheart.handy3dscanner.Plugin"); }
+
     /**
      * Plugin identify name
      */
-    virtual QString name() const = 0;
+    virtual QLatin1String name() const = 0;
 
     /**
      * List of the plugins required by the plugin

diff --git a/include/plugins/PointCloudSourceInterface.h b/include/plugins/PointCloudSourceInterface.h
@@ -0,0 +1,18 @@
+#ifndef POINTCLOUDSOURCEINTERFACE_H
+#define POINTCLOUDSOURCEINTERFACE_H
+
+#include "PluginInterface.h"
+
+#define PointCloudSourceInterface_iid "io.stateoftheart.handy3dscanner.plugins.PointCloudSourceInterface"
+
+class PointCloudSourceInterface : public PluginInterface
+{
+public:
+    static QLatin1String type() { return QLatin1String(PointCloudSourceInterface_iid); }
+
+    virtual uint8_t* getPCData() const = 0;
+};
+
+Q_DECLARE_INTERFACE(PointCloudSourceInterface, PointCloudSourceInterface_iid)
+
+#endif // POINTCLOUDSOURCEINTERFACE_H
diff --git a/include/plugins/VideoSourceInterface.h b/include/plugins/VideoSourceInterface.h
@@ -1,15 +1,16 @@
 #ifndef VIDEOSOURCEINTERFACE_H
 #define VIDEOSOURCEINTERFACE_H
 
-#include <QtPlugin>
 #include <QStringList>
 #include "PluginInterface.h"
 
-#define VideoSourceInterface_iid "io.stateoftheart.handy3dscanner.plugins.VideoSourcePlugin"
+#define VideoSourceInterface_iid "io.stateoftheart.handy3dscanner.plugins.VideoSourceInterface"
 
 class VideoSourceInterface : public PluginInterface
 {
 public:
+    static QLatin1String type() { return QLatin1String(VideoSourceInterface_iid); }
+
     virtual QStringList getAvailableStreams() const = 0;
 };
 

diff --git a/platform/src/plugins.cpp b/platform/src/plugins.cpp
@@ -11,6 +11,7 @@ Q_LOGGING_CATEGORY(plugins, "Plugins")
 #include <QPluginLoader>
 
 #include "plugins/VideoSourceInterface.h"
+#include "plugins/PointCloudSourceInterface.h"
 
 Plugins* Plugins::s_pInstance = nullptr;
 
@@ -45,21 +46,31 @@ void Plugins::refreshPluginsList()
             }
 
             qCDebug(plugins) << "  loading plugin:" << lib_name;
-            if( !addPlugin(qobject_cast<VideoSourceInterface *>(plugin)) )
+            bool loaded = addPlugin<VideoSourceInterface>(qobject_cast<VideoSourceInterface *>(plugin));
+            loaded = addPlugin<PointCloudSourceInterface>(qobject_cast<PointCloudSourceInterface *>(plugin)) || loaded;
+
+            if( !loaded ) {
                 plugin_loader.unload();
+                qCWarning(plugins) << "  no supported interfaces found for plugin:" << lib_name;
+            }
         }
     }
 }
 
-bool Plugins::addPlugin(PluginInterface *plugin)
+template<class T>
+bool Plugins::addPlugin(T *plugin)
 {
-    if( plugin ) {
-        if( !m_plugins.contains(plugin->name()) ) {
-            m_plugins[plugin->name()] = plugin;
-            qCDebug(plugins) << "  loaded plugin:" << plugin->name();
-            return true;
-        }
-        qCWarning(plugins) << "  plugin already loaded, skipping:" << plugin->name();
+    static_assert(std::is_base_of<PluginInterface, T>::value, "Unable to add non-PluginInterface object as plugin");
+
+    if( !plugin )
+        return false;
+
+    if( m_plugins.contains(plugin->name()) && m_plugins[plugin->name()].contains(plugin->type()) ) {
+        qCWarning(plugins, "  plugin already loaded, skipping: %s::%s", plugin->name().data(), plugin->type().data());
+        return false;
     }
-    return false;
+
+    m_plugins[plugin->name()][plugin->type()] = plugin;
+    qCDebug(plugins, "  loaded plugin: %s::%s", plugin->name().data(), plugin->type().data());
+    return true;
 }
diff --git a/platform/src/plugins.h b/platform/src/plugins.h
@@ -21,9 +21,10 @@ class Plugins
     ~Plugins() override;
 
     void refreshPluginsList();
-    bool addPlugin(PluginInterface* plugin);
+    template<class T> bool addPlugin(T* plugin);
 
-    QMap<QString, PluginInterface*> m_plugins;
+    QMap<QLatin1String, QMap<QLatin1String, PluginInterface*>> m_plugins; // name : interface_id : plugin instance
+    QMap<QLatin1String, QList<PluginInterface*>> m_plugins_active; // interface_id : list of plugins
 };
 
 #endif // PLUGINS_H
diff --git a/plugins/realsense/src/plugin.cpp b/plugins/realsense/src/plugin.cpp
@@ -4,9 +4,9 @@
 
 Q_LOGGING_CATEGORY(plugin, "RealSensePlugin")
 
-QString RealSensePlugin::name() const
+QLatin1String RealSensePlugin::name() const
 {
-    return plugin().categoryName();
+    return QLatin1String(plugin().categoryName());
 }
 
 QStringList RealSensePlugin::requirements() const
@@ -32,3 +32,9 @@ QStringList RealSensePlugin::getAvailableStreams() const
     qCDebug(plugin) << "getAvailableStreams()";
     return QStringList();
 }
+
+uint8_t *RealSensePlugin::getPCData() const
+{
+    qCDebug(plugin) << "getAvailableStreams()";
+    return nullptr;
+}
diff --git a/plugins/realsense/src/plugin.h b/plugins/realsense/src/plugin.h
@@ -3,19 +3,27 @@
 
 #include <QObject>
 #include "plugins/VideoSourceInterface.h"
+#include "plugins/PointCloudSourceInterface.h"
 
-class RealSensePlugin : public QObject, public VideoSourceInterface
+class RealSensePlugin : public QObject, public VideoSourceInterface, public PointCloudSourceInterface
 {
     Q_OBJECT
-    Q_PLUGIN_METADATA(IID VideoSourceInterface_iid)
-    Q_INTERFACES(VideoSourceInterface)
+    Q_PLUGIN_METADATA(IID "io.stateoftheart.handy3dscanner.plugins.RealSensePlugin")
+    Q_INTERFACES(VideoSourceInterface PointCloudSourceInterface)
 
 public:
     ~RealSensePlugin() override {}
-    QString name() const override;
+
+    // PluginInterface
+    QLatin1String name() const override;
     QStringList requirements() const override;
     bool init() override;
     bool configure() override;
+
+    // VideoSourceInterface
     QStringList getAvailableStreams() const override;
+
+    // PointCloudSourceInterface
+    uint8_t* getPCData() const override;
 };
 #endif // REALSENSEPLUGIN_H