Rename pdal::capi::PointViewCollection to PointViewIterator

jimmysoda · jimmysoda · commit 95753cfede1d · 2018-06-26T12:24:56.000-04:00
diff --git a/source/pdal/capi/CMakeLists.txt b/source/pdal/capi/CMakeLists.txt
@@ -7,7 +7,7 @@ set(SOURCES
 	Pipeline.cpp
 	PointLayout.cpp
 	PointView.cpp
-	PointViewCollection.cpp
+	PointViewIterator.cpp
 )
 
 set(HEADERS
@@ -16,7 +16,7 @@ set(HEADERS
 	Pipeline.h
 	PointLayout.h
 	PointView.h
-	PointViewCollection.h
+	PointViewIterator.h
 )
 
 set(DEPENDENCIES
diff --git a/source/pdal/capi/Forward.h b/source/pdal/capi/Forward.h
@@ -28,7 +28,7 @@ namespace pdal
 
 	namespace capi
 	{
-		class PointViewCollection;
+		class PointViewIterator;
 		using Pipeline = std::unique_ptr<pdal::PipelineExecutor>;
 		using PointView = pdal::PointViewPtr;
 	}
@@ -46,7 +46,7 @@ typedef void* PDALPointLayoutPtr;
 /// A pointer to a C++ pdal::capi::PointView object
 typedef void* PDALPointViewPtr;
 
-/// A pointer to a C++ pdal::capi::PointViewCollection object
-typedef void* PDALPointViewCollectionPtr;
+/// A pointer to a C++ pdal::capi::PointViewIterator object
+typedef void* PDALPointViewIteratorPtr;
 
 #endif /* PDAL_CAPI_FORWARD_H */
diff --git a/source/pdal/capi/Pipeline.cpp b/source/pdal/capi/Pipeline.cpp
@@ -3,7 +3,7 @@
  */
 
 #include "Pipeline.h"
-#include "PointViewCollection.h"
+#include "PointViewIterator.h"
 
 #include <pdal/PipelineExecutor.hpp>
 
@@ -172,18 +172,18 @@ namespace pdal
 				return ptr && ptr->get() && ptr->get()->validate();
 			}
 
-			PDALPointViewCollectionPtr PDALGetPointViews(PDALPipelinePtr pipeline)
+			PDALPointViewIteratorPtr PDALGetPointViews(PDALPipelinePtr pipeline)
 			{
 				Pipeline *ptr = reinterpret_cast<Pipeline *>(pipeline);
-				pdal::capi::PointViewCollection *views = nullptr;
+				pdal::capi::PointViewIterator *views = nullptr;
 				
 				if (ptr && ptr->get())
 				{
 					auto &v = ptr->get()->getManagerConst().views();
 
 					if (!v.empty())
 					{
-						views = new pdal::capi::PointViewCollection(v);
+						views = new pdal::capi::PointViewIterator(v);
 					}
 				}
 
diff --git a/source/pdal/capi/Pipeline.h b/source/pdal/capi/Pipeline.h
@@ -116,7 +116,7 @@ namespace pdal
 			 * @param pipeline The pipeline
 			 * @return A pointer to a point view collection or nullptr if no point views are available
 			 */
-			PDAL_C_API PDALPointViewCollectionPtr PDALGetPointViews(PDALPipelinePtr pipeline);
+			PDAL_C_API PDALPointViewIteratorPtr PDALGetPointViews(PDALPipelinePtr pipeline);
 
 #ifdef __cplusplus
 
diff --git a/source/pdal/capi/PointViewCollection.cpp b/source/pdal/capi/PointViewCollection.cpp
diff --git a/source/pdal/capi/PointViewIterator.cpp b/source/pdal/capi/PointViewIterator.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+#include "PointViewIterator.h"
+
+namespace pdal
+{
+	namespace capi
+	{
+		PointViewIterator::PointViewIterator(const pdal::PointViewSet& views) :
+			mViews(views)
+		{
+			reset();
+		}
+
+		bool PointViewIterator::hasNext() const
+		{
+			return (mItr != mViews.cend());
+		}
+
+		const pdal::PointViewPtr PointViewIterator::next()
+		{
+			return hasNext() ? *(mItr++) : nullptr;
+		}
+
+		void PointViewIterator::reset()
+		{
+			mItr = mViews.cbegin();
+		}
+
+
+		extern "C"
+		{
+			bool PDALHasNextPointView(PDALPointViewIteratorPtr collection)
+			{
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				return ptr && ptr->hasNext();
+			}
+
+			PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr collection)
+			{
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+				PDALPointViewPtr view = nullptr;
+
+				if (ptr)
+				{
+					pdal::PointViewPtr v = ptr->next();
+
+					if (v)
+					{
+						view = new pdal::PointViewPtr(std::move(v));
+					}
+				}
+
+				return view;
+			}
+
+			void PDALResetPointViewIterator(PDALPointViewIteratorPtr collection)
+			{
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+
+				if (ptr)
+				{
+					ptr->reset();
+				}
+			}
+
+			void PDALDisposePointViewIterator(PDALPointViewIteratorPtr collection)
+			{
+				auto ptr = reinterpret_cast<pdal::capi::PointViewIterator *>(collection);
+
+				if (ptr)
+				{
+					delete ptr;
+					ptr = nullptr;
+					collection = nullptr;
+				}
+			}
+
+		}
+
+	}
+}
diff --git a/source/pdal/capi/PointViewIterator.h b/source/pdal/capi/PointViewIterator.h
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) Simverge Software LLC - All Rights Reserved
  */
-#ifndef PDAL_CAPI_POINTVIEWCOLLECTION_H
-#define PDAL_CAPI_POINTVIEWCOLLECTION_H
+#ifndef PDAL_CAPI_PointViewIterator_H
+#define PDAL_CAPI_PointViewIterator_H
 
 #include "Forward.h"
 
@@ -13,10 +13,10 @@ namespace pdal
 {
 	namespace capi
 	{
-		class PDAL_C_API PointViewCollection
+		class PDAL_C_API PointViewIterator
 		{
 		public:
-			PointViewCollection(const pdal::PointViewSet& views);
+			PointViewIterator(const pdal::PointViewSet& views);
 			bool hasNext() const;
 			const pdal::PointViewPtr next();
 			void reset();
@@ -32,13 +32,13 @@ namespace pdal
 #include <stdbool.h> // for bool
 #endif /* __cplusplus */
 
-			PDAL_C_API bool PDALHasNextPointView(PDALPointViewCollectionPtr collection);
+			PDAL_C_API bool PDALHasNextPointView(PDALPointViewIteratorPtr collection);
 
-			PDAL_C_API PDALPointViewPtr PDALGetNextPointView(PDALPointViewCollectionPtr collection);
+			PDAL_C_API PDALPointViewPtr PDALGetNextPointView(PDALPointViewIteratorPtr collection);
 
-			PDAL_C_API void PDALResetPointViewCollection(PDALPointViewCollectionPtr collection);
+			PDAL_C_API void PDALResetPointViewIterator(PDALPointViewIteratorPtr collection);
 
-			PDAL_C_API void PDALDisposePointViewCollection(PDALPointViewCollectionPtr collection);
+			PDAL_C_API void PDALDisposePointViewIterator(PDALPointViewIteratorPtr collection);
 #ifdef __cplusplus
 		}
 	}
diff --git a/tests/pdal/capi/CMakeLists.txt b/tests/pdal/capi/CMakeLists.txt
@@ -8,7 +8,7 @@ set(DEPENDENCIES pdal_c)
 set(TESTS
 	PipelineTest
 	PointLayoutTest
-	PointViewCollectionTest
+	PointViewIteratorTest
 	PointViewTest
 )
 
diff --git a/tests/pdal/capi/PointLayoutTest.c.in b/tests/pdal/capi/PointLayoutTest.c.in
@@ -11,7 +11,7 @@
 #include <pdal/capi/Pipeline.h>
 #include <pdal/capi/PointLayout.h>
 #include <pdal/capi/PointView.h>
-#include <pdal/capi/PointViewCollection.h>
+#include <pdal/capi/PointViewIterator.h>
 
 SUITE(PointLayoutTest);
 
@@ -38,7 +38,7 @@ static void setupPointLayoutTest(void *arg)
 
 			if (gPipeline && PDALExecutePipeline(gPipeline))
 			{
-				PDALPointViewCollectionPtr views = PDALGetPointViews(gPipeline);
+				PDALPointViewIteratorPtr views = PDALGetPointViews(gPipeline);
 
 				if (PDALHasNextPointView(views))
 				{
diff --git a/tests/pdal/capi/PointViewIteratorTest.c.in b/tests/pdal/capi/PointViewIteratorTest.c.in
diff --git a/tests/pdal/capi/PointViewTest.c.in b/tests/pdal/capi/PointViewTest.c.in
diff --git a/tests/pdal/capi/main.c b/tests/pdal/capi/main.c

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`#include "Pipeline.h"`
`6`		`-#include "PointViewCollection.h"`
	`6`	`+#include "PointViewIterator.h"`
`7`	`7`
`8`	`8`	`#include <pdal/PipelineExecutor.hpp>`
`9`	`9`
`@@ -172,18 +172,18 @@ namespace pdal`
`172`	`172`	`return ptr && ptr->get() && ptr->get()->validate();`
`173`	`173`	`}`
`174`	`174`
`175`		`- PDALPointViewCollectionPtr PDALGetPointViews(PDALPipelinePtr pipeline)`
	`175`	`+ PDALPointViewIteratorPtr PDALGetPointViews(PDALPipelinePtr pipeline)`
`176`	`176`	`{`
`177`	`177`	`Pipeline ptr = reinterpret_cast<Pipeline >(pipeline);`
`178`		`- pdal::capi::PointViewCollection *views = nullptr;`
	`178`	`+ pdal::capi::PointViewIterator *views = nullptr;`
`179`	`179`
`180`	`180`	`if (ptr && ptr->get())`
`181`	`181`	`{`
`182`	`182`	`auto &v = ptr->get()->getManagerConst().views();`
`183`	`183`
`184`	`184`	`if (!v.empty())`
`185`	`185`	`{`
`186`		`- views = new pdal::capi::PointViewCollection(v);`
	`186`	`+ views = new pdal::capi::PointViewIterator(v);`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ set(DEPENDENCIES pdal_c)`
`8`	`8`	`set(TESTS`
`9`	`9`	`PipelineTest`
`10`	`10`	`PointLayoutTest`
`11`		`- PointViewCollectionTest`
	`11`	`+ PointViewIteratorTest`
`12`	`12`	`PointViewTest`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`#include <pdal/capi/Pipeline.h>`
`12`	`12`	`#include <pdal/capi/PointLayout.h>`
`13`	`13`	`#include <pdal/capi/PointView.h>`
`14`		`-#include <pdal/capi/PointViewCollection.h>`
	`14`	`+#include <pdal/capi/PointViewIterator.h>`
`15`	`15`
`16`	`16`	`SUITE(PointLayoutTest);`
`17`	`17`
`@@ -38,7 +38,7 @@ static void setupPointLayoutTest(void *arg)`
`38`	`38`
`39`	`39`	`if (gPipeline && PDALExecutePipeline(gPipeline))`
`40`	`40`	`{`
`41`		`- PDALPointViewCollectionPtr views = PDALGetPointViews(gPipeline);`
	`41`	`+ PDALPointViewIteratorPtr views = PDALGetPointViews(gPipeline);`
`42`	`42`
`43`	`43`	`if (PDALHasNextPointView(views))`
`44`	`44`	`{`