Cleaned up the pro for the filter test to selectively test or not poi…

…sson surf recon

sources/FilterTest.cpp

@@ -16,7 +16,13 @@ bool IsWaterTight(MyMesh &m)
 
 int main(int /*argc*/, char*/*argv*/[])
 {
+#ifdef _POISSON_TEST_   
   PoissonPluginTEST();
+#endif
+
+#ifdef _MUPARSER_TEST_   
+  FuncParserPluginTEST();
+#endif
   CreatePluginTEST();
   MeshingPluginTEST();
   MeasurePluginTEST();

sources/FilterTest.h

@@ -9,6 +9,6 @@ void SamplingPluginTEST();
 void SelectionPluginTEST();
 void TransformPluginTEST();
 void PoissonPluginTEST();
-
+void FuncParserPluginTEST();
 #endif // FILTERTEST_H
 

sources/FilterTest.pro

@@ -1,76 +1,57 @@
 DEPENDPATH += . ../../vcglib
-INCLUDEPATH += . ../../vcglib muparser-2.2.5/include
 INCLUDEPATH += . ../../vcglib ../../vcglib/eigenlib
 CONFIG += console stl c++11
+
+#CONFIG += POISSON 
+#CONFIG += MUPARSER
+
 TEMPLATE = app
 # Mac specific Config required to avoid to make application bundles
 CONFIG -= app_bundle
-MUD = ./muparser-2.2.5/src
-MUPARSERSRC = $$MUD/muParser.cpp $$MUD/muParserBase.cpp \
-              $$MUD/muParserBytecode.cpp $$MUD/muParserCallback.cpp \
-              $$MUD/muParserDLL.cpp $$MUD/muParserError.cpp $$MUD/muParserInt.cpp \
-              $$MUD/muParserTest.cpp $$MUD/muParserTokenReader.cpp
+
+MUPARSERDIR = ./external/muparser-2.2.5
+MUPARSERSRC = $$MUPARSERDIR/src/muParser.cpp $$MUPARSERDIR/src/muParserBase.cpp \
+              $$MUPARSERDIR/src/muParserBytecode.cpp $$MUPARSERDIR/src/muParserCallback.cpp \
+              $$MUPARSERDIR/src/muParserDLL.cpp      $$MUPARSERDIR/src/muParserError.cpp \
+              $$MUPARSERDIR/src/muParserInt.cpp      $$MUPARSERDIR/src/muParserTest.cpp $$MUPARSERDIR/src/muParserTokenReader.cpp
+
+POISSONDIR = ./external/PoissonRecon/Src
+POISSONSRC = $$POISSONDIR/PlyFile.cpp $$POISSONDIR/Factor.cpp $$POISSONDIR/Geometry.cpp $$POISSONDIR/MarchingCubes.cpp
+
+INCLUDEPATH += $$MUPARSERDIR/include $$POISSONDIR
 
 #TARGET = filtertest
 SOURCES += FilterTest.cpp \
   CppMesh.cpp \ 
   Decorator.cpp \
   Color.cpp \
   Create.cpp \
-  FuncParser.cpp \
   Measure.cpp \
   Meshing.cpp \
   Refine.cpp \
   Sampling.cpp \
   Selection.cpp \
   Transform.cpp \
-  ./filter_screened_poisson_ml/filter_screened_poisson.cpp \
-   ../../vcglib/wrap/ply/plylib.cpp \
-  $$MUPARSERSRC \
-    filter_screened_poisson_ml/Src/CmdLineParser.cpp \
-    filter_screened_poisson_ml/Src/Factor.cpp \
-    filter_screened_poisson_ml/Src/Geometry.cpp \
-    filter_screened_poisson_ml/Src/MarchingCubes.cpp \
-    filter_screened_poisson_ml/Src/PlyFile.cpp \
-    Quality.cpp \
-    miniz/miniz.c
+  Quality.cpp \
+  ../../vcglib/wrap/ply/plylib.cpp \
+  external/miniz/miniz.c
+
+if(POISSON) {
+SOURCES += $$POISSONSRC Poisson.cpp 
+DEFINES += _POISSON_TEST_
+message("Including Poisson")
+} else {
+message("Not Including Poisson")
+}
+if(MUPARSER) {
+SOURCES += $$MUPARSERSRC FuncParser.cpp 
+DEFINES += _MUPARSER_TEST_
+message("Including MUPARSER")
+} else {
+message("Not Including MUPARSER")
+}
+
 
 HEADERS += mesh_def.h \
     FilterTest.h \
-    filter_screened_poisson_ml/Src/Allocator.h \
-    filter_screened_poisson_ml/Src/Array.h \
-    filter_screened_poisson_ml/Src/BinaryNode.h \
-    filter_screened_poisson_ml/Src/BSplineData.h \
-    filter_screened_poisson_ml/Src/CmdLineParser.h \
-    filter_screened_poisson_ml/Src/Factor.h \
-    filter_screened_poisson_ml/Src/FunctionData.h \
-    filter_screened_poisson_ml/Src/Geometry.h \
-    filter_screened_poisson_ml/Src/Hash.h \
-    filter_screened_poisson_ml/Src/MarchingCubes.h \
-    filter_screened_poisson_ml/Src/MAT.h \
-    filter_screened_poisson_ml/Src/MemoryUsage.h \
-    filter_screened_poisson_ml/Src/MultiGridOctreeData.h \
-    filter_screened_poisson_ml/Src/MyTime.h \
-    filter_screened_poisson_ml/Src/Octree.h \
-    filter_screened_poisson_ml/Src/Ply.h \
-    filter_screened_poisson_ml/Src/PlyFile.h \
-    filter_screened_poisson_ml/Src/PointStream.h \
-    filter_screened_poisson_ml/Src/Polynomial.h \
-    filter_screened_poisson_ml/Src/PPolynomial.h \
-    filter_screened_poisson_ml/Src/SparseMatrix.h \
-    filter_screened_poisson_ml/Src/Vector.h \
-    muparser-2.2.5/include/muParser.h \
-    muparser-2.2.5/include/muParserBase.h \
-    muparser-2.2.5/include/muParserBytecode.h \
-    muparser-2.2.5/include/muParserCallback.h \
-    muparser-2.2.5/include/muParserDef.h \
-    muparser-2.2.5/include/muParserDLL.h \
-    muparser-2.2.5/include/muParserError.h \
-    muparser-2.2.5/include/muParserFixes.h \
-    muparser-2.2.5/include/muParserInt.h \
-    muparser-2.2.5/include/muParserStack.h \
-    muparser-2.2.5/include/muParserTemplateMagic.h \
-    muparser-2.2.5/include/muParserTest.h \
-    muparser-2.2.5/include/muParserToken.h \
-    muparser-2.2.5/include/muParserTokenReader.h \
     ColorHistogram.h

sources/Poisson.cpp

@@ -507,37 +507,13 @@ bool PoissonSurfaceRecontruction(uintptr_t _baseM, uintptr_t p, int octDepth, in
 }
 
 
-#ifdef TESTING
 void PoissonPluginTEST()
 {
-
-	MyMesh m;
-	int loadmask = 0;
-	m.tr.SetIdentity();
-	string fileName = "E:/xampp/htdocs/Repo/test/in.ply";
-	m.meshName = fileName;
-
-	//printf("Starting POISSON PLUGIN TEST on %s", fileName);
-
-	int ret = vcg::tri::io::Importer<MyMesh>::Open(m, fileName.c_str(), loadmask);
-
-
-	if (ret != 0)
-	{
-		printf("Error opening file\n");
-		return;
-	}
-
-	MyMesh out;
-	PoissonSurfaceRecontruction(uintptr_t(&m), uintptr_t(&out));
-	string outFileName = "E:/xampp/htdocs/Repo/test/out.ply";
-	//out.tr.SetIdentity();
-	ret = vcg::tri::io::Exporter<MyMesh>::Save(out, outFileName.c_str(), loadmask);
-	if (ret != 0) { printf("Error in saving file\n"); }
-
-	printf("END\n");
+  MyMesh m;
+  Torus(m,3,1,60,30);
+  MyMesh out;
+  PoissonSurfaceRecontruction(uintptr_t(&m), uintptr_t(&out),6,6,1.5);
 }
-#endif
 
 #ifdef __EMSCRIPTEN__
 EMSCRIPTEN_BINDINGS(PoissonFilterPlugin) {