i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Qt6 compatibility (#968)

Browse Source 
* Qt6 Compilation success

* Fixed qt5 backward compatibility

* Fixed build for qt<=5.9 (bionic)

* Added docker file for easy testing with latest Qt/VTK/PCL/OpenCV

* Fixed cmake for qt
This commit is contained in:
matlabbe
2023-03-05 16:34:56 -08:00
committed by GitHub
parent 98635ae33d
commit 8c5c4f63bf
29 changed files with 254 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
guilib/include/rtabmap/gui/ConsoleWidget.h
View File

@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <QtCore/QMutex>
#include <QtCore/QTimer>
#include <QtCore/QTime>
#include <QtCore/QElapsedTimer>
class Ui_consoleWidget;
class QMessageBox;
@@ -69,7 +70,7 @@ private:
QMutex _errorMessageMutex;
QMutex _msgListMutex;
QTimer _timer;
QTime _time;
QElapsedTimer _time;
QTextCursor * _textCursor;
QList<QPair<QString, int> > _msgList;
};

5
guilib/include/rtabmap/gui/MainWindow.h
View File

@@ -33,6 +33,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap/utilite/UEventsHandler.h"
#include <QMainWindow>
#include <QtCore/QSet>
#include <QElapsedTimer>
#include "rtabmap/core/RtabmapEvent.h"
#include "rtabmap/core/SensorData.h"
#include "rtabmap/core/OdometryEvent.h"
@@ -400,8 +401,8 @@ private:
bool _processingOdometry;
QTimer * _oneSecondTimer;
QTime * _elapsedTime;
QTime * _logEventTime;
QElapsedTimer * _elapsedTime;
QElapsedTimer * _logEventTime;
PdfPlotCurve * _posteriorCurve;
PdfPlotCurve * _likelihoodCurve;

2
guilib/include/rtabmap/gui/ProgressDialog.h
View File

@@ -45,7 +45,7 @@ class RTABMAP_GUI_EXPORT ProgressDialog : public QDialog
Q_OBJECT
public:
ProgressDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
ProgressDialog(QWidget *parent = 0, Qt::WindowFlags flags = Qt::WindowFlags());
virtual ~ProgressDialog();
void setEndMessage(const QString & message) {_endMessage = message;} // Message shown when the progress is finished

5
guilib/include/rtabmap/utilite/UPlot.h
View File

@@ -32,6 +32,7 @@
#include <QLabel>
#include <QPushButton>
#include <QtCore/QTime>
#include <QtCore/QElapsedTimer>
class QGraphicsView;
class QGraphicsScene;
@@ -602,9 +603,9 @@ private:
UOrientableLabel * _yLabel;
QLabel * _refreshRate;
QString _workingDirectory;
QTime _refreshIntervalTime;
QElapsedTimer _refreshIntervalTime;
int _lowestRefreshRate;
QTime _refreshStartTime;
QElapsedTimer _refreshStartTime;
QString _autoScreenCaptureFormat;
QPoint _mousePressedPos;
QPoint _mouseCurrentPos;