i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed normals update with corresponding cameras

Browse Source
This commit is contained in:
matlabbe
2015-08-24 18:35:24 -04:00
parent 58e3da18c2
commit 8ea1fa06ef
5 changed files with 36 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guilib/src/ExportCloudsDialog.cpp
View File

@@ -214,7 +214,7 @@ void ExportCloudsDialog::restoreDefaults()
_ui->groupBox_gp3->setChecked(false);
_ui->doubleSpinBox_gp3Radius->setValue(0.04);
_ui->doubleSpinBox_gp3Mu->setValue(2.5);
_ui->doubleSpinBox_meshDecimationFactor->setValue(1.0);
_ui->doubleSpinBox_meshDecimationFactor->setValue(0.0);
_ui->checkBox_textureMapping->setChecked(false);
this->update();

23
guilib/src/MainWindow.cpp
View File

@@ -4623,6 +4623,8 @@ bool MainWindow::getExportedClouds(
_exportDialog->getFiltering()?_exportDialog->getFilteringRadius():0.0f,
_exportDialog->getFiltering()?_exportDialog->getFilteringMinNeighbors():0.0f);
pcl::PointCloud<pcl::PointXYZ>::Ptr rawAssembledCloud(new pcl::PointCloud<pcl::PointXYZ>);
std::vector<int> rawCameraIndices;
if(_exportDialog->getAssemble())
{
_initProgressDialog->appendText(tr("Assembling %1 clouds...").arg(clouds.size()));
@@ -4636,12 +4638,15 @@ bool MainWindow::getExportedClouds(
{
pcl::PointCloud<pcl::PointXYZRGB>::Ptr transformed = util3d::transformPointCloud(iter->second, poses.at(iter->first));
*assembledCloud += *transformed;
rawCameraIndices.resize(assembledCloud->size(), iter->first);
_initProgressDialog->appendText(tr("Assembled cloud %1 (%2/%3).").arg(iter->first).arg(++i).arg(clouds.size()));
_initProgressDialog->incrementStep();
QApplication::processEvents();
}
pcl::copyPointCloud(*assembledCloud, *rawAssembledCloud);
_initProgressDialog->appendText(tr("Voxelize assembled cloud (%1 points, voxel size = %2 m)...")
.arg(assembledCloud->size())
.arg(_exportDialog->getAssembleVoxel()));
@@ -4653,14 +4658,15 @@ bool MainWindow::getExportedClouds(
_exportDialog->getAssembleVoxel());
}
_initProgressDialog->appendText(tr("Noise filtering (%1 points, radius = %2 m, min neighbors = %3)...")
.arg(assembledCloud->size())
.arg(_exportDialog->getFilteringRadius())
.arg(_exportDialog->getFilteringMinNeighbors()));
if(_exportDialog->getFiltering() &&
_exportDialog->getFilteringRadius() > 0.0 &&
_exportDialog->getFilteringMinNeighbors() > 0)
{
_initProgressDialog->appendText(tr("Noise filtering (%1 points, radius = %2 m, min neighbors = %3)...")
.arg(assembledCloud->size())
.arg(_exportDialog->getFilteringRadius())
.arg(_exportDialog->getFilteringMinNeighbors()));
pcl::IndicesPtr indices = util3d::radiusFiltering(assembledCloud, (float)_exportDialog->getFilteringRadius(), _exportDialog->getFilteringMinNeighbors());
pcl::PointCloud<pcl::PointXYZRGB>::Ptr cloudFiltered(new pcl::PointCloud<pcl::PointXYZRGB>);
pcl::copyPointCloud(*assembledCloud, *indices, *cloudFiltered);
@@ -4723,7 +4729,12 @@ bool MainWindow::getExportedClouds(
(*viewpoints)[oi].y = iter->second.y();
(*viewpoints)[oi++].z = iter->second.z();
}
util3d::adjustNormalsToViewPoints(viewpoints, cloudWithNormals, _exportDialog->getNormalKSearch());
util3d::adjustNormalsToViewPoints(
poses,
rawAssembledCloud,
rawCameraIndices,
cloudWithNormals,
_exportDialog->getNormalKSearch());
}
cloudsWithNormals.insert(std::make_pair(iter->first, cloudWithNormals));
@@ -4745,7 +4756,7 @@ bool MainWindow::getExportedClouds(
pcl::PolygonMesh::Ptr mesh = util3d::createMesh(iter->second, _exportDialog->getMeshGp3Radius(), _exportDialog->getMeshGp3Mu());
_initProgressDialog->appendText(tr("Mesh %1 created with %2 polygons (%3/%4).").arg(iter->first).arg(mesh->polygons.size()).arg(++i).arg(clouds.size()));
if(_exportDialog->getMeshDecimationFactor() < 1.0)
if(_exportDialog->getMeshDecimationFactor() > 0.0)
{
mesh = util3d::meshDecimation(mesh, (float)_exportDialog->getMeshDecimationFactor());
_initProgressDialog->appendText(tr("Mesh %1 decimation (factor=%2) to %3 polygons").arg(iter->first).arg(_exportDialog->getMeshDecimationFactor()).arg(mesh->polygons.size()));

10
guilib/src/ui/exportCloudsDialog.ui
View File

@@ -23,7 +23,7 @@
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<y>-242</y>
<width>773</width>
<height>1064</height>
</rect>
@@ -750,7 +750,7 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
<item row="3" column="1">
<widget class="QLabel" name="label_170">
<property name="text">
<string>Mesh quadric decimation factor (1=no decimation). Used to reduce the number of polygons.</string>
<string>Mesh quadric decimation factor (0=no decimation). Used to reduce the number of polygons.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
@@ -763,16 +763,16 @@ Guidelines: 4 times the voxel size, 0.025 for voxel=0.</string>
<number>2</number>
</property>
<property name="minimum">
<double>0.010000000000000</double>
<double>0.000000000000000</double>
</property>
<property name="maximum">
<double>1.000000000000000</double>
<double>0.990000000000000</double>
</property>
<property name="singleStep">
<double>0.100000000000000</double>
</property>
<property name="value">
<double>1.000000000000000</double>
<double>0.000000000000000</double>
</property>
</widget>
</item>