added imageset plugin

Author: chriamue

source/.gitignore

@@ -0,0 +1 @@
+imagesets

source/CMakeLists.txt

@@ -16,6 +16,7 @@ configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/include/AnnotatorLib/${M
 set(IDE_FOLDER "")
 add_subdirectory(annotatorlib)
 
+add_subdirectory(imagesets)
 add_subdirectory(storages)
 
 # Tests

…include/AnnotatorLib/ImageSet/ImageSet.h …AnnotatorLib/ImageSet/AbstractImageSet.hsource/annotatorlib/include/AnnotatorLib/ImageSet/ImageSet.h renamed to source/annotatorlib/include/AnnotatorLib/ImageSet/AbstractImageSet.h source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSet.h renamed to source/annotatorlib/include/AnnotatorLib/ImageSet/AbstractImageSet.h

@@ -1,21 +1,23 @@
-// Copyright 2016 Annotator Team
+// Copyright 2016-2017 Annotator Team
 #ifndef ANNOTATOR_ANNOTATORLIB_IMAGESET_H
 #define ANNOTATOR_ANNOTATORLIB_IMAGESET_H
 
 /************************************************************
  ImageSet class header
  ************************************************************/
+
+#include <memory>
 #include <string>
 
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
 #include <AnnotatorLib/Image.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
 namespace AnnotatorLib {
-
+namespace ImageSet {
 /************************************************************/
 
-class ANNOTATORLIB_API ImageSet {
+class ANNOTATORLIB_API AbstractImageSet {
  public:
   /**
    *
@@ -78,16 +80,17 @@ class ANNOTATORLIB_API ImageSet {
 
   virtual std::string getPath() = 0;
 
-  virtual bool equals(ImageSet *other) = 0;
+  virtual bool equals(std::shared_ptr<AbstractImageSet> other) = 0;
 
-  virtual ~ImageSet() {}
+  virtual ~AbstractImageSet() {}
 };
 /************************************************************/
 /* External declarations (package visibility)               */
 /************************************************************/
 
 /* Inline functions                                         */
 
+}  // of namespace ImageSet
 }  // of namespace AnnotatorLib
 
 /************************************************************

source/annotatorlib/include/AnnotatorLib/ImageSet/ImageFolder.h

@@ -7,7 +7,7 @@
  ************************************************************/
 
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet/ImageSet.h>
+#include <AnnotatorLib/ImageSet/AbstractImageSet.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
 #include <string>
@@ -16,12 +16,12 @@
 #include <boost/filesystem.hpp>
 
 namespace AnnotatorLib {
-
+namespace ImageSet {
 /************************************************************/
 /**
  *
  */
-class ANNOTATORLIB_API ImageFolder : public ImageSet {
+class ANNOTATORLIB_API ImageFolder : public AbstractImageSet {
  public:
   ImageFolder(std::string path);
 
@@ -66,7 +66,7 @@ class ANNOTATORLIB_API ImageFolder : public ImageSet {
 
   virtual std::string getPath() override;
 
-  virtual bool equals(ImageSet *other) override;
+  virtual bool equals(std::shared_ptr<AbstractImageSet> other) override;
 
  protected:
   void loadFolder();
@@ -82,7 +82,7 @@ class ANNOTATORLIB_API ImageFolder : public ImageSet {
 /************************************************************/
 
 /* Inline functions                                         */
-
+}  // of namespace ImageSet
 }  // of namespace AnnotatorLib
 
 /************************************************************

source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSetFactory.h

@@ -6,12 +6,17 @@
  ImageSetFactory class header
  ************************************************************/
 
+#include <list>
+#include <map>
+#include <memory>
+
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
+#include <AnnotatorLib/ImageSet/AbstractImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSetPlugin.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
-#include <AnnotatorLib/ImageSet/ImageSet.h>
-
 namespace AnnotatorLib {
+namespace ImageSet {
 
 /************************************************************/
 /**
@@ -24,21 +29,40 @@ class ANNOTATORLIB_API ImageSetFactory {
    * @param type
    * @return imageSet
    */
-  static ImageSet *createImageSet(ImageSetType type, std::string path);
+  std::shared_ptr<AbstractImageSet> createImageSet(std::string type,
+                                                   std::string path);
+
+  std::list<std::string> availableImageSets();
 
   /**
-   *
-   * @param type
-   * @return imageSet
+   * @brief loadPlugins
+   * @param dir the path to plugins
    */
-  static ImageSet *createImageSet(std::string type, std::string path);
+  void loadPlugins(std::string dir);
+
+  /**
+   * @brief instance
+   * @return singleton for StorageFactory
+   */
+  static ImageSetFactory* instance();
+
+  ~ImageSetFactory();
+
+ protected:
+  void addAvailableImageSet(ImageSetPlugin* plugin);
+
+ private:
+  ImageSetFactory() {}
+  std::list<std::string> _availableImageSets{"images", "imagefolder"};
+  std::map<std::string, std::shared_ptr<ImageSetPlugin>> plugins;
 };
 /************************************************************/
 /* External declarations (package visibility)               */
 /************************************************************/
 
 /* Inline functions                                         */
 
+}  // of namespace ImageSet
 }  // of namespace AnnotatorLib
 
 /************************************************************

source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSetPlugin.h

@@ -0,0 +1,42 @@
+// Copyright 2017 Annotator Team
+#pragma once
+
+#include <memory>
+#include <string>
+
+#include <AnnotatorLib/ImageSet/AbstractImageSet.h>
+#include <AnnotatorLib/annotatorlib_api.h>
+
+namespace AnnotatorLib {
+namespace ImageSet {
+
+/**
+ * @brief The StoragePlugin class
+ * Base Class for storage plugins.
+ */
+class ANNOTATORLIB_API ImageSetPlugin {
+ public:
+  ImageSetPlugin() {}
+  virtual ~ImageSetPlugin() {}
+
+  /**
+   * @brief name
+   * @return name of the imageset plugin
+   */
+  virtual const std::string name() = 0;
+
+  /**
+   * @brief description
+   * @return description for the imageset plugin
+   */
+  virtual const std::string description() = 0;
+
+  /**
+   * @brief createLoader
+   * @return new instance of loader
+   */
+  virtual std::shared_ptr<AnnotatorLib::ImageSet::AbstractImageSet> create(
+      std::string path) = 0;
+};
+}
+}

source/annotatorlib/include/AnnotatorLib/ImageSet/Pkg_ImageSet.h

@@ -0,0 +1,33 @@
+// Copyright 2016-2017 Annotator Team
+#ifndef PKG_ANNOTATOR_ANNOTATORLIB_IMAGESET
+#define PKG_ANNOTATOR_ANNOTATORLIB_IMAGESET
+
+/************************************************************
+ Pkg_Loader package header
+ ************************************************************/
+#include <AnnotatorLib/AnnotatorLibDatastructs.h>
+
+#ifndef _IN_
+#define _IN_
+#endif
+#ifndef _OUT_
+#define _OUT_
+#endif
+#ifndef _INOUT_
+#define _INOUT_
+#endif
+
+/* Package dependency header include                        */
+
+namespace AnnotatorLib {
+namespace ImageSet {
+
+// Types defined within the package
+}  // of namespace ImageSet
+}  // of namespace AnnotatorLib
+
+/************************************************************
+ End of Pkg_Storage package header
+ ************************************************************/
+
+#endif

source/annotatorlib/include/AnnotatorLib/Project.h

@@ -6,7 +6,7 @@
  Project class header
  ************************************************************/
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet/ImageSet.h>
+#include <AnnotatorLib/ImageSet/AbstractImageSet.h>
 #include <AnnotatorLib/Session.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
@@ -27,19 +27,6 @@ class AbstractStorage;
  */
 class ANNOTATORLIB_API Project {
  public:
-  /**
-   * @brief create
-   * @param name
-   * @param imageSetType
-   * @param imageSetPath
-   * @param storageType
-   * @param storagePath
-   * @return
-   */
-  static std::shared_ptr<AnnotatorLib::Project> create(
-      std::string name, ImageSetType imageSetType, std::string imageSetPath,
-      std::string storageType, std::string storagePath);
-
   /**
    * @brief create
    * @param name
@@ -78,7 +65,7 @@ class ANNOTATORLIB_API Project {
    */
   unsigned long getDuration();
 
-  ImageSet *getImageSet() const;
+  std::shared_ptr<ImageSet::AbstractImageSet> getImageSet() const;
 
   /**
    * @brief load
@@ -149,7 +136,7 @@ class ANNOTATORLIB_API Project {
  protected:
   Project();
 
-  Project(std::string name, ImageSetType imageSetType, std::string imageSetPath,
+  Project(std::string name, std::string imageSetType, std::string imageSetPath,
           std::string storageType, std::string storagePath);
 
   /**
@@ -180,9 +167,9 @@ class ANNOTATORLIB_API Project {
 
   unsigned long total_duration_sec = 0;
 
-  ImageSetType imageSetType = ImageSetType::UNKNOWN;
+  std::string imageSetType = "unknown";
 
-  ImageSet *imageSet = nullptr;
+  std::shared_ptr<ImageSet::AbstractImageSet> imageSet = nullptr;
 
   std::string storageType = "unknown";
 

source/annotatorlib/source/ImageSet/ImageFolder.cpp

@@ -18,6 +18,7 @@
 // Derived includes directives
 
 namespace AnnotatorLib {
+namespace ImageSet {
 
 const std::set<std::string> imagetypes = {
     (".bmp"), (".pbm"),  (".pgm"), (".ppm"), (".jpg"), (".jpeg"),
@@ -72,8 +73,8 @@ unsigned int ImageFolder::getFPS() { return 24; }
 
 std::string ImageFolder::getPath() { return path; }
 
-bool ImageFolder::equals(ImageSet *other) {
-  if (this == other) return true;
+bool ImageFolder::equals(std::shared_ptr<AbstractImageSet> other) {
+  if (this == other.get()) return true;
   if (other->getType() != ImageSetType::IMAGEFOLDER) return false;
   if (this->getPath() != other->getPath()) return false;
   return true;
@@ -100,7 +101,7 @@ void ImageFolder::loadFolder() {
 }
 
 // static attributes (if any)
-
+}  // of namespace ImageSet
 }  // of namespace AnnotatorLib
 
 /************************************************************