kindred/create
1
1
Fork 0
Code Issues 44 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ do pcl components checks

Browse Source
This commit is contained in:
wmayer
2014-08-28 01:51:58 +02:00
parent c043ec75d9
commit 3fd87a62b4
6 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/Mod/Points/App/AppPointsPy.cpp
View File

@@ -35,7 +35,7 @@
#include <App/Property.h>
// PCL test
#ifdef HAVE_PCL
#ifdef HAVE_PCL_IO
# include <iostream>
# include <pcl/io/ply_io.h>
# include <pcl/point_types.h>
@@ -53,7 +53,7 @@ static PyObject *
open(PyObject *self, PyObject *args)
{
const char* Name;
if (! PyArg_ParseTuple(args, "s",&Name))
if (!PyArg_ParseTuple(args, "s",&Name))
return NULL;
PY_TRY {
@@ -73,9 +73,8 @@ open(PyObject *self, PyObject *args)
pcFeature->Points.setValue( pkTemp );
}
#ifdef HAVE_PCL
else
if (file.hasExtension("ply")) {
#ifdef HAVE_PCL_IO
else if (file.hasExtension("ply")) {
// create new document import
App::Document *pcDoc = App::GetApplication().newDocument("Unnamed");
Points::Feature *pcFeature = (Points::Feature *)pcDoc->addObject("Points::Feature", file.fileNamePure().c_str());
@@ -85,13 +84,9 @@ open(PyObject *self, PyObject *args)
pcl::PointCloud<pcl::PointXYZRGB> cloud_in;
pcl::io::loadPLYFile<pcl::PointXYZRGB>(Name,cloud_in);
for(pcl::PointCloud<pcl::PointXYZRGB>::const_iterator it = cloud_in.begin();it!=cloud_in.end();++it)
pkTemp.push_back(Base::Vector3d(it->x,it->y,it->z));
for (pcl::PointCloud<pcl::PointXYZRGB>::const_iterator it = cloud_in.begin();it!=cloud_in.end();++it)
pkTemp.push_back(Base::Vector3d(it->x,it->y,it->z));
pcFeature->Points.setValue( pkTemp );
}
#endif
else {
@@ -130,6 +125,25 @@ insert(PyObject *self, PyObject *args)
pkTemp.load(Name);
pcFeature->Points.setValue( pkTemp );
}
#ifdef HAVE_PCL_IO
else if (file.hasExtension("ply")) {
App::Document *pcDoc = App::GetApplication().getDocument(DocName);
if (!pcDoc) {
pcDoc = App::GetApplication().newDocument(DocName);
}
Points::Feature *pcFeature = (Points::Feature *)pcDoc->addObject("Points::Feature", file.fileNamePure().c_str());
Points::PointKernel pkTemp;
// pcl test
pcl::PointCloud<pcl::PointXYZRGB> cloud_in;
pcl::io::loadPLYFile<pcl::PointXYZRGB>(Name,cloud_in);
for (pcl::PointCloud<pcl::PointXYZRGB>::const_iterator it = cloud_in.begin();it!=cloud_in.end();++it)
pkTemp.push_back(Base::Vector3d(it->x,it->y,it->z));
pcFeature->Points.setValue( pkTemp );
}
#endif
else {
Py_Error(PyExc_Exception,"unknown file ending");
}