Fixed some bugs on Windows...

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1179 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-02-25 21:07:32 +00:00
parent f4a215c5a3
commit eea38736b4
3 changed files with 7 additions and 4 deletions
+1 -1
View File
@@ -722,7 +722,7 @@ void OdometryThread::getImage(Image & image)
if(!_imageBuffer.empty()) if(!_imageBuffer.empty())
{ {
image = _imageBuffer; image = _imageBuffer;
_imageBuffer = cv::Mat(); _imageBuffer = Image();
} }
} }
_imageMutex.unlock(); _imageMutex.unlock();
+4 -1
View File
@@ -1512,7 +1512,10 @@ void MainWindow::applyPrefSettings(PreferencesDialog::PANEL_FLAGS flags)
if(flags & PreferencesDialog::kPanelCloudRendering) if(flags & PreferencesDialog::kPanelCloudRendering)
{ {
UDEBUG("Cloud rendering settings changed..."); UDEBUG("Cloud rendering settings changed...");
this->updateMapCloud(_currentPosesMap, Transform()); if(_currentPosesMap.size())
{
this->updateMapCloud(_currentPosesMap, Transform());
}
} }
if(flags & PreferencesDialog::kPanelLogging) if(flags & PreferencesDialog::kPanelLogging)
+2 -2
View File
@@ -83,7 +83,7 @@ void OdometryViewer::processData()
clouds_.insert(std::make_pair(id_, cloud)); clouds_.insert(std::make_pair(id_, cloud));
if((int)clouds_.size() > maxClouds_) while(maxClouds_>0 && (int)clouds_.size() > maxClouds_)
{ {
this->removeCloud(uFormat("cloud%d", clouds_.begin()->first)); this->removeCloud(uFormat("cloud%d", clouds_.begin()->first));
clouds_.erase(clouds_.begin()); clouds_.erase(clouds_.begin());
@@ -163,7 +163,7 @@ void OdometryViewer::handleAction(QAction * a)
else if(a == _aSetDecimation) else if(a == _aSetDecimation)
{ {
bool ok; bool ok;
int value = QInputDialog::getInt(this, tr("Set depth image decimation"), tr("Decimation (0=infinite)"), decimation_, 1, 8, 1, &ok); int value = QInputDialog::getInt(this, tr("Set depth image decimation"), tr("Decimation"), decimation_, 1, 8, 1, &ok);
if(ok) if(ok)
{ {
decimation_ = value; decimation_ = value;