i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-03 10:00:23 +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

58
guilib/src/utilite/UPlot.cpp
View File

@@ -37,6 +37,7 @@
#include <QLabel>
#include <QMenu>
#include <QStyle>
#include <QActionGroup>
#include <QInputDialog>
#include <QMessageBox>
#include <QFileDialog>
@@ -788,28 +789,44 @@ void UPlotCurve::draw(QPainter * painter, const QRect & limits)
{
QPointF intersection;
QLineF::IntersectType type;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection);
#else
type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.bottomLeft()), &intersection);
#endif
if(type == QLineF::BoundedIntersection)
{
!limits.contains(line.p1())?line.setP1(intersection.toPoint()):line.setP2(intersection.toPoint());
}
else
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
type = lineItem->line().intersects(QLineF(limits.topLeft(), limits.topRight()), &intersection);
#else
type = lineItem->line().intersect(QLineF(limits.topLeft(), limits.topRight()), &intersection);
#endif
if(type == QLineF::BoundedIntersection)
{
!limits.contains(line.p1())?line.setP1(intersection.toPoint()):line.setP2(intersection.toPoint());
}
else
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
type = lineItem->line().intersects(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection);
#else
type = lineItem->line().intersect(QLineF(limits.bottomLeft(), limits.bottomRight()), &intersection);
#endif
if(type == QLineF::BoundedIntersection)
{
!limits.contains(line.p1())?line.setP1(intersection.toPoint()):line.setP2(intersection.toPoint());
}
else
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
type = lineItem->line().intersects(QLineF(limits.topRight(), limits.bottomRight()), &intersection);
#else
type = lineItem->line().intersect(QLineF(limits.topRight(), limits.bottomRight()), &intersection);
#endif
if(type == QLineF::BoundedIntersection)
{
!limits.contains(line.p1())?line.setP1(intersection.toPoint()):line.setP2(intersection.toPoint());
@@ -968,7 +985,7 @@ void UPlotCurve::setData(const std::vector<qreal> & x, const std::vector<qreal>
void UPlotCurve::setData(const QVector<qreal> & y)
{
this->setData(y.toStdVector());
this->setData(std::vector<qreal>(y.begin(), y.end()));
}
void UPlotCurve::setData(const std::vector<qreal> & y)
@@ -1194,8 +1211,13 @@ void UPlotAxis::setAxis(qreal & min, qreal & max)
}
else
{
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
borderMin = this->fontMetrics().horizontalAdvance(QString::number(_min,'g',_gradMaxDigits))/2;
borderMax = this->fontMetrics().horizontalAdvance(QString::number(_max,'g',_gradMaxDigits))/2;
#else
borderMin = this->fontMetrics().width(QString::number(_min,'g',_gradMaxDigits))/2;
borderMax = this->fontMetrics().width(QString::number(_max,'g',_gradMaxDigits))/2;
#endif
}
int border = borderMin>borderMax?borderMin:borderMax;
int borderDelta;
@@ -1303,10 +1325,18 @@ void UPlotAxis::setAxis(qreal & min, qreal & max)
for (int i = 0; i <= _count; i+=5)
{
QString n(QString::number(_min + (i/5)*((_max-_min)/(_count/5)),'g',_gradMaxDigits));
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
if(this->fontMetrics().horizontalAdvance(n) > minWidth)
{
minWidth = this->fontMetrics().horizontalAdvance(n);
}
#else
if(this->fontMetrics().width(n) > minWidth)
{
minWidth = this->fontMetrics().width(n);
}
#endif
}
this->setMinimumWidth(15+minWidth);
}
@@ -1592,7 +1622,7 @@ void UPlotLegend::addItem(UPlotCurve * curve)
QHBoxLayout * hLayout = new QHBoxLayout();
hLayout->addWidget(legendItem);
hLayout->addStretch(0);
hLayout->setMargin(0);
hLayout->setContentsMargins(0,0,0,0);
// add to the legend
((QVBoxLayout*)_contentLayout)->insertLayout(_contentLayout->count()-1, hLayout);
@@ -1644,7 +1674,7 @@ void UPlotLegend::moveUp(UPlotLegendItem * item)
QHBoxLayout * hLayout = new QHBoxLayout();
hLayout->addWidget(layoutItem->layout()->itemAt(0)->widget());
hLayout->addStretch(0);
hLayout->setMargin(0);
hLayout->setContentsMargins(0,0,0,0);
((QVBoxLayout*)_contentLayout)->insertLayout(index-1, hLayout);
delete layoutItem;
Q_EMIT legendItemMoved(item->curve(), index-1);
@@ -1671,7 +1701,7 @@ void UPlotLegend::moveDown(UPlotLegendItem * item)
QHBoxLayout * hLayout = new QHBoxLayout();
hLayout->addWidget(layoutItem->layout()->itemAt(0)->widget());
hLayout->addStretch(0);
hLayout->setMargin(0);
hLayout->setContentsMargins(0,0,0,0);
((QVBoxLayout*)_contentLayout)->insertLayout(index+1, hLayout);
delete layoutItem;
Q_EMIT legendItemMoved(item->curve(), index+1);
@@ -1694,7 +1724,7 @@ QString UPlotLegend::getAllCurveDataAsText() const
xAxisMap.insert(iter.key(), iter.value());
}
}
QList<qreal> xAxis = xAxisMap.uniqueKeys();
QList<qreal> xAxis = xAxisMap.keys();
QVector<QVector<qreal> > axes;
for(int i=0; i<items.size(); ++i)
@@ -2585,7 +2615,11 @@ void UPlot::mouseMoveEvent(QMouseEvent * event)
if((QApplication::mouseButtons() & Qt::LeftButton) ||
(_aMouseTracking->isChecked() && xPos>=0 && yPos>=0 && xPos<_graphicsViewHolder->width() && yPos<_graphicsViewHolder->height()))
{
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
QToolTip::showText(event->globalPosition().toPoint(), QString("%1,%2").arg(x).arg(y));
#else
QToolTip::showText(event->globalPos(), QString("%1,%2").arg(x).arg(y));
#endif
}
else
{
@@ -2831,8 +2865,8 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)
QPalette p(palette());
// Set background color to white
QColor c = p.color(QPalette::Background);
p.setColor(QPalette::Background, Qt::white);
QColor c = p.color(QPalette::Window);
p.setColor(QPalette::Window, Qt::white);
setPalette(p);
#ifdef QT_SVG_LIB
@@ -2858,14 +2892,14 @@ void UPlot::contextMenuEvent(QContextMenuEvent * event)
}
else
{
QPixmap figure = QPixmap::grabWidget(this);
QPixmap figure = this->grab();
figure.save(text);
}
#ifdef QT_SVG_LIB
}
#endif
// revert background color
p.setColor(QPalette::Background, c);
p.setColor(QPalette::Window, c);
setPalette(p);
if(flatModified)
@@ -2923,7 +2957,7 @@ void UPlot::captureScreen()
}
targetDir += "/";
QString name = (QDateTime::currentDateTime().toString("yyMMddhhmmsszzz") + ".") + _autoScreenCaptureFormat;
QPixmap figure = QPixmap::grabWidget(this);
QPixmap figure = this->grab();
figure.save(targetDir + name);
}
@@ -3181,7 +3215,7 @@ void UPlot::removeCurves()
void UPlot::removeCurve(const UPlotCurve * curve)
{
QList<UPlotCurve *>::iterator iter = qFind(_curves.begin(), _curves.end(), curve);
QList<UPlotCurve *>::iterator iter = std::find(_curves.begin(), _curves.end(), curve);
#if PRINT_DEBUG
ULOGGER_DEBUG("Plot=\"%s\" removing curve=\"%s\"", this->objectName().toStdString().c_str(), curve?curve->name().toStdString().c_str():"");
#endif
@@ -3215,7 +3249,7 @@ void UPlot::removeCurve(const UPlotCurve * curve)
void UPlot::showCurve(const UPlotCurve * curve, bool shown)
{
QList<UPlotCurve *>::iterator iter = qFind(_curves.begin(), _curves.end(), curve);
QList<UPlotCurve *>::iterator iter = std::find(_curves.begin(), _curves.end(), curve);
if(iter!=_curves.end())
{
UPlotCurve * value = *iter;