mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-30 22:20:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

profilewidget2: fix line width when printing on OSX and Linux

Browse source 
On OSX and Linux only, the cosmetic width of the QPen
on profile axes does not work and is weirdly dependent on the
fact if a printer is installed or not. Possible Qt bugs at hand.

The same is not present on Win32.

To solve the issues we add setPrintMode() in DiveCartesianAxis
and call it for all instances of the class in ProfileWidget2.

This patch also moves gridPen() as a private member function
of PartialGasPressureAxis as it now needs to access member
variables.

Fixes #943

Reported-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Lubomir I. Ivanov 2015-10-11 14:21:14 +03:00 committed by Dirk Hohndel
parent 11e38710e4
commit d0d83d5d7d
3 changed files with 35 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
qt-ui/profile/divecartesianaxis.cpp
View file

@ -8,11 +8,14 @@
#include "divelineitem.h"
#include "profilewidget2.h"
static QPen gridPen()
QPen DiveCartesianAxis::gridPen()
{
QPen pen;
pen.setColor(getColor(TIME_GRID));
pen.setWidth(2);
/* cosmetic width() == 0 for lines in printMode
* having setCosmetic(true) and width() > 0 does not work when
* printing on OSX and Linux */
pen.setWidth(DiveCartesianAxis::printMode ? 0 : 2);
pen.setCosmetic(true);
return pen;
}
@ -33,6 +36,18 @@ void DiveCartesianAxis::setFontLabelScale(qreal scale)
changed = true;
}
void DiveCartesianAxis::setPrintMode(bool mode)
{
printMode = mode;
// update the QPen of all lines depending on printMode
QPen newPen = gridPen();
QColor oldColor = pen().brush().color();
newPen.setBrush(oldColor);
setPen(newPen);
Q_FOREACH (DiveLineItem *item, lines)
item->setPen(pen());
}
void DiveCartesianAxis::setMaximum(double maximum)
{
if (IS_FP_SAME(max, maximum))
@ -57,6 +72,7 @@ void DiveCartesianAxis::setTextColor(const QColor &color)
DiveCartesianAxis::DiveCartesianAxis() : QObject(),
QGraphicsLineItem(),
printMode(false),
unitSystem(0),
orientation(LeftToRight),
min(0),
@ -220,10 +236,8 @@ void DiveCartesianAxis::updateTicks(color_indice_t color)
childPos = begin - i * stepSize;
}
DiveLineItem *line = new DiveLineItem(this);
QPen pen;
QPen pen = gridPen();
pen.setBrush(getColor(color));
pen.setCosmetic(true);
pen.setWidthF(2);
line->setPen(pen);
line->setZValue(0);
lines.push_back(line);
@ -340,11 +354,10 @@ double DiveCartesianAxis::fontLabelScale() const
void DiveCartesianAxis::setColor(const QColor &color)
{
QPen defaultPen(color);
QPen defaultPen = gridPen();
defaultPen.setColor(color);
defaultPen.setJoinStyle(Qt::RoundJoin);
defaultPen.setCapStyle(Qt::RoundCap);
defaultPen.setWidth(2);
defaultPen.setCosmetic(true);
setPen(defaultPen);
}

4
qt-ui/profile/divecartesianaxis.h
View file

@ -16,6 +16,9 @@ class DiveCartesianAxis : public QObject, public QGraphicsLineItem {
Q_PROPERTY(QPointF pos WRITE setPos READ pos)
Q_PROPERTY(qreal x WRITE setX READ x)
Q_PROPERTY(qreal y WRITE setY READ y)
private:
bool printMode;
QPen gridPen();
public:
enum Orientation {
TopToBottom,
@ -25,6 +28,7 @@ public:
};
DiveCartesianAxis();
virtual ~DiveCartesianAxis();
void setPrintMode(bool mode);
void setMinimum(double minimum);
void setMaximum(double maximum);
void setTickInterval(double interval);

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

@ -1479,6 +1479,16 @@ void ProfileWidget2::setPrintMode(bool mode, bool grayscale)
{
printMode = mode;
resetZoom();
// set printMode for axes
profileYAxis->setPrintMode(mode);
gasYAxis->setPrintMode(mode);
temperatureAxis->setPrintMode(mode);
timeAxis->setPrintMode(mode);
cylinderPressureAxis->setPrintMode(mode);
heartBeatAxis->setPrintMode(mode);
percentageAxis->setPrintMode(mode);
isGrayscale = mode ? grayscale : false;
mouseFollowerHorizontal->setVisible(!mode);
mouseFollowerVertical->setVisible(!mode);