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

Fixed segmentObstaclesFromGround() build error

Browse Source
This commit is contained in:
matlabbe
2016-02-17 16:01:14 -05:00
parent c6a46a7238
commit 0a913a9cd4
5 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/include/rtabmap/core/impl/util3d_mapping.hpp
View File

@@ -106,7 +106,7 @@ void segmentObstaclesFromGround(
bool segmentFlatObstacles)
{
pcl::IndicesPtr indices(new std::vector<int>);
segmentObstaclesFromGround(
segmentObstaclesFromGround<PointT>(
cloud,
indices,
ground,

8
corelib/src/util3d_motion_estimation.cpp
View File

@@ -35,6 +35,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/core/util3d_correspondences.h"
#include "rtabmap/core/util3d.h"
#include "rtabmap/core/OptimizerG2O.h"
namespace rtabmap
{
@@ -128,6 +130,12 @@ Transform estimateMotion3DTo2D(
R.at<double>(1,0), R.at<double>(1,1), R.at<double>(1,2), tvec.at<double>(1),
R.at<double>(2,0), R.at<double>(2,1), R.at<double>(2,2), tvec.at<double>(2));
UWARN("pnp=%s", pnp.prettyPrint().c_str());
OptimizerG2O g2o;
Transform g2oT = g2o.poseOptimization(pnp, objectPoints, imagePoints, cameraModel);
UWARN("g2oT=%s", g2oT.prettyPrint().c_str());
transform = (cameraModel.localTransform() * pnp).inverse();
// compute variance (like in PCL computeVariance() method of sac_model.h)

3
corelib/src/util3d_surface.cpp
View File

@@ -97,6 +97,7 @@ std::vector<pcl::Vertices> organizedFastMesh(
bool quad,
int trianglePixelSize)
{
UDEBUG("size=%d angle=%f quad=%d triangleSize=%d", (int)cloud->size(), angleTolerance, quad?1:0, trianglePixelSize);
UASSERT(cloud->is_dense == false);
UASSERT(cloud->width > 1 && cloud->height > 1);
@@ -131,7 +132,7 @@ std::vector<pcl::Vertices> organizedFastMesh(
bool quad,
int trianglePixelSize)
{
UDEBUG("size=%d angle=%f quand=%d triangleSize=%d", (int)cloud->size(), angleTolerance, quad?1:0, trianglePixelSize);
UDEBUG("size=%d angle=%f quad=%d triangleSize=%d", (int)cloud->size(), angleTolerance, quad?1:0, trianglePixelSize);
UASSERT(cloud->is_dense == false);
UASSERT(cloud->width > 1 && cloud->height > 1);

2
guilib/src/ExportCloudsDialog.cpp
View File

@@ -49,7 +49,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QPushButton>
#include <QDir>
#include <QFileinfo>
#include <QFileInfo>
#include <QMessageBox>
#include <QFileDialog>
#include <QInputDialog>

7
guilib/src/PreferencesDialog.cpp
View File

@@ -1136,9 +1136,14 @@ void PreferencesDialog::resetSettings(QGroupBox * groupBox)
_ui->checkBox_map_erode->setChecked(false);
_ui->doubleSpinBox_map_opacity->setValue(0.75);
_ui->groupBox_organized->setChecked(true);
_ui->doubleSpinBox_mesh_angleTolerance->setValue(15.0);
#if PCL_VERSION_COMPARE(>=, 1, 7, 2)
_ui->groupBox_organized->setChecked(true);
_ui->checkBox_mesh_quad->setChecked(true);
#else
_ui->groupBox_organized->setChecked(false);
_ui->checkBox_mesh_quad->setChecked(false);
#endif
_ui->spinBox_mesh_triangleSize->setValue(2);
}
else if(groupBox->objectName() == _ui->groupBox_logging1->objectName())