apoorva/greenhouse
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed https://github.com/introlab/rtabmap_ros/issues/337

Browse Source
This commit is contained in:
matlabbe 2019-09-02 20:00:54 -04:00
parent bde868d1cc
commit d661148694
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/AddObjectDialog.cpp
View File

@ -112,6 +112,7 @@ void AddObjectDialog::closeEvent(QCloseEvent* event)
if(camera_) if(camera_)
{ {
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &)));
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &, const QString &, double, const cv::Mat &, float)), this, SLOT(update(const cv::Mat &, const QString &, double, const cv::Mat &, float)));
} }
QDialog::closeEvent(event); QDialog::closeEvent(event);
} }
@ -228,6 +229,7 @@ void AddObjectDialog::setState(int state)
else else
{ {
connect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); connect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &)));
connect(camera_, SIGNAL(imageReceived(const cv::Mat &, const QString &, double, const cv::Mat &, float)), this, SLOT(update(const cv::Mat &, const QString &, double, const cv::Mat &, float)));
} }
} }
else if(state == kSelectFeatures) else if(state == kSelectFeatures)
@ -235,6 +237,7 @@ void AddObjectDialog::setState(int state)
if(camera_) if(camera_)
{ {
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &)));
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &, const QString &, double, const cv::Mat &, float)), this, SLOT(update(const cv::Mat &, const QString &, double, const cv::Mat &, float)));
camera_->pause(); camera_->pause();
} }
@ -265,6 +268,7 @@ void AddObjectDialog::setState(int state)
if(camera_) if(camera_)
{ {
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &))); disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &)), this, SLOT(update(const cv::Mat &)));
disconnect(camera_, SIGNAL(imageReceived(const cv::Mat &, const QString &, double, const cv::Mat &, float)), this, SLOT(update(const cv::Mat &, const QString &, double, const cv::Mat &, float)));
camera_->pause(); camera_->pause();
} }
@ -369,6 +373,12 @@ void AddObjectDialog::setState(int state)
} }
void AddObjectDialog::update(const cv::Mat & image) void AddObjectDialog::update(const cv::Mat & image)
{
UERROR("");
update(image, "", 0.0, cv::Mat(), 0.0);
}
void AddObjectDialog::update(const cv::Mat & image, const QString & frameId, double stamp, const cv::Mat & depth, float depthConstant)
{ {
cameraImage_ = cv::Mat(); cameraImage_ = cv::Mat();
if(!image.empty()) if(!image.empty())

1
src/AddObjectDialog.h
View File

@ -56,6 +56,7 @@ public:
private Q_SLOTS: private Q_SLOTS:
void update(const cv::Mat &); void update(const cv::Mat &);
void update(const cv::Mat &, const QString &, double, const cv::Mat &, float);
void next(); void next();
void back(); void back();
void cancel(); void cancel();