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

Added QT_NO_KEYWORDS definition to avoid conflicts between boost and qt macros

Browse Source
This commit is contained in:
matlabbe
2018-06-15 12:17:11 -04:00
parent c6d893bc98
commit dfcd7ae1a8
44 changed files with 153 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -423,7 +423,7 @@ void UPlotCurve::addValue(UPlotItem * data)
if(data)
{
this->_addValue(data);
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
}
@@ -478,7 +478,7 @@ void UPlotCurve::addValues(QVector<UPlotItem *> & data)
{
this->_addValue(data.at(i));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
@@ -488,7 +488,7 @@ void UPlotCurve::addValues(const QVector<float> & xs, const QVector<float> & ys)
{
this->_addValue(new UPlotItem(xs.at(i),ys.at(i),width));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::addValues(const QVector<float> & ys)
@@ -508,7 +508,7 @@ void UPlotCurve::addValues(const QVector<float> & ys)
}
this->_addValue(new UPlotItem(x,ys.at(i),width));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::addValues(const QVector<int> & ys)
@@ -528,7 +528,7 @@ void UPlotCurve::addValues(const QVector<int> & ys)
}
this->_addValue(new UPlotItem(x,ys.at(i),width));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::addValues(const std::vector<int> & ys)
@@ -548,7 +548,7 @@ void UPlotCurve::addValues(const std::vector<int> & ys)
}
this->_addValue(new UPlotItem(x,ys.at(i),width));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::addValues(const std::vector<float> & ys)
@@ -568,7 +568,7 @@ void UPlotCurve::addValues(const std::vector<float> & ys)
}
this->_addValue(new UPlotItem(x,ys.at(i),width));
}
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
int UPlotCurve::removeItem(int index)
@@ -911,7 +911,7 @@ void UPlotCurve::setData(const QVector<float> & x, const QVector<float> & y)
//reset minMax, this will force the plot to update the axes
this->updateMinMax();
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
else if(y.size()>0 && x.size()==0)
{
@@ -952,7 +952,7 @@ void UPlotCurve::setData(const std::vector<float> & x, const std::vector<float>
//reset minMax, this will force the plot to update the axes
this->updateMinMax();
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
else if(y.size()>0 && x.size()==0)
{
@@ -996,7 +996,7 @@ void UPlotCurve::setData(const std::vector<float> & y)
//reset minMax, this will force the plot to update the axes
this->updateMinMax();
emit dataChanged(this);
Q_EMIT dataChanged(this);
}
void UPlotCurve::getData(QVector<float> & x, QVector<float> & y) const
@@ -1459,15 +1459,15 @@ void UPlotLegendItem::contextMenuEvent(QContextMenuEvent * event)
}
else if(action == _aRemoveCurve)
{
emit legendItemRemoved(_curve);
Q_EMIT legendItemRemoved(_curve);
}
else if(action == _aMoveUp)
{
emit moveUpRequest(this);
Q_EMIT moveUpRequest(this);
}
else if(action == _aMoveDown)
{
emit moveDownRequest(this);
Q_EMIT moveDownRequest(this);
}
}
@@ -1584,7 +1584,7 @@ void UPlotLegend::removeLegendItem(const UPlotCurve * curve)
{
if(this->remove(curve))
{
emit legendItemRemoved(curve);
Q_EMIT legendItemRemoved(curve);
}
}
@@ -1611,7 +1611,7 @@ void UPlotLegend::moveUp(UPlotLegendItem * item)
hLayout->setMargin(0);
((QVBoxLayout*)this->layout())->insertLayout(index-1, hLayout);
delete layoutItem;
emit legendItemMoved(item->curve(), index-1);
Q_EMIT legendItemMoved(item->curve(), index-1);
}
}
@@ -1638,7 +1638,7 @@ void UPlotLegend::moveDown(UPlotLegendItem * item)
hLayout->setMargin(0);
((QVBoxLayout*)this->layout())->insertLayout(index+1, hLayout);
delete layoutItem;
emit legendItemMoved(item->curve(), index+1);
Q_EMIT legendItemMoved(item->curve(), index+1);
}
}
@@ -1715,7 +1715,7 @@ void UPlotLegend::redirectToggled(bool toggled)
UPlotLegendItem * item = qobject_cast<UPlotLegendItem*>(sender());
if(item)
{
emit legendItemToggled(item->curve(), _flat?!toggled:toggled);
Q_EMIT legendItemToggled(item->curve(), _flat?!toggled:toggled);
}
}
}