moved imageset files to ImageSet folder

chriamue · chriamue · commit 8083191969cb · 2017-08-03T06:11:20.000+02:00
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/Camera.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/Camera.h
@@ -15,7 +15,7 @@
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
-#include "AnnotatorLib/ImageSet.h"
+#include "AnnotatorLib/ImageSet/ImageSet.h"
 
 namespace AnnotatorLib {
 
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageFTP.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageFTP.h
@@ -7,7 +7,7 @@
  ************************************************************/
 
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
 #include <string>
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageFolder.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageFolder.h
@@ -7,7 +7,7 @@
  ************************************************************/
 
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
 #include <string>
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSet.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSet.h
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSetFactory.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/ImageSetFactory.h
@@ -9,7 +9,7 @@
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
-#include <AnnotatorLib/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
 
 namespace AnnotatorLib {
 
diff --git a/source/annotatorlib/include/AnnotatorLib/ImageSet/Video.h b/source/annotatorlib/include/AnnotatorLib/ImageSet/Video.h
@@ -7,7 +7,7 @@
  ************************************************************/
 
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
 #include <string>
diff --git a/source/annotatorlib/include/AnnotatorLib/Project.h b/source/annotatorlib/include/AnnotatorLib/Project.h
@@ -6,7 +6,7 @@
  Project class header
  ************************************************************/
 #include <AnnotatorLib/AnnotatorLibDatastructs.h>
-#include <AnnotatorLib/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
 #include <AnnotatorLib/Session.h>
 #include <AnnotatorLib/annotatorlib_api.h>
 
diff --git a/source/annotatorlib/source/ImageSet/Camera.cpp b/source/annotatorlib/source/ImageSet/Camera.cpp
diff --git a/source/annotatorlib/source/ImageSet/ImageFTP.cpp b/source/annotatorlib/source/ImageSet/ImageFTP.cpp
@@ -16,7 +16,7 @@
 #include <Poco/StreamCopier.h>
 #include <Poco/URI.h>
 
-#include "AnnotatorLib/ImageFTP.h"
+#include "AnnotatorLib/ImageSet/ImageFTP.h"
 
 // Derived includes directives
 
diff --git a/source/annotatorlib/source/ImageSet/ImageFolder.cpp b/source/annotatorlib/source/ImageSet/ImageFolder.cpp
@@ -8,7 +8,7 @@
 
 // include associated header file
 
-#include "AnnotatorLib/ImageFolder.h"
+#include "AnnotatorLib/ImageSet/ImageFolder.h"
 
 #include <set>
 #include <stdexcept>
diff --git a/source/annotatorlib/source/ImageSet/ImageSetFactory.cpp b/source/annotatorlib/source/ImageSet/ImageSetFactory.cpp
@@ -8,11 +8,11 @@
 #include <stdexcept>
 #include <string>
 // include associated header file
-#include "AnnotatorLib/Camera.h"
-#include "AnnotatorLib/ImageFTP.h"
-#include "AnnotatorLib/ImageFolder.h"
-#include "AnnotatorLib/ImageSetFactory.h"
-#include "AnnotatorLib/Video.h"
+#include "AnnotatorLib/ImageSet/Camera.h"
+#include "AnnotatorLib/ImageSet/ImageFTP.h"
+#include "AnnotatorLib/ImageSet/ImageFolder.h"
+#include "AnnotatorLib/ImageSet/ImageSetFactory.h"
+#include "AnnotatorLib/ImageSet/Video.h"
 
 // Derived includes directives
 
diff --git a/source/annotatorlib/source/ImageSet/Video.cpp b/source/annotatorlib/source/ImageSet/Video.cpp
@@ -10,7 +10,7 @@
 //#include <opencv2/imgproc/imgproc.hpp>
 #include <opencv2/highgui/highgui.hpp>
 
-#include "AnnotatorLib/Video.h"
+#include "AnnotatorLib/ImageSet/Video.h"
 
 // Derived includes directives
 
diff --git a/source/annotatorlib/source/Project.cpp b/source/annotatorlib/source/Project.cpp
@@ -6,7 +6,7 @@
  ************************************************************/
 
 // include associated header file
-#include <AnnotatorLib/ImageSetFactory.h>
+#include <AnnotatorLib/ImageSet/ImageSetFactory.h>
 #include <AnnotatorLib/Project.h>
 #include <AnnotatorLib/Storage/StorageFactory.h>
 
diff --git a/source/tests/annotatorlib-test/imageftp_test.cpp b/source/tests/annotatorlib-test/imageftp_test.cpp
@@ -1,6 +1,5 @@
 // Copyright 2016 Annotator Team
-#include <AnnotatorLib/ImageFTP.h>
-#include <AnnotatorLib/Video.h>
+#include <AnnotatorLib/ImageSet/ImageFTP.h>
 #include <gmock/gmock.h>
 #include <string>
 
diff --git a/source/tests/annotatorlib-test/imageset_test.cpp b/source/tests/annotatorlib-test/imageset_test.cpp
@@ -1,8 +1,8 @@
 // Copyright 2016 Annotator Team
-#include <AnnotatorLib/ImageFolder.h>
-#include <AnnotatorLib/ImageSet.h>
-#include <AnnotatorLib/ImageSetFactory.h>
-#include <AnnotatorLib/Video.h>
+#include <AnnotatorLib/ImageSet/ImageFolder.h>
+#include <AnnotatorLib/ImageSet/ImageSet.h>
+#include <AnnotatorLib/ImageSet/ImageSetFactory.h>
+#include <AnnotatorLib/ImageSet/Video.h>
 #include <gmock/gmock.h>
 #include <string>
 
