mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Don't connect to the MainWindow
We really shouldn't need to connect to the MainWindow in order to get the right scale for the fonts when printing. While printing likely will remain a desktop only function, this is just bad design. And making calls like this from the paint() function is a bad plan, anyway. So instead we make sure that every DiveTextItem knows what the printScale was when it was created (or actually, when the text was first set as they frequently get created before we have a scene which we use to get to the profile), and gets updated whenever that scale changes. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
487ddce353
commit
64aace63f0
4 changed files with 32 additions and 3 deletions
|
@ -6,7 +6,9 @@ DiveTextItem::DiveTextItem(QGraphicsItem *parent) : QGraphicsItemGroup(parent),
|
|||
internalAlignFlags(Qt::AlignHCenter | Qt::AlignVCenter),
|
||||
textBackgroundItem(new QGraphicsPathItem(this)),
|
||||
textItem(new QGraphicsPathItem(this)),
|
||||
scale(1.0)
|
||||
printScale(1.0),
|
||||
scale(1.0),
|
||||
connected(false)
|
||||
{
|
||||
setFlag(ItemIgnoresTransformations);
|
||||
textBackgroundItem->setBrush(QBrush(getColor(TEXT_BACKGROUND)));
|
||||
|
@ -20,6 +22,11 @@ void DiveTextItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *opti
|
|||
QGraphicsItemGroup::paint(painter, option, widget);
|
||||
}
|
||||
|
||||
void DiveTextItem::fontPrintScaleUpdate(double scale)
|
||||
{
|
||||
printScale = scale;
|
||||
}
|
||||
|
||||
void DiveTextItem::setAlignment(int alignFlags)
|
||||
{
|
||||
if (alignFlags != internalAlignFlags) {
|
||||
|
@ -42,6 +49,18 @@ void DiveTextItem::setScale(double newscale)
|
|||
void DiveTextItem::setText(const QString &t)
|
||||
{
|
||||
if (internalText != t) {
|
||||
if (!connected) {
|
||||
if (scene()) {
|
||||
// by now we should be on a scene. grab the profile widget from it and setup our printScale
|
||||
// and connect to the signal that makes sure we keep track if that changes
|
||||
ProfileWidget2 *profile = qobject_cast<ProfileWidget2 *>(scene()->views().first());
|
||||
connect(profile, SIGNAL(fontPrintScaleChanged(double)), this, SLOT(fontPrintScaleUpdate(double)), Qt::UniqueConnection);
|
||||
fontPrintScaleUpdate(profile->getFontPrintScale());
|
||||
connected = true;
|
||||
} else {
|
||||
qDebug() << "called before scene was set up" << t;
|
||||
}
|
||||
}
|
||||
internalText = t;
|
||||
}
|
||||
}
|
||||
|
@ -61,11 +80,11 @@ void DiveTextItem::updateText()
|
|||
QFont fnt(qApp->font());
|
||||
if ((size = fnt.pixelSize()) > 0) {
|
||||
// set in pixels - so the scale factor may not make a difference if it's too close to 1
|
||||
size *= scale * MainWindow::instance()->graphics()->getFontPrintScale();
|
||||
size *= scale * printScale;
|
||||
fnt.setPixelSize(size);
|
||||
} else {
|
||||
size = fnt.pointSizeF();
|
||||
size *= scale * MainWindow::instance()->graphics()->getFontPrintScale();
|
||||
size *= scale * printScale;
|
||||
fnt.setPointSizeF(size);
|
||||
}
|
||||
QFontMetrics fm(fnt);
|
||||
|
|
|
@ -20,13 +20,19 @@ public:
|
|||
const QString &text();
|
||||
void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
|
||||
|
||||
private
|
||||
slots:
|
||||
void fontPrintScaleUpdate(double scale);
|
||||
|
||||
private:
|
||||
void updateText();
|
||||
int internalAlignFlags;
|
||||
QGraphicsPathItem *textBackgroundItem;
|
||||
QGraphicsPathItem *textItem;
|
||||
QString internalText;
|
||||
double printScale;
|
||||
double scale;
|
||||
bool connected;
|
||||
};
|
||||
|
||||
#endif // DIVETEXTITEM_H
|
||||
|
|
|
@ -1465,6 +1465,7 @@ void ProfileWidget2::setPrintMode(bool mode, bool grayscale)
|
|||
void ProfileWidget2::setFontPrintScale(double scale)
|
||||
{
|
||||
fontPrintScale = scale;
|
||||
emit fontPrintScaleChanged(scale);
|
||||
}
|
||||
|
||||
double ProfileWidget2::getFontPrintScale()
|
||||
|
|
|
@ -86,6 +86,9 @@ public:
|
|||
void setToolTipVisibile(bool visible);
|
||||
State currentState;
|
||||
|
||||
signals:
|
||||
void fontPrintScaleChanged(double scale);
|
||||
|
||||
public
|
||||
slots: // Necessary to call from QAction's signals.
|
||||
void settingsChanged();
|
||||
|
|
Loading…
Add table
Reference in a new issue