Skip to content

Commit 001c7ac

Browse files
author
mhugent
committedMay 10, 2010
Changed georef pdf report layout and font sizes to address bug #2698
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13456 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 1fd13e8 commit 001c7ac

File tree

2 files changed

+25
-8
lines changed

2 files changed

+25
-8
lines changed
 

‎src/plugins/georeferencer/qgsgeorefplugingui.cpp

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1191,16 +1191,26 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
11911191
composition->setPrintResolution( 300 );
11921192
printer.setPaperSize( QSizeF( composition->paperWidth(), composition->paperHeight() ), QPrinter::Millimeter );
11931193

1194+
QFont titleFont;
1195+
titleFont.setPointSize( 9 );
1196+
titleFont.setBold( true );
1197+
QFont tableHeaderFont;
1198+
tableHeaderFont.setPointSize( 9 );
1199+
tableHeaderFont.setBold( true );
1200+
QFont tableContentFont;
1201+
tableContentFont.setPointSize( 9 );
1202+
11941203
//title
11951204
QFileInfo rasterFi( mRasterFileName );
11961205
QgsComposerLabel* titleLabel = new QgsComposerLabel( composition );
1206+
titleLabel->setFont( titleFont );
11971207
titleLabel->setText( rasterFi.fileName() );
11981208
composition->addItem( titleLabel );
1199-
titleLabel->setSceneRect( QRectF( 10, 5, composition->paperWidth(), 8 ) );
1209+
titleLabel->setSceneRect( QRectF( 2, 5, composition->paperWidth(), 8 ) );
12001210
titleLabel->setFrame( false );
12011211

12021212
//composer map
1203-
QgsComposerMap* composerMap = new QgsComposerMap( composition, 10, titleLabel->rect().bottom() + titleLabel->transform().dy(), 190, 277 );
1213+
QgsComposerMap* composerMap = new QgsComposerMap( composition, 2, titleLabel->rect().bottom() + titleLabel->transform().dy(), 206, 277 );
12041214
composerMap->setLayerSet( canvasRenderer->layerSet() );
12051215
composerMap->setNewExtent( mCanvas->extent() );
12061216
composerMap->setMapCanvas( mCanvas );
@@ -1228,10 +1238,11 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
12281238
if ( wldTransform )
12291239
{
12301240
parameterLabel = new QgsComposerLabel( composition );
1241+
parameterLabel->setFont( titleFont );
12311242
parameterLabel->setText( tr( "Transformation parameters" ) );
12321243
parameterLabel->adjustSizeToText();
12331244
composition->addItem( parameterLabel );
1234-
parameterLabel->setSceneRect( QRectF( 10, composerMap->rect().bottom() + composerMap->transform().dy() + 5, composition->paperWidth(), 8 ) );
1245+
parameterLabel->setSceneRect( QRectF( 2, composerMap->rect().bottom() + composerMap->transform().dy() + 5, composition->paperWidth(), 8 ) );
12351246
parameterLabel->setFrame( false );
12361247

12371248
//calculate mean error (in map units)
@@ -1264,14 +1275,16 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
12641275

12651276

12661277
parameterTable = new QgsComposerTextTable( composition );
1278+
parameterTable->setHeaderFont( tableHeaderFont );
1279+
parameterTable->setContentFont( tableContentFont );
12671280
QStringList headers;
12681281
headers << tr( "Translation x" ) << tr( "Translation y" ) << tr( "Scale x" ) << tr( "Scale y" ) << tr( "Rotation [degrees]" ) << tr( "Mean error [map units]" );
12691282
parameterTable->setHeaderLabels( headers );
12701283
QStringList row;
12711284
row << QString::number( origin.x() ) << QString::number( origin.y() ) << QString::number( scaleX ) << QString::number( scaleY ) << QString::number( rotation * 180 / M_PI ) << QString::number( meanError );
12721285
parameterTable->addRow( row );
12731286
composition->addItem( parameterTable );
1274-
parameterTable->setSceneRect( QRectF( 10, parameterLabel->rect().bottom() + parameterLabel->transform().dy() + 5, 50, 20 ) );
1287+
parameterTable->setSceneRect( QRectF( 2, parameterLabel->rect().bottom() + parameterLabel->transform().dy() + 5, 50, 20 ) );
12751288
parameterTable->setGridStrokeWidth( 0.1 );
12761289
parameterTable->adjustFrameToSize();
12771290
}
@@ -1283,15 +1296,16 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
12831296
}
12841297

12851298
QgsComposerLabel* residualLabel = new QgsComposerLabel( composition );
1299+
residualLabel->setFont( titleFont );
12861300
residualLabel->setText( tr( "Residuals" ) );
12871301
composition->addItem( residualLabel );
1288-
residualLabel->setSceneRect( QRectF( 10, previousItem->rect().bottom() + previousItem->transform().dy() + 5, composition->paperWidth(), 6 ) );
1302+
residualLabel->setSceneRect( QRectF( 2, previousItem->rect().bottom() + previousItem->transform().dy() + 5, composition->paperWidth(), 6 ) );
12891303
residualLabel->setFrame( false );
12901304

12911305
//residual plot
12921306
QgsResidualPlotItem* resPlotItem = new QgsResidualPlotItem( composition );
12931307
composition->addItem( resPlotItem );
1294-
resPlotItem->setSceneRect( QRectF( 10, residualLabel->rect().bottom() + residualLabel->transform().dy() + 5, composerMap->rect().width(), composerMap->rect().height() ) );
1308+
resPlotItem->setSceneRect( QRectF( 2, residualLabel->rect().bottom() + residualLabel->transform().dy() + 5, composerMap->rect().width(), composerMap->rect().height() ) );
12951309
resPlotItem->setExtent( composerMap->extent() );
12961310
resPlotItem->setGCPList( mPoints );
12971311

@@ -1315,8 +1329,10 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
13151329
residualUnits = tr( "pixels" );
13161330
}
13171331
QgsComposerTextTable* gcpTable = new QgsComposerTextTable( composition );
1332+
gcpTable->setHeaderFont( tableHeaderFont );
1333+
gcpTable->setContentFont( tableContentFont );
13181334
QStringList gcpHeader;
1319-
gcpHeader << "id" << "enabled" << "pixelCoordX" << "pixelCoordY" << "mapCoordX" << "mapCoordY" << "resX[" + residualUnits + "]" << "resY[" + residualUnits + "]" << "resTot[" + residualUnits + "]";
1335+
gcpHeader << "id" << "enabled" << "pixelX" << "pixelY" << "mapX" << "mapY" << "resX[" + residualUnits + "]" << "resY[" + residualUnits + "]" << "resTot[" + residualUnits + "]";
13201336
gcpTable->setHeaderLabels( gcpHeader );
13211337

13221338
QgsGCPList::const_iterator gcpIt = mPoints.constBegin();
@@ -1352,7 +1368,7 @@ bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsG
13521368

13531369
composition->addItem( gcpTable );
13541370

1355-
gcpTable->setSceneRect( QRectF( 10, resPlotItem->rect().bottom() + resPlotItem->transform().dy() + 5, 170, 100 ) );
1371+
gcpTable->setSceneRect( QRectF( 2, resPlotItem->rect().bottom() + resPlotItem->transform().dy() + 5, 170, 100 ) );
13561372
gcpTable->setGridStrokeWidth( 0.1 );
13571373

13581374
printer.setResolution( composition->printResolution() );

‎src/plugins/georeferencer/qgsresidualplotitem.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ void QgsResidualPlotItem::paint( QPainter* painter, const QStyleOptionGraphicsIt
111111
painter->drawLine( QPointF( 5, rect().height() - 5 ), QPointF( 5, rect().height() - 7 ) );
112112
painter->drawLine( QPointF( 5 + scaleBarWidth, rect().height() - 5 ), QPointF( 5 + scaleBarWidth, rect().height() - 7 ) );
113113
QFont scaleBarFont;
114+
scaleBarFont.setPointSize( 9 );
114115
if ( mConvertScaleToMapUnits )
115116
{
116117
drawText( painter, 5, rect().height() - 4 + fontAscentMillimeters( scaleBarFont ), QString( "%1 map units" ).arg( nUnits ), QFont() );

0 commit comments

Comments
 (0)
Please sign in to comment.