MERGE branch STM 325:449 into trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent c4aff5f20a
commit a2eb8bcab6
100 changed files with 76652 additions and 5164 deletions
+19 -3
View File
@@ -20,8 +20,15 @@
#ifndef CONSOLEWIDGET_H_
#define CONSOLEWIDGET_H_
#include "ui_consoleWidget.h"
#include <utilite/UEventsHandler.h>
#include <QtGui/QWidget>
#include <QtCore/QMutex>
#include <QtCore/QTimer>
#include <QtCore/QTime>
class Ui_consoleWidget;
class QMessageBox;
class QTextCursor;
namespace rtabmap {
@@ -39,12 +46,21 @@ public slots:
signals:
void msgReceived(const QString &, int);
private slots:
void flushConsole();
protected:
virtual void handleEvent(UEvent * anEvent);
private:
Ui_consoleWidget _ui;
Ui_consoleWidget * _ui;
QMessageBox * _errorMessage;
QMutex _errorMessageMutex;
QMutex _msgListMutex;
QTimer _timer;
QTime _time;
QTextCursor * _textCursor;
QList<QPair<QString, int> > _msgList;
};
}