mirror of
https://github.com/introlab/rtabmap_ros.git
synced 2026-10-06 01:37:46 +08:00
Added image size to all camera calibration inputs. Memory::computeTransform() more fine tuning to know if data should be loaded from database.
This commit is contained in:
@@ -440,7 +440,8 @@ SensorData CameraStereoDC1394::captureImage()
|
||||
stereoModel_.left().cx(), //cx
|
||||
stereoModel_.left().cy(), //cy
|
||||
stereoModel_.baseline(),
|
||||
this->getLocalTransform());
|
||||
this->getLocalTransform(),
|
||||
left.size());
|
||||
}
|
||||
data = SensorData(left, right, model, this->getNextSeqID(), UTimer::now());
|
||||
}
|
||||
@@ -715,7 +716,8 @@ SensorData CameraStereoFlyCapture2::captureImage()
|
||||
cx,
|
||||
cy,
|
||||
baseline,
|
||||
this->getLocalTransform());
|
||||
this->getLocalTransform(),
|
||||
left.size());
|
||||
data = SensorData(left, right, model, this->getNextSeqID(), UTimer::now());
|
||||
}
|
||||
}
|
||||
@@ -892,6 +894,11 @@ SensorData CameraStereoImages::captureImage()
|
||||
rightImage = stereoModel_.right().rectifyImage(rightImage);
|
||||
}
|
||||
|
||||
if(stereoModel_.left().imageHeight() == 0 || stereoModel_.left().imageWidth() == 0)
|
||||
{
|
||||
stereoModel_.setImageSize(leftImage.size());
|
||||
}
|
||||
|
||||
data = SensorData(left.laserScanRaw(), left.laserScanMaxPts(), 0, leftImage, rightImage, stereoModel_, left.id()/(camera2_?1:2), left.stamp());
|
||||
data.setGroundTruth(left.groundTruth());
|
||||
}
|
||||
@@ -1013,6 +1020,12 @@ SensorData CameraStereoVideo::captureImage()
|
||||
rightImage = rightImage.clone();
|
||||
}
|
||||
}
|
||||
|
||||
if(stereoModel_.left().imageHeight() == 0 || stereoModel_.left().imageWidth() == 0)
|
||||
{
|
||||
stereoModel_.setImageSize(leftImage.size());
|
||||
}
|
||||
|
||||
data = SensorData(leftImage, rightImage, stereoModel_, this->getNextSeqID(), UTimer::now());
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user