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

Updated Freenect2 calibration lookup names

Browse Source
This commit is contained in:
matlabbe
2016-09-13 18:57:44 -04:00
parent 2b2dc2be39
commit 861cc437f4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
corelib/src/CameraRGBD.cpp
View File

@@ -1468,6 +1468,7 @@ bool CameraFreenect2::init(const std::string & calibrationFolder, const std::str
reg_ = new libfreenect2::Registration(depthParams, colorParams); reg_ = new libfreenect2::Registration(depthParams, colorParams);
// look for calibration files // look for calibration files
stereoModel_ = StereoCameraModel();
if(!calibrationFolder.empty()) if(!calibrationFolder.empty())
{ {
std::string calibrationName = dev_->getSerialNumber(); std::string calibrationName = dev_->getSerialNumber();
@@ -1475,9 +1476,13 @@ bool CameraFreenect2::init(const std::string & calibrationFolder, const std::str
{ {
calibrationName = cameraName; calibrationName = cameraName;
} }
stereoModel_.setName(calibrationName, "depth", "rgb");
if(!stereoModel_.load(calibrationFolder, calibrationName, false)) if(!stereoModel_.load(calibrationFolder, calibrationName, false))
{ {
UWARN("Missing calibration files for camera \"%s\" in \"%s\" folder, default calibration used.", UWARN("Missing calibration files for camera \"%s\" in \"%s\" folder, default calibration "
"is used. Note that from version 0.11.10, calibration suffixes for Freenect2 driver have "
"changed from \"_left\"->\"_depth\" and \"_right\"->\"_rgb\". You can safely rename "
"the calibration files to avoid recalibrating.",
calibrationName.c_str(), calibrationFolder.c_str()); calibrationName.c_str(), calibrationFolder.c_str());
} }
else else