Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Georeferencer report issues: always include RMS error value and make the text selectable #145

Closed
wants to merge 2 commits into from
Closed

Fix Georeferencer report issues: always include RMS error value and make the text selectable #145

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ffe0cc
Georeferencer: make the text in the PDF report selectable
agiudiceandrea Nov 26, 2023
de97aab
Georeferencer: always include RMS error value in report
agiudiceandrea Nov 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 61 additions & 43 deletions src/app/georeferencer/qgsgeorefmainwindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1961,46 +1961,63 @@ bool QgsGeoreferencerMainWindow::writePDFReportFile( const QString &fileName, co
}

QGraphicsRectItem *previousItem = layoutMap;
QString parameterTitle;
if ( wldTransform )
{
QString parameterTitle = tr( "Transformation parameters" ) + QStringLiteral( " (" ) + QgsGcpTransformerInterface::methodToString( transform.transformParametrisation() ) + QStringLiteral( ")" );
parameterLabel = new QgsLayoutItemLabel( &layout );
parameterLabel->setTextFormat( titleFormat );
parameterLabel->setText( parameterTitle );
parameterLabel->adjustSizeToText();
layout.addLayoutItem( parameterLabel );
parameterLabel->attemptSetSceneRect( QRectF( leftMargin, layoutMap->rect().bottom() + layoutMap->pos().y() + 5, contentWidth, 8 ) );
parameterLabel->setFrameEnabled( false );
parameterTitle = tr( "Transformation parameters" );
}
else
{
parameterTitle = tr( "Transformation parameter" );
}
parameterTitle += QStringLiteral( " (" ) + QgsGcpTransformerInterface::methodToString( transform.transformParametrisation() ) + QStringLiteral( ")" );
parameterLabel = new QgsLayoutItemLabel( &layout );
parameterLabel->setTextFormat( titleFormat );
parameterLabel->setText( parameterTitle );
parameterLabel->adjustSizeToText();
layout.addLayoutItem( parameterLabel );
parameterLabel->attemptSetSceneRect( QRectF( leftMargin, layoutMap->rect().bottom() + layoutMap->pos().y() + 5, contentWidth, 8 ) );
parameterLabel->setFrameEnabled( false );

//calculate mean error
double meanError = 0;
calculateMeanError( meanError );
//calculate mean error
double meanError = 0;
calculateMeanError( meanError );

parameterTable = new QgsLayoutItemTextTable( &layout );
parameterTable->setHeaderTextFormat( tableHeaderFormat );
parameterTable->setContentTextFormat( tableContentFormat );
parameterTable = new QgsLayoutItemTextTable( &layout );
parameterTable->setHeaderTextFormat( tableHeaderFormat );
parameterTable->setContentTextFormat( tableContentFormat );

QgsLayoutTableColumns columns;
columns << QgsLayoutTableColumn( tr( "Translation x" ) )
<< QgsLayoutTableColumn( tr( "Translation y" ) )
<< QgsLayoutTableColumn( tr( "Scale x" ) )
<< QgsLayoutTableColumn( tr( "Scale y" ) )
<< QgsLayoutTableColumn( tr( "Rotation [degrees]" ) )
<< QgsLayoutTableColumn( tr( "Mean error [%1]" ).arg( residualUnits ) );
QgsLayoutTableColumns parameterTableColumns;
if ( wldTransform )
{
parameterTableColumns << QgsLayoutTableColumn( tr( "Translation x" ) )
<< QgsLayoutTableColumn( tr( "Translation y" ) )
<< QgsLayoutTableColumn( tr( "Scale x" ) )
<< QgsLayoutTableColumn( tr( "Scale y" ) )
<< QgsLayoutTableColumn( tr( "Rotation [degrees]" ) );
}
parameterTableColumns << QgsLayoutTableColumn( tr( "Mean error [%1]" ).arg( residualUnits ) );
parameterTable->setColumns( parameterTableColumns );

parameterTable->setColumns( columns );
QStringList row;
row << QString::number( origin.x(), 'f', 3 ) << QString::number( origin.y(), 'f', 3 ) << QString::number( scaleX ) << QString::number( scaleY ) << QString::number( rotation * 180 / M_PI ) << QString::number( meanError );
parameterTable->addRow( row );
QStringList parameterTableRow;
if ( wldTransform )
{
parameterTableRow << QString::number( origin.x(), 'f', 3 )
<< QString::number( origin.y(), 'f', 3 )
<< QString::number( scaleX )
<< QString::number( scaleY )
<< QString::number( rotation * 180 / M_PI );
}
row << QString::number( meanError );
parameterTable->addRow( parameterTableRow );

QgsLayoutFrame *tableFrame = new QgsLayoutFrame( &layout, parameterTable );
tableFrame->attemptSetSceneRect( QRectF( leftMargin, parameterLabel->rect().bottom() + parameterLabel->pos().y() + 5, contentWidth, 12 ) );
parameterTable->addFrame( tableFrame );
QgsLayoutFrame *tableFrame = new QgsLayoutFrame( &layout, parameterTable );
tableFrame->attemptSetSceneRect( QRectF( leftMargin, parameterLabel->rect().bottom() + parameterLabel->pos().y() + 5, contentWidth, 12 ) );
parameterTable->addFrame( tableFrame );

parameterTable->setGridStrokeWidth( 0.1 );
parameterTable->setGridStrokeWidth( 0.1 );

previousItem = tableFrame;
}
previousItem = tableFrame;

QgsLayoutItemLabel *residualLabel = new QgsLayoutItemLabel( &layout );
residualLabel->setTextFormat( titleFormat );
Expand All @@ -2023,18 +2040,18 @@ bool QgsGeoreferencerMainWindow::writePDFReportFile( const QString &fileName, co
gcpTable->setHeaderTextFormat( tableHeaderFormat );
gcpTable->setContentTextFormat( tableContentFormat );
gcpTable->setHeaderMode( QgsLayoutTable::AllFrames );
QgsLayoutTableColumns columns;
columns << QgsLayoutTableColumn( tr( "ID" ) )
<< QgsLayoutTableColumn( tr( "Enabled" ) )
<< QgsLayoutTableColumn( tr( "Pixel X" ) )
<< QgsLayoutTableColumn( tr( "Pixel Y" ) )
<< QgsLayoutTableColumn( tr( "Map X" ) )
<< QgsLayoutTableColumn( tr( "Map Y" ) )
<< QgsLayoutTableColumn( tr( "Res X (%1)" ).arg( residualUnits ) )
<< QgsLayoutTableColumn( tr( "Res Y (%1)" ).arg( residualUnits ) )
<< QgsLayoutTableColumn( tr( "Res Total (%1)" ).arg( residualUnits ) );

gcpTable->setColumns( columns );
QgsLayoutTableColumns gcpTableColumns;
gcpTableColumns << QgsLayoutTableColumn( tr( "ID" ) )
<< QgsLayoutTableColumn( tr( "Enabled" ) )
<< QgsLayoutTableColumn( tr( "Pixel X" ) )
<< QgsLayoutTableColumn( tr( "Pixel Y" ) )
<< QgsLayoutTableColumn( tr( "Map X" ) )
<< QgsLayoutTableColumn( tr( "Map Y" ) )
<< QgsLayoutTableColumn( tr( "Res X (%1)" ).arg( residualUnits ) )
<< QgsLayoutTableColumn( tr( "Res Y (%1)" ).arg( residualUnits ) )
<< QgsLayoutTableColumn( tr( "Res Total (%1)" ).arg( residualUnits ) );

gcpTable->setColumns( gcpTableColumns );

QgsGCPList::const_iterator gcpIt = mPoints.constBegin();
QVector< QStringList > gcpTableContents;
Expand Down Expand Up @@ -2081,6 +2098,7 @@ bool QgsGeoreferencerMainWindow::writePDFReportFile( const QString &fileName, co
QgsLayoutExporter exporter( &layout );
QgsLayoutExporter::PdfExportSettings settings;
settings.dpi = 300;
settings.textRenderFormat = Qgis::TextRenderFormat::AlwaysText;
exporter.exportToPdf( fileName, settings );

return true;
Expand Down
Loading