mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Save / Restore the QPainter before operations.

Browse source 
I don't know if this fixes anything, but it is asked of us to
do that by the Qt docs.

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava 2014-07-17 20:18:14 -03:00 • committed by Dirk Hohndel
parent 774a785a99
commit d3c0a723b8
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-ui/modeldelegates.cpp
View file

@ -353,6 +353,7 @@ void ProfilePrintDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
const int row = index.row(); const int row = index.row();
const int col = index.column(); const int col = index.column();
painter->save();
// grid color // grid color
painter->setPen(QPen(QColor(0xff999999))); painter->setPen(QPen(QColor(0xff999999)));
// horizontal lines // horizontal lines
@ -366,6 +367,7 @@ void ProfilePrintDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
if (col == 4 || (col == 0 && row > 5)) if (col == 4 || (col == 0 && row > 5))
painter->drawLine(rect.topRight(), rect.bottomRight()); painter->drawLine(rect.topRight(), rect.bottomRight());
} }
painter->restore();
QStyledItemDelegate::paint(painter, option, index); QStyledItemDelegate::paint(painter, option, index);
} }

10
qt-ui/profile/diveprofileitem.cpp
View file

@ -120,6 +120,7 @@ void DiveProfileItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
if (polygon().isEmpty()) if (polygon().isEmpty())
return; return;
painter->save();
// This paints the Polygon + Background. I'm setting the pen to QPen() so we don't get a black line here, // This paints the Polygon + Background. I'm setting the pen to QPen() so we don't get a black line here,
// after all we need to plot the correct velocities colors later. // after all we need to plot the correct velocities colors later.
setPen(Qt::NoPen); setPen(Qt::NoPen);
@ -138,6 +139,7 @@ void DiveProfileItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *o
painter->setPen(pen); painter->setPen(pen);
painter->drawLine(poly[i - 1], poly[i]); painter->drawLine(poly[i - 1], poly[i]);
} }
painter->restore();
} }
int DiveProfileItem::maxCeiling(int row) int DiveProfileItem::maxCeiling(int row)
@ -325,8 +327,10 @@ void DiveHeartrateItem::paint(QPainter *painter, const QStyleOptionGraphicsItem
{ {
if (polygon().isEmpty()) if (polygon().isEmpty())
return; return;
painter->save();
painter->setPen(pen()); painter->setPen(pen());
painter->drawPolyline(polygon()); painter->drawPolyline(polygon());
painter->restore();
} }
void DiveHeartrateItem::settingsChanged() void DiveHeartrateItem::settingsChanged()
@ -421,8 +425,10 @@ void DiveTemperatureItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
{ {
if (polygon().isEmpty()) if (polygon().isEmpty())
return; return;
painter->save();
painter->setPen(pen()); painter->setPen(pen());
painter->drawPolyline(polygon()); painter->drawPolyline(polygon());
painter->restore();
} }
void DiveGasPressureItem::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight) void DiveGasPressureItem::modelDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
@ -516,6 +522,7 @@ void DiveGasPressureItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
QPen pen; QPen pen;
pen.setCosmetic(true); pen.setCosmetic(true);
pen.setWidth(2); pen.setWidth(2);
painter->save();
struct plot_data *entry = dataModel->data().entry; struct plot_data *entry = dataModel->data().entry;
Q_FOREACH (const QPolygonF &poly, polygons) { Q_FOREACH (const QPolygonF &poly, polygons) {
for (int i = 1, count = poly.count(); i < count; i++, entry++) { for (int i = 1, count = poly.count(); i < count; i++, entry++) {
@ -524,6 +531,7 @@ void DiveGasPressureItem::paint(QPainter *painter, const QStyleOptionGraphicsIte
painter->drawLine(poly[i - 1], poly[i]); painter->drawLine(poly[i - 1], poly[i]);
} }
} }
painter->restore();
} }
DiveCalculatedCeiling::DiveCalculatedCeiling() : is3mIncrement(false), gradientFactor(new DiveTextItem(this)) DiveCalculatedCeiling::DiveCalculatedCeiling() : is3mIncrement(false), gradientFactor(new DiveTextItem(this))
@ -711,6 +719,7 @@ void PartialPressureGasItem::modelDataChanged(const QModelIndex &topLeft, const
void PartialPressureGasItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) void PartialPressureGasItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
{ {
const qreal pWidth = 0.0; const qreal pWidth = 0.0;
painter->save();
painter->setPen(QPen(normalColor, pWidth)); painter->setPen(QPen(normalColor, pWidth));
painter->drawPolyline(polygon()); painter->drawPolyline(polygon());
@ -718,6 +727,7 @@ void PartialPressureGasItem::paint(QPainter *painter, const QStyleOptionGraphics
painter->setPen(QPen(alertColor, pWidth)); painter->setPen(QPen(alertColor, pWidth));
Q_FOREACH (const QPolygonF &poly, alertPolygons) Q_FOREACH (const QPolygonF &poly, alertPolygons)
painter->drawPolyline(poly); painter->drawPolyline(poly);
painter->restore();
} }
void PartialPressureGasItem::setThreshouldSettingsKey(const QString &threshouldSettingsKey) void PartialPressureGasItem::setThreshouldSettingsKey(const QString &threshouldSettingsKey)