Navigation Menu

Skip to content

Commit

Permalink
Implemented a hack to work around the Qt font bug for composer labels.
Browse files Browse the repository at this point in the history 
It doesn't fix composer map labels or the composer legend text yet.


git-svn-id: http://svn.osgeo.org/qgis/trunk@7364 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
StevenB authored and StevenB committed Nov 10, 2007
1 parent 122259d commit fd7bf2d
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 33 deletions.
61 changes: 31 additions & 30 deletions src/app/composer/qgscomposerlabel.cpp
View file
Expand Up @@ -31,7 +31,7 @@ QgsComposerLabel::QgsComposerLabel ( QgsComposition *composition, int id,
{
setupUi(this);

std::cout << "QgsComposerLabel::QgsComposerLabel()" << std::endl;
//std::cout << "QgsComposerLabel::QgsComposerLabel()" << std::endl;

mComposition = composition;
mId = id;
Expand All @@ -55,7 +55,6 @@ QgsComposerLabel::QgsComposerLabel ( QgsComposition *composition, int id,
mComposition->canvas()->addItem(this);

QAbstractGraphicsShapeItem::setZValue(100);
//setActive(true); //no equivalent
QAbstractGraphicsShapeItem::show();
QAbstractGraphicsShapeItem::update();

Expand All @@ -65,7 +64,7 @@ QgsComposerLabel::QgsComposerLabel ( QgsComposition *composition, int id,
QgsComposerLabel::QgsComposerLabel ( QgsComposition *composition, int id )
: QAbstractGraphicsShapeItem(0)
{
std::cout << "QgsComposerLabel::QgsComposerLabel()" << std::endl;
//std::cout << "QgsComposerLabel::QgsComposerLabel()" << std::endl;

setupUi(this);

Expand All @@ -80,43 +79,32 @@ QgsComposerLabel::QgsComposerLabel ( QgsComposition *composition, int id )
// Add to canvas
mComposition->canvas()->addItem(this);
QAbstractGraphicsShapeItem::setZValue(100);
//setActive(true);//no equivalent
QAbstractGraphicsShapeItem::show();
QAbstractGraphicsShapeItem::update();

}

QgsComposerLabel::~QgsComposerLabel()
{
std::cout << "QgsComposerLabel::~QgsComposerLabel" << std::endl;
//std::cout << "QgsComposerLabel::~QgsComposerLabel" << std::endl;
QGraphicsItem::hide();
}
/*
void QgsComposerLabel::drawShape ( QPainter & painter, const QStyleOptionGraphicsItem* item, QWidget* pWidget)
{
std::cout << "QgsComposerLabel::drawShape" << std::endl;
paint ( painter, item, pWidget );
}
*/

#define FONT_WORKAROUND_SCALE 10
void QgsComposerLabel::paint ( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget )
{
std::cout << "QgsComposerLabel::paint" << std::endl;
//std::cout << "QgsComposerLabel::paint" << std::endl;

float size = 25.4 * mComposition->scale() * mFont.pointSizeFloat() / 72;
mBoxBuffer = (int) ( size / 10 * mComposition->scale() );
//mBoxBuffer = size / 10 * mComposition->scale();
mBoxBuffer = 1;


QFont font ( mFont );
font.setPointSizeFloat ( size );
QFontMetricsF metrics ( font );

// Not sure about Style Strategy, QFont::PreferMatch ?
//font.setStyleStrategy ( (QFont::StyleStrategy) (QFont::PreferOutline | QFont::PreferAntialias ) );

painter->setPen ( mPen );
painter->setFont ( font );

double w = metrics.width ( mText );
double h = metrics.height() - metrics.descent();
Expand All @@ -126,28 +114,41 @@ void QgsComposerLabel::paint ( QPainter* painter, const QStyleOptionGraphicsItem
QRectF boxRect;
if ( mBox ) {
//I don't know why the top coordinate is -h rather than -(h+mBoxBuffer), but it seems to work better.
boxRect.setRect(-mBoxBuffer, -h, w + (2 * mBoxBuffer), h + (2 * mBoxBuffer));
boxRect.setRect(-mBoxBuffer, -h, w + (mBoxBuffer * 2), h + (mBoxBuffer * 2));
QBrush brush ( QColor(255,255,255) );
painter->setBrush ( brush );
painter->setPen(QPen(QColor(0, 0, 0), .2));
painter->drawRect ( boxRect );
}
painter->setPen ( mPen );


/*This code doesn't do anything...?
// The width is not sufficient in postscript
QRectF tr = r;
tr.setWidth ( r.width() );
*/

font.setPointSizeFloat ( size * FONT_WORKAROUND_SCALE ); //Hack to work around Qt font bug
painter->setFont ( font );
painter->setPen ( mPen );

if ( plotStyle() == QgsComposition::Postscript )
{
// This metrics.ascent() is empirical
size = metrics.ascent() * 72.0 / mComposition->resolution();
size = metrics.ascent() * 72.0 / mComposition->resolution() * FONT_WORKAROUND_SCALE;
font.setPointSizeF ( size );
painter->setFont ( font );
std::cout << "label using PS render size" << std::endl;
}
//std::cout << "label using PS render size" << std::endl;
}

//Hack to work around the Qt font bug
painter->save();
painter->scale(1./FONT_WORKAROUND_SCALE, 1./FONT_WORKAROUND_SCALE);

painter->drawText(0, 0, mText);

painter->restore(); //undo our scaling of painter - End of the font workaround

// Show selected / Highlight
if ( mSelected && plotStyle() == QgsComposition::Preview ) {
QRectF hr;
Expand Down Expand Up @@ -202,10 +203,10 @@ QRectF QgsComposerLabel::boundingRect ( void ) const

QFont font ( mFont );
font.setPointSizeFloat ( size );
QFontMetrics metrics ( font );
QFontMetricsF metrics ( font );

int w = metrics.width ( mText );
int h = metrics.height() - metrics.descent();
double w = metrics.width ( mText );
double h = metrics.height() - metrics.descent();

/*
int buf = 0;
Expand All @@ -217,11 +218,11 @@ QRectF QgsComposerLabel::boundingRect ( void ) const
QRectF r ( (int)(x - w/2 - 1.5*buf), (int) (y - h/2 - buf), (int)(w+3*buf), h+2*buf );
*/

QRectF r;
QRectF r;

if(mBox){
//what happens if we haven't called paint() first?
r.setRect(-mBoxBuffer, -h, w + (2 * mBoxBuffer), h + (2 * mBoxBuffer));
r.setRect(-mBoxBuffer, -h, w + (mBoxBuffer * 2), h + (mBoxBuffer * 2));
}
else{
r.setRect(0, -h, w, h);
Expand All @@ -233,7 +234,7 @@ QRectF r;

QPolygonF QgsComposerLabel::areaPoints() const
{
std::cout << "QgsComposerLabel::areaPoints" << std::endl;
//std::cout << "QgsComposerLabel::areaPoints" << std::endl;
QRectF r = boundingRect();

QPolygonF pa;
Expand Down Expand Up @@ -263,7 +264,7 @@ void QgsComposerLabel::on_mTextLineEdit_returnPressed()

void QgsComposerLabel::setSelected ( bool s )
{
std::cout << "QgsComposerLabel::setSelected" << std::endl;
//std::cout << "QgsComposerLabel::setSelected" << std::endl;
mSelected = s;
QAbstractGraphicsShapeItem::update(); // show highlight

Expand Down
6 changes: 3 additions & 3 deletions src/app/composer/qgscomposerlabel.h
View file
Expand Up @@ -68,7 +68,6 @@ class QgsComposerLabel : public QWidget, private Ui::QgsComposerLabelBase, publi
/** \brief Reimplementation of QGraphicsItem::paint() - draw on canvas */
void paint ( QPainter*, const QStyleOptionGraphicsItem*, QWidget* );

// void drawShape(QPainter&, const QStyleOptionGraphicsItem*, QWidget*);
QPolygonF areaPoints() const;

/** \brief Set values in GUI to current values */
Expand Down Expand Up @@ -102,13 +101,14 @@ public slots:
int mMargin;

// Current bounding box
QRect mBoundingRect;
// Not used - would it be more effecient if paint() updated the bounding box, and boundingRect returned this?
//QRect mBoundingRect;

// Draw box around the label
bool mBox;

// Box buffer
int mBoxBuffer;
double mBoxBuffer;
};

#endif

0 comments on commit fd7bf2d

Please sign in to comment.