Added PointLayout C functions and unit tests

Author: jimmysoda

source/pdal/capi/CMakeLists.txt

@@ -5,6 +5,7 @@ message(STATUS "Found PDAL ${PDAL_VERSION}")
 
 set(SOURCES
 	Pipeline.cpp
+	PointLayout.cpp
 	PointView.cpp
 	PointViewCollection.cpp
 )
@@ -13,6 +14,7 @@ set(HEADERS
 	Defines.h
 	Forward.h
 	Pipeline.h
+	PointLayout.h
 	PointView.h
 	PointViewCollection.h
 )

source/pdal/capi/PointLayout.cpp

@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+
+#include "PointLayout.h"
+
+#include <pdal/Dimension.hpp>
+#include <pdal/DimType.hpp>
+#include <pdal/PointLayout.hpp>
+
+namespace pdal
+{
+	namespace capi
+	{
+	
+		size_t PDALGetDimSize(PDALPointLayoutPtr layout, const char *name)
+		{
+			pdal::PointLayoutPtr nativeLayout = reinterpret_cast<pdal::PointLayoutPtr>(layout);
+			return (name && nativeLayout) ? nativeLayout->dimSize(nativeLayout->findDim(name)) : 0;
+		}
+
+		size_t PDALGetDimPackedOffset(PDALPointLayoutPtr layout,  const char *name)
+		{
+			size_t offset = 0;
+
+			pdal::PointLayoutPtr nativeLayout = reinterpret_cast<pdal::PointLayoutPtr>(layout);
+
+			if (name && nativeLayout)
+			{
+				pdal::DimType type = nativeLayout->findDimType(name);
+				pdal::DimTypeList dims = nativeLayout->dimTypes();
+				std::string name = pdal::Dimension::name(type.m_id);
+
+				for (auto dim : dims)
+				{
+					if (name == pdal::Dimension::name(dim.m_id))
+					{
+						break;
+					}
+					else
+					{
+						offset += nativeLayout->dimSize(dim.m_id);
+					}
+				}
+			}
+
+			return offset;
+		}
+
+		size_t PDALGetPointSize(PDALPointLayoutPtr layout)
+		{
+			
+			pdal::PointLayoutPtr nativeLayout = reinterpret_cast<pdal::PointLayoutPtr>(layout);
+			return nativeLayout ? nativeLayout->pointSize() : 0;
+		}
+	}
+}

source/pdal/capi/PointLayout.h

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+
+#ifndef PDAL_CAPI_POINTLAYOUT_H
+#define PDAL_CAPI_POINTLAYOUT_H
+
+#include "Forward.h"
+
+#ifdef __cplusplus
+namespace pdal
+{
+	namespace capi
+	{
+
+		extern "C"
+		{
+#endif
+			//! PDAL_C_API PDALDimTypeList PDALGetPointLayoutDimTypes(PDALPointLayoutPtr layout);
+
+			//! PDAL_C_API PDALDimType PDALFindDimType(PDALPointLayoutPtr layout, const char *name);
+
+			PDAL_C_API size_t PDALGetDimSize(PDALPointLayoutPtr layout, const char *name);
+
+			PDAL_C_API size_t PDALGetDimPackedOffset(PDALPointLayoutPtr layout, const char *name);
+
+			PDAL_C_API size_t PDALGetPointSize(PDALPointLayoutPtr layout);
+
+
+#ifdef __cplusplus
+		} // extern "C"
+	} // namespace capi
+} // namespace pdal
+#endif
+
+#endif

tests/pdal/capi/CMakeLists.txt

@@ -7,6 +7,7 @@ set(DEPENDENCIES pdal_c)
 
 set(TESTS
 	PipelineTest
+	PointLayoutTest
 	PointViewCollectionTest
 	PointViewTest
 )

tests/pdal/capi/PointLayoutTest.c.in

@@ -0,0 +1,100 @@
+/*
+ * Copyright (c) Simverge Software LLC - All Rights Reserved
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <assert.h>
+
+#include "greatest.h"
+
+#include <pdal/capi/Pipeline.h>
+#include <pdal/capi/PointLayout.h>
+#include <pdal/capi/PointView.h>
+#include <pdal/capi/PointViewCollection.h>
+
+SUITE(PointLayoutTest);
+
+static PDALPipelinePtr gPipeline = NULL;
+static PDALPointViewPtr gPointView = NULL;
+
+static void setupPointLayoutTest(void *arg)
+{
+	FILE *file = fopen("@CMAKE_BINARY_DIR@/data/simple-reproject.json", "rb");
+	char *json = NULL;
+
+	if (file)
+	{
+		fseek(file, 0, SEEK_END);
+		long length = ftell(file);
+		fseek(file, 0, SEEK_SET);
+		char *json = malloc(length + 1);
+
+		if (json)
+		{
+			fread(json, 1, length, file);
+			json[length] = '\0';
+			gPipeline = PDALCreatePipeline(json);
+
+			if (gPipeline && PDALExecutePipeline(gPipeline))
+			{
+				PDALPointViewCollectionPtr views = PDALGetPointViews(gPipeline);
+
+				if (PDALHasNextPointView(views))
+				{
+					gPointView = PDALGetNextPointView(views);
+				}
+			}
+
+			free(json);
+		}
+
+		fclose(file);
+	}
+}
+
+static void teardownPointLayoutTest(void *arg)
+{
+	PDALDisposePointView(gPointView);
+	PDALDisposePipeline(gPipeline);
+}
+
+TEST testPDALGetDimSize(void)
+{
+	size_t size = PDALGetDimSize(NULL, NULL);
+	ASSERT_EQ(0, size);
+
+	int numTypes = 3;
+	const char *types[] = {"X", "Y", "Z"};
+
+	for (int i = 0; i < numTypes; ++i)
+	{
+		size = PDALGetDimSize(NULL, types[i]);
+		ASSERT_EQ(0, size);
+	}
+
+	PASS();
+}
+
+TEST testPDALGetDimPackedOffset(void)
+{
+	PASS();
+}
+
+TEST testPDALGetPointSize(void)
+{
+	PASS();
+}
+
+GREATEST_SUITE(PointLayoutTest)
+{
+	SET_SETUP(setupPointLayoutTest, NULL);
+	SET_TEARDOWN(teardownPointLayoutTest, NULL);
+
+	RUN_TEST(testPDALGetDimSize);
+	RUN_TEST(testPDALGetDimPackedOffset);
+	RUN_TEST(testPDALGetPointSize);
+
+	SET_SETUP(NULL, NULL);
+	SET_TEARDOWN(NULL, NULL);
+}

tests/pdal/capi/main.c

@@ -9,6 +9,7 @@
 #include "greatest.h"
 
 SUITE_EXTERN(PipelineTest);
+SUITE_EXTERN(PointLayoutTest);
 SUITE_EXTERN(PointViewCollectionTest);
 SUITE_EXTERN(PointViewTest);
 
@@ -18,6 +19,7 @@ int main(int argc, char **argv)
 {
 	GREATEST_MAIN_BEGIN();
 	RUN_SUITE(PipelineTest);
+	RUN_SUITE(PointLayoutTest);
 	RUN_SUITE(PointViewCollectionTest);
 	RUN_SUITE(PointViewTest);
 	GREATEST_MAIN_END();