Skip to content
Snippets Groups Projects
Commit 0c744c64 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Fix to src target wrong way

parent 8230c93c
No related branches found
No related tags found
1 merge request!38Implements #82 registration app
Pipeline #11584 passed
......@@ -14,15 +14,15 @@ using std::tuple;
using std::make_tuple;
Correspondances::Correspondances(Source *targ, Source *src)
Correspondances::Correspondances(Source *src, Source *targ)
: parent_(nullptr), targ_(targ), src_(src),
targ_cloud_(new PointCloud<PointXYZ>),
src_cloud_(new PointCloud<PointXYZ>), uptodate_(true) {
transform_.setIdentity();
}
Correspondances::Correspondances(Correspondances *parent, Source *targ)
: parent_(parent), targ_(targ), src_(parent_->target()),
Correspondances::Correspondances(Correspondances *parent, Source *src)
: parent_(parent), targ_(parent_->source()), src_(src),
targ_cloud_(new PointCloud<PointXYZ>),
src_cloud_(new PointCloud<PointXYZ>), uptodate_(true) {
transform_.setIdentity();
......
......@@ -26,8 +26,8 @@ namespace registration {
*/
class Correspondances {
public:
Correspondances(ftl::rgbd::Source *targ, ftl::rgbd::Source *src);
Correspondances(Correspondances *parent, ftl::rgbd::Source *targ);
Correspondances(ftl::rgbd::Source *src, ftl::rgbd::Source *targ);
Correspondances(Correspondances *parent, ftl::rgbd::Source *src);
ftl::rgbd::Source *source() { return src_; }
ftl::rgbd::Source *target() { return targ_; }
......
......@@ -174,7 +174,7 @@ void ftl::registration::manual(ftl::Configurable *root) {
if (!trgb.empty()) imshow("Target", trgb);
if (!srgb.empty()) imshow("Source", srgb);
} else {
} else if (current->source()->isReady() && current->target()->isReady()) {
current->source()->getFrames(tsrgb, tsdepth);
current->target()->getFrames(ttrgb, ttdepth);
tsrgb.copyTo(srgb);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment