georeferencer.diff
| src/plugins/georeferencer/qgsresidualplotitem.cpp (working copy) | ||
|---|---|---|
| 44 | 44 |
double widthMM = rect().width(); |
| 45 | 45 |
double heightMM = rect().height(); |
| 46 | 46 | |
| 47 |
QPen enabledPen( QColor( 0, 0, 255, 255 ) ); |
|
| 48 |
enabledPen.setWidthF( 0.4 ); |
|
| 49 |
QPen disabledPen( QColor( 0, 0, 255, 127 ) ); |
|
| 50 |
disabledPen.setWidthF( 0.3 ); |
|
| 51 |
QBrush enabledBrush( QColor( 255, 0, 0, 255 ) ); |
|
| 52 |
QBrush disabledBrush( QColor( 255, 0, 0, 127 ) ); |
|
| 47 |
QPen enabledPen( QColor( 255, 0, 0, 255 ), 0.3, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin ); |
|
| 48 |
QPen disabledPen( QColor( 255, 0, 0, 85 ), 0.2, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin ); |
|
| 49 |
QBrush enabledBrush( QColor( 255, 255, 255, 255 ) ); |
|
| 50 |
QBrush disabledBrush( QColor( 255, 255, 255, 127 ) ); |
|
| 53 | 51 | |
| 54 | 52 |
//draw all points and collect minimal mm/pixel ratio |
| 55 | 53 |
double minMMPixelRatio = DBL_MAX; |
| ... | ... | |
| 74 | 72 |
painter->setPen( disabledPen ); |
| 75 | 73 |
painter->setBrush( disabledBrush ); |
| 76 | 74 |
} |
| 77 |
painter->drawRect( QRectF( gcpItemMMX - 1, gcpItemMMY - 1, 2, 2 ) );
|
|
| 75 |
painter->drawRect( QRectF( gcpItemMMX - 0.5, gcpItemMMY - 0.5, 1, 1 ) );
|
|
| 78 | 76 |
drawText( painter, gcpItemMMX + 2, gcpItemMMY + 2, QString::number(( *gcpIt )->id() ), QFont() ); |
| 79 | 77 | |
| 80 | 78 |
mmPixelRatio = maxMMToPixelRatioForGCP( *gcpIt, gcpItemMMX, gcpItemMMY ); |
| src/plugins/georeferencer/qgsgeorefplugingui.h (working copy) | ||
|---|---|---|
| 142 | 142 |
bool georeference(); |
| 143 | 143 |
bool writeWorldFile( QgsPoint origin, double pixelXSize, double pixelYSize, double rotation ); |
| 144 | 144 |
bool writePDFReportFile( const QString& fileName, const QgsGeorefTransform& transform ); |
| 145 |
bool writePDFMapFile( const QString& fileName, const QgsGeorefTransform& transform ); |
|
| 145 | 146 |
void updateTransformParamLabel(); |
| 146 | 147 | |
| 147 | 148 |
// gdal script |
| ... | ... | |
| 201 | 202 |
QString mGCPpointsFileName; |
| 202 | 203 |
QString mProjection; |
| 203 | 204 |
QString mPdfOutputFile; |
| 205 |
QString mPdfOutputMapFile; |
|
| 204 | 206 |
double mUserResX, mUserResY; // User specified target scale |
| 205 | 207 | |
| 206 | 208 |
QgsGeorefTransform::TransformParametrisation mTransformParam; |
| src/plugins/georeferencer/qgsgeorefconfigdialogbase.ui (working copy) | ||
|---|---|---|
| 6 | 6 |
<rect> |
| 7 | 7 |
<x>0</x> |
| 8 | 8 |
<y>0</y> |
| 9 |
<width>249</width>
|
|
| 10 |
<height>344</height>
|
|
| 9 |
<width>309</width>
|
|
| 10 |
<height>468</height>
|
|
| 11 | 11 |
</rect> |
| 12 | 12 |
</property> |
| 13 | 13 |
<property name="windowTitle"> |
| ... | ... | |
| 108 | 108 |
</layout> |
| 109 | 109 |
</widget> |
| 110 | 110 |
</item> |
| 111 |
<item row="3" column="0">
|
|
| 111 |
<item row="4" column="0">
|
|
| 112 | 112 |
<widget class="QCheckBox" name="mShowDockedCheckBox"> |
| 113 | 113 |
<property name="text"> |
| 114 | 114 |
<string>Show Georeferencer window docked</string> |
| 115 | 115 |
</property> |
| 116 | 116 |
</widget> |
| 117 | 117 |
</item> |
| 118 |
<item row="4" column="0">
|
|
| 118 |
<item row="5" column="0">
|
|
| 119 | 119 |
<widget class="QDialogButtonBox" name="buttonBox"> |
| 120 | 120 |
<property name="orientation"> |
| 121 | 121 |
<enum>Qt::Horizontal</enum> |
| ... | ... | |
| 125 | 125 |
</property> |
| 126 | 126 |
</widget> |
| 127 | 127 |
</item> |
| 128 |
<item row="3" column="0"> |
|
| 129 |
<widget class="QGroupBox" name="groupBox"> |
|
| 130 |
<property name="title"> |
|
| 131 |
<string>PDF map</string> |
|
| 132 |
</property> |
|
| 133 |
<layout class="QGridLayout" name="gridLayout_5"> |
|
| 134 |
<item row="0" column="0"> |
|
| 135 |
<layout class="QHBoxLayout" name="horizontalLayout_3"> |
|
| 136 |
<item> |
|
| 137 |
<widget class="QLabel" name="label_3"> |
|
| 138 |
<property name="text"> |
|
| 139 |
<string>Paper size</string> |
|
| 140 |
</property> |
|
| 141 |
</widget> |
|
| 142 |
</item> |
|
| 143 |
<item> |
|
| 144 |
<widget class="QComboBox" name="mPaperSizeComboBox"/> |
|
| 145 |
</item> |
|
| 146 |
</layout> |
|
| 147 |
</item> |
|
| 148 |
</layout> |
|
| 149 |
</widget> |
|
| 150 |
</item> |
|
| 128 | 151 |
</layout> |
| 129 | 152 |
</widget> |
| 130 | 153 |
<resources/> |
| src/plugins/georeferencer/qgstransformsettingsdialog.cpp (working copy) | ||
|---|---|---|
| 86 | 86 |
tbnOutputRaster->setIcon( getThemeIcon( "/mPushButtonFileOpen.png" ) ); |
| 87 | 87 |
tbnTargetSRS->setIcon( getThemeIcon( "/mPushButtonTargetSRSDisabled.png" ) ); |
| 88 | 88 |
tbnReportFile->setIcon( getThemeIcon( "/mActionSaveAsPDF.png" ) ); |
| 89 |
tbnMapFile->setIcon( getThemeIcon( "/mActionSaveAsPDF.png" ) ); |
|
| 89 | 90 |
} |
| 90 | 91 | |
| 91 | 92 |
void QgsTransformSettingsDialog::getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp, |
| 92 | 93 |
QgsImageWarper::ResamplingMethod &rm, |
| 93 | 94 |
QString &comprMethod, QString &raster, |
| 94 |
QString &proj, QString& pdfReportFile, bool &zt, bool &loadInQgis, |
|
| 95 |
QString &proj, QString& pdfMapFile, QString& pdfReportFile, bool &zt, bool &loadInQgis,
|
|
| 95 | 96 |
double& resX, double& resY ) |
| 96 | 97 |
{
|
| 97 | 98 |
if ( cmbTransformType->currentIndex() == -1 ) |
| ... | ... | |
| 110 | 111 |
raster = leOutputRaster->text(); |
| 111 | 112 |
} |
| 112 | 113 |
proj = leTargetSRS->text(); |
| 114 |
pdfMapFile = mMapFileLineEdit->text(); |
|
| 113 | 115 |
pdfReportFile = mReportFileLineEdit->text(); |
| 114 | 116 |
zt = cbxZeroAsTrans->isChecked(); |
| 115 | 117 |
loadInQgis = cbxLoadInQgisWhenDone->isChecked(); |
| ... | ... | |
| 244 | 246 |
} |
| 245 | 247 |
} |
| 246 | 248 | |
| 249 |
void QgsTransformSettingsDialog::on_tbnMapFile_clicked() |
|
| 250 |
{
|
|
| 251 |
QSettings s; |
|
| 252 |
QString myLastUsedDir = s.value( "/Plugin-GeoReferencer/lastPDFReportDir", "" ).toString(); |
|
| 253 |
QString outputFileName = QFileDialog::getSaveFileName( 0, tr( "Select save PDF file" ), myLastUsedDir, tr( "PDF Format" ) + " (*.pdf *PDF)" ); |
|
| 254 |
if ( !outputFileName.isNull() ) |
|
| 255 |
{
|
|
| 256 |
if ( !outputFileName.endsWith( ".pdf", Qt::CaseInsensitive ) ) |
|
| 257 |
{
|
|
| 258 |
outputFileName.append( ".pdf" ); |
|
| 259 |
} |
|
| 260 |
mMapFileLineEdit->setText( outputFileName ); |
|
| 261 |
} |
|
| 262 |
} |
|
| 263 | ||
| 247 | 264 |
void QgsTransformSettingsDialog::on_tbnReportFile_clicked() |
| 248 | 265 |
{
|
| 249 | 266 |
QSettings s; |
| src/plugins/georeferencer/qgsgeorefconfigdialog.cpp (working copy) | ||
|---|---|---|
| 15 | 15 |
/* $Id$ */ |
| 16 | 16 |
#include <QCloseEvent> |
| 17 | 17 |
#include <QSettings> |
| 18 |
#include <QSizeF> |
|
| 18 | 19 | |
| 19 | 20 |
#include "qgsgeorefconfigdialog.h" |
| 20 | 21 | |
| ... | ... | |
| 24 | 25 |
setupUi( this ); |
| 25 | 26 | |
| 26 | 27 |
readSettings(); |
| 28 | ||
| 29 |
mPaperSizeComboBox->addItem( tr( "A5 (148x210 mm)" ), QSizeF (148, 210 ) ); |
|
| 30 |
mPaperSizeComboBox->addItem( tr( "A4 (210x297 mm)" ), QSizeF (210, 297 ) ); |
|
| 31 |
mPaperSizeComboBox->addItem( tr( "A3 (297x420 mm)" ), QSizeF (297, 420 ) ); |
|
| 32 |
mPaperSizeComboBox->addItem( tr( "A2 (420x594 mm)" ), QSizeF (420, 594 ) ); |
|
| 33 |
mPaperSizeComboBox->addItem( tr( "A1 (594x841 mm)" ), QSizeF (594, 841 ) ); |
|
| 34 |
mPaperSizeComboBox->addItem( tr( "A0 (841x1189 mm)" ), QSizeF (841, 1189 ) ); |
|
| 35 |
mPaperSizeComboBox->addItem( tr( "B5 (176 x 250 mm)" ), QSizeF (176, 250 ) ); |
|
| 36 |
mPaperSizeComboBox->addItem( tr( "B4 (250 x 353 mm)" ), QSizeF (250, 353 ) ); |
|
| 37 |
mPaperSizeComboBox->addItem( tr( "B3 (353 x 500 mm)" ), QSizeF (353, 500 ) ); |
|
| 38 |
mPaperSizeComboBox->addItem( tr( "B2 (500 x 707 mm)" ), QSizeF (500, 707 ) ); |
|
| 39 |
mPaperSizeComboBox->addItem( tr( "B1 (707 x 1000 mm)" ), QSizeF (707, 1000 ) ); |
|
| 40 |
mPaperSizeComboBox->addItem( tr( "B0 (1000 x 1414 mm)" ), QSizeF (1000, 1414 ) ); |
|
| 41 |
// North american formats |
|
| 42 |
mPaperSizeComboBox->addItem( tr( "Legal (8.5x14 inches)" ), QSizeF (215.9, 355.6 ) ); |
|
| 43 |
mPaperSizeComboBox->addItem( tr( "ANSI A (Letter; 8.5x11 inches)" ), QSizeF (215.9, 279.4 ) ); |
|
| 44 |
mPaperSizeComboBox->addItem( tr( "ANSI B (Tabloid; 11x17 inches)" ), QSizeF (279.4, 431.8 ) ); |
|
| 45 |
mPaperSizeComboBox->addItem( tr( "ANSI C (17x22 inches)" ), QSizeF (431.8, 558.8 ) ); |
|
| 46 |
mPaperSizeComboBox->addItem( tr( "ANSI D (22x34 inches)" ), QSizeF (558.8, 863.6 ) ); |
|
| 47 |
mPaperSizeComboBox->addItem( tr( "ANSI E (34x44 inches)" ), QSizeF (863.6, 1117.6 ) ); |
|
| 48 |
mPaperSizeComboBox->addItem( tr( "Arch A (9x12 inches)" ), QSizeF (228.6, 304.8 ) ); |
|
| 49 |
mPaperSizeComboBox->addItem( tr( "Arch B (12x18 inches)" ), QSizeF (304.8, 457.2 ) ); |
|
| 50 |
mPaperSizeComboBox->addItem( tr( "Arch C (18x24 inches)" ), QSizeF (457.2, 609.6 ) ); |
|
| 51 |
mPaperSizeComboBox->addItem( tr( "Arch D (24x36 inches)" ), QSizeF (609.6, 914.4 ) ); |
|
| 52 |
mPaperSizeComboBox->addItem( tr( "Arch E (36x48 inches)" ), QSizeF (914.4, 1219.2 ) ); |
|
| 53 |
mPaperSizeComboBox->addItem( tr( "Arch E1 (30x42 inches)" ) , QSizeF ( 762, 1066.8 ) ); |
|
| 54 |
|
|
| 55 |
mPaperSizeComboBox->setCurrentIndex( 2 ); //A3 |
|
| 56 |
|
|
| 27 | 57 |
} |
| 28 | 58 | |
| 29 | 59 |
void QgsGeorefConfigDialog::changeEvent( QEvent *e ) |
| ... | ... | |
| 109 | 139 |
} |
| 110 | 140 |
s.setValue( "/Plugin-GeoReferencer/Config/LeftMarginPDF", mLeftMarginSpinBox->value() ); |
| 111 | 141 |
s.setValue( "/Plugin-GeoReferencer/Config/RightMarginPDF", mRightMarginSpinBox->value() ); |
| 142 |
|
|
| 143 |
s.setValue( "/Plugin-GeoReferencer/Config/WidthPDFMap", mPaperSizeComboBox->itemData( mPaperSizeComboBox->currentIndex() ).toSizeF().width() ); |
|
| 144 |
s.setValue( "/Plugin-GeoReferencer/Config/HeightPDFMap", mPaperSizeComboBox->itemData( mPaperSizeComboBox->currentIndex() ).toSizeF().height() ); |
|
| 145 | ||
| 112 | 146 |
} |
| 147 | ||
| src/plugins/georeferencer/qgsgeorefplugingui.cpp (working copy) | ||
|---|---|---|
| 28 | 28 |
#include <QPushButton> |
| 29 | 29 |
#include <QSettings> |
| 30 | 30 |
#include <QTextStream> |
| 31 |
#include <QPen> |
|
| 32 |
#include <QStringList> |
|
| 33 |
#include <QList> |
|
| 31 | 34 | |
| 32 | 35 |
#include "qgisinterface.h" |
| 33 | 36 |
#include "qgslegendinterface.h" |
| ... | ... | |
| 62 | 65 | |
| 63 | 66 |
#include "qgsgeorefplugingui.h" |
| 64 | 67 | |
| 65 | ||
| 66 | 68 |
QgsGeorefDockWidget::QgsGeorefDockWidget( const QString & title, QWidget * parent, Qt::WindowFlags flags ) |
| 67 | 69 |
: QDockWidget( title, parent, flags ) |
| 68 | 70 |
{
|
| ... | ... | |
| 310 | 312 |
} |
| 311 | 313 | |
| 312 | 314 |
d.getTransformSettings( mTransformParam, mResamplingMethod, mCompressionMethod, |
| 313 |
mModifiedRasterFileName, mProjection, mPdfOutputFile, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY ); |
|
| 315 |
mModifiedRasterFileName, mProjection, mPdfOutputMapFile, mPdfOutputFile, mUseZeroForTrans, mLoadInQgis, mUserResX, mUserResY );
|
|
| 314 | 316 |
mTransformParamLabel->setText( tr( "Transform: " ) + convertTransformEnumToString( mTransformParam ) ); |
| 315 | 317 |
mGeorefTransform.selectTransformParametrisation( mTransformParam ); |
| 316 | 318 |
mGCPListWidget->setGeorefTransform( &mGeorefTransform ); |
| ... | ... | |
| 1219 | 1221 |
{
|
| 1220 | 1222 |
writePDFReportFile( mPdfOutputFile, mGeorefTransform ); |
| 1221 | 1223 |
} |
| 1224 |
if ( success && !mPdfOutputMapFile.isEmpty() ) |
|
| 1225 |
{
|
|
| 1226 |
writePDFMapFile( mPdfOutputMapFile, mGeorefTransform ); |
|
| 1227 |
} |
|
| 1228 |
|
|
| 1229 |
|
|
| 1222 | 1230 |
} |
| 1223 | 1231 |
else // Helmert, Polinom 1, Polinom 2, Polinom 3 |
| 1224 | 1232 |
{
|
| ... | ... | |
| 1243 | 1251 |
{
|
| 1244 | 1252 |
writePDFReportFile( mPdfOutputFile, mGeorefTransform ); |
| 1245 | 1253 |
} |
| 1254 |
if ( !mPdfOutputMapFile.isEmpty() ) |
|
| 1255 |
{
|
|
| 1256 |
writePDFMapFile( mPdfOutputMapFile, mGeorefTransform ); |
|
| 1257 |
} |
|
| 1246 | 1258 |
return true; |
| 1247 | 1259 |
} |
| 1248 | 1260 |
} |
| ... | ... | |
| 1328 | 1340 |
return true; |
| 1329 | 1341 |
} |
| 1330 | 1342 | |
| 1343 |
bool QgsGeorefPluginGui::writePDFMapFile( const QString& fileName, const QgsGeorefTransform& transform ) |
|
| 1344 |
{
|
|
| 1345 |
if ( !mCanvas ) |
|
| 1346 |
{
|
|
| 1347 |
return false; |
|
| 1348 |
} |
|
| 1349 |
|
|
| 1350 |
QgsMapRenderer* canvasRenderer = mCanvas->mapRenderer(); |
|
| 1351 |
if ( !canvasRenderer ) |
|
| 1352 |
{
|
|
| 1353 |
return false; |
|
| 1354 |
} |
|
| 1355 |
|
|
| 1356 |
QgsRasterLayer *rlayer = (QgsRasterLayer*) mCanvas->layer(0); |
|
| 1357 |
double mapRatio = rlayer->extent().width() / rlayer->extent().height(); |
|
| 1358 |
|
|
| 1359 |
QPrinter printer; |
|
| 1360 |
printer.setOutputFormat( QPrinter::PdfFormat ); |
|
| 1361 |
printer.setOutputFileName( fileName ); |
|
| 1362 |
|
|
| 1363 |
QSettings s; |
|
| 1364 |
double paperWidth = s.value( "/Plugin-GeoReferencer/Config/WidthPDFMap" ).toDouble(); |
|
| 1365 |
double paperHeight = s.value( "/Plugin-GeoReferencer/Config/HeightPDFMap" ).toDouble(); |
|
| 1366 |
|
|
| 1367 |
//create composition |
|
| 1368 |
QgsComposition* composition = new QgsComposition( mCanvas->mapRenderer() ); |
|
| 1369 |
if ( mapRatio >= 1 ) |
|
| 1370 |
{
|
|
| 1371 |
composition->setPaperSize( paperHeight, paperWidth ); |
|
| 1372 |
} |
|
| 1373 |
else |
|
| 1374 |
{
|
|
| 1375 |
composition->setPaperSize( paperWidth, paperHeight ); |
|
| 1376 |
} |
|
| 1377 |
composition->setPrintResolution( 300 ); |
|
| 1378 |
printer.setPaperSize( QSizeF( composition->paperWidth(), composition->paperHeight() ), QPrinter::Millimeter ); |
|
| 1379 | ||
| 1380 |
double leftMargin = 8; |
|
| 1381 |
double topMargin = 8; |
|
| 1382 |
double contentWidth = composition->paperWidth()-2*leftMargin; |
|
| 1383 |
double contentHeight = composition->paperHeight()-2*topMargin; |
|
| 1384 |
double contentRatio = contentWidth / contentHeight; |
|
| 1385 | ||
| 1386 |
//composer map |
|
| 1387 |
QgsComposerMap* composerMap = new QgsComposerMap( composition, leftMargin, topMargin, contentWidth, contentHeight ); |
|
| 1388 |
composerMap->setKeepLayerSet(true); |
|
| 1389 |
QStringList list; |
|
| 1390 |
list.append( canvasRenderer->layerSet()[0] ); |
|
| 1391 |
composerMap->setLayerSet( list ); |
|
| 1392 |
|
|
| 1393 |
double xcenter = rlayer->extent().center().x(); |
|
| 1394 |
double ycenter = rlayer->extent().center().y(); |
|
| 1395 |
|
|
| 1396 |
QgsRectangle rect; |
|
| 1397 |
if ( mapRatio > contentRatio ) |
|
| 1398 |
{
|
|
| 1399 |
rect = QgsRectangle( 0, ycenter-(rlayer->extent().width() / contentRatio)/2, rlayer->extent().width(), ycenter+(rlayer->extent().width() / contentRatio)/2 ); |
|
| 1400 |
} |
|
| 1401 |
if (mapRatio <= contentRatio ) |
|
| 1402 |
{
|
|
| 1403 |
rect = QgsRectangle( xcenter-(rlayer->extent().height()*contentRatio/2), -1*rlayer->extent().height(), xcenter+(rlayer->extent().height()*contentRatio/2), 0 ); |
|
| 1404 |
} |
|
| 1405 |
|
|
| 1406 |
composerMap->setNewExtent( rect ); |
|
| 1407 |
composition->addItem( composerMap ); |
|
| 1408 |
printer.setFullPage( true ); |
|
| 1409 |
printer.setColorMode( QPrinter::Color ); |
|
| 1410 |
|
|
| 1411 |
QString residualUnits; |
|
| 1412 |
if ( s.value( "/Plugin-GeoReferencer/Config/ResidualUnits" ) == "mapUnits" && mGeorefTransform.providesAccurateInverseTransformation() ) |
|
| 1413 |
{
|
|
| 1414 |
residualUnits = tr( "map units" ); |
|
| 1415 |
} |
|
| 1416 |
else |
|
| 1417 |
{
|
|
| 1418 |
residualUnits = tr( "pixels" ); |
|
| 1419 |
} |
|
| 1420 |
|
|
| 1421 |
//residual plot |
|
| 1422 |
QgsResidualPlotItem* resPlotItem = new QgsResidualPlotItem( composition ); |
|
| 1423 |
composition->addItem( resPlotItem ); |
|
| 1424 |
resPlotItem->setSceneRect( QRectF( leftMargin, topMargin, contentWidth, contentHeight ) ); |
|
| 1425 |
resPlotItem->setExtent( rect ); |
|
| 1426 |
resPlotItem->setGCPList( mPoints ); |
|
| 1427 |
resPlotItem->setConvertScaleToMapUnits( residualUnits == tr( "map units" ) ); |
|
| 1428 | ||
| 1429 |
printer.setResolution( composition->printResolution() ); |
|
| 1430 |
QPainter p( &printer ); |
|
| 1431 |
composition->setPlotStyle( QgsComposition::Print ); |
|
| 1432 |
QRectF paperRectMM = printer.pageRect( QPrinter::Millimeter ); |
|
| 1433 |
QRectF paperRectPixel = printer.pageRect( QPrinter::DevicePixel ); |
|
| 1434 |
composition->render( &p, paperRectPixel, paperRectMM ); |
|
| 1435 | ||
| 1436 |
delete resPlotItem; |
|
| 1437 |
delete composerMap; |
|
| 1438 |
delete composition; |
|
| 1439 | ||
| 1440 |
return true; |
|
| 1441 |
} |
|
| 1442 | ||
| 1443 | ||
| 1444 | ||
| 1331 | 1445 |
bool QgsGeorefPluginGui::writePDFReportFile( const QString& fileName, const QgsGeorefTransform& transform ) |
| 1332 | 1446 |
{
|
| 1333 | 1447 |
if ( !mCanvas ) |
| ... | ... | |
| 1475 | 1589 |
gcpTable->setHeaderFont( tableHeaderFont ); |
| 1476 | 1590 |
gcpTable->setContentFont( tableContentFont ); |
| 1477 | 1591 |
QStringList gcpHeader; |
| 1478 |
gcpHeader << "id" << "enabled" << "pixelX" << "pixelY" << "mapX" << "mapY" << "resX[" + residualUnits + "]" << "resY[" + residualUnits + "]" << "resTot[" + residualUnits + "]";
|
|
| 1592 |
gcpHeader << "id" << "enabled" << "pixelX" << "pixelY" << "mapX" << "mapY" << "resX [" + residualUnits + "]" << "resY [" + residualUnits + "]" << "resTot [" + residualUnits + "]";
|
|
| 1479 | 1593 |
gcpTable->setHeaderLabels( gcpHeader ); |
| 1480 | 1594 | |
| 1481 | 1595 |
QgsGCPList::const_iterator gcpIt = mPoints.constBegin(); |
| ... | ... | |
| 1494 | 1608 |
{
|
| 1495 | 1609 |
currentGCPStrings << tr( "no" ); |
| 1496 | 1610 |
} |
| 1497 |
currentGCPStrings << QString::number(( *gcpIt )->pixelCoords().x(), 'f', 2 ) << QString::number(( *gcpIt )->pixelCoords().y(), 'f', 2 ) << QString::number(( *gcpIt )->mapCoords().x(), 'f', 2 )\
|
|
| 1498 |
<< QString::number(( *gcpIt )->mapCoords().y(), 'f', 2 ) << QString::number( residual.x() ) << QString::number( residual.y() ) << QString::number( residualTot );
|
|
| 1611 |
currentGCPStrings << QString::number(( *gcpIt )->pixelCoords().x(), 'f', 0 ) << QString::number(( *gcpIt )->pixelCoords().y(), 'f', 0 ) << QString::number(( *gcpIt )->mapCoords().x(), 'f', 3 )\
|
|
| 1612 |
<< QString::number(( *gcpIt )->mapCoords().y(), 'f', 3 ) << QString::number( residual.x() ) << QString::number( residual.y() ) << QString::number( residualTot );
|
|
| 1499 | 1613 |
gcpTable->addRow( currentGCPStrings ); |
| 1500 | 1614 |
} |
| 1501 | 1615 | |
| src/plugins/georeferencer/qgstransformsettingsdialogbase.ui (working copy) | ||
|---|---|---|
| 6 | 6 |
<rect> |
| 7 | 7 |
<x>0</x> |
| 8 | 8 |
<y>0</y> |
| 9 |
<width>356</width>
|
|
| 10 |
<height>429</height>
|
|
| 9 |
<width>438</width>
|
|
| 10 |
<height>478</height>
|
|
| 11 | 11 |
</rect> |
| 12 | 12 |
</property> |
| 13 | 13 |
<property name="windowTitle"> |
| ... | ... | |
| 137 | 137 |
</item> |
| 138 | 138 |
</layout> |
| 139 | 139 |
</item> |
| 140 |
<item row="6" column="0">
|
|
| 140 |
<item row="7" column="0">
|
|
| 141 | 141 |
<widget class="QLabel" name="label_6"> |
| 142 | 142 |
<property name="text"> |
| 143 | 143 |
<string>Generate pdf report:</string> |
| 144 | 144 |
</property> |
| 145 | 145 |
</widget> |
| 146 | 146 |
</item> |
| 147 |
<item row="6" column="1">
|
|
| 147 |
<item row="7" column="1">
|
|
| 148 | 148 |
<layout class="QHBoxLayout" name="horizontalLayout_3"> |
| 149 | 149 |
<item> |
| 150 | 150 |
<widget class="QLineEdit" name="mReportFileLineEdit"/> |
| ... | ... | |
| 158 | 158 |
</item> |
| 159 | 159 |
</layout> |
| 160 | 160 |
</item> |
| 161 |
<item row="7" column="0" colspan="2">
|
|
| 161 |
<item row="8" column="0" colspan="2">
|
|
| 162 | 162 |
<widget class="QCheckBox" name="cbxUserResolution"> |
| 163 | 163 |
<property name="text"> |
| 164 | 164 |
<string>Set Target Resolution</string> |
| 165 | 165 |
</property> |
| 166 | 166 |
</widget> |
| 167 | 167 |
</item> |
| 168 |
<item row="8" column="0">
|
|
| 168 |
<item row="9" column="0">
|
|
| 169 | 169 |
<widget class="QLabel" name="label_4"> |
| 170 | 170 |
<property name="text"> |
| 171 | 171 |
<string>Horizontal</string> |
| 172 | 172 |
</property> |
| 173 | 173 |
</widget> |
| 174 | 174 |
</item> |
| 175 |
<item row="8" column="1">
|
|
| 175 |
<item row="9" column="1">
|
|
| 176 | 176 |
<widget class="QgsValidatedDoubleSpinBox" name="dsbHorizRes"> |
| 177 | 177 |
<property name="decimals"> |
| 178 | 178 |
<number>5</number> |
| ... | ... | |
| 185 | 185 |
</property> |
| 186 | 186 |
</widget> |
| 187 | 187 |
</item> |
| 188 |
<item row="9" column="0">
|
|
| 188 |
<item row="10" column="0">
|
|
| 189 | 189 |
<widget class="QLabel" name="label_5"> |
| 190 | 190 |
<property name="text"> |
| 191 | 191 |
<string>Vertical</string> |
| 192 | 192 |
</property> |
| 193 | 193 |
</widget> |
| 194 | 194 |
</item> |
| 195 |
<item row="9" column="1">
|
|
| 195 |
<item row="10" column="1">
|
|
| 196 | 196 |
<widget class="QgsValidatedDoubleSpinBox" name="dsbVerticalRes"> |
| 197 | 197 |
<property name="sizePolicy"> |
| 198 | 198 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
| ... | ... | |
| 221 | 221 |
</property> |
| 222 | 222 |
</widget> |
| 223 | 223 |
</item> |
| 224 |
<item row="6" column="0"> |
|
| 225 |
<widget class="QLabel" name="label_7"> |
|
| 226 |
<property name="text"> |
|
| 227 |
<string>Generate pdf map:</string> |
|
| 228 |
</property> |
|
| 229 |
</widget> |
|
| 230 |
</item> |
|
| 231 |
<item row="6" column="1"> |
|
| 232 |
<layout class="QHBoxLayout" name="horizontalLayout_4"> |
|
| 233 |
<item> |
|
| 234 |
<widget class="QLineEdit" name="mMapFileLineEdit"/> |
|
| 235 |
</item> |
|
| 236 |
<item> |
|
| 237 |
<widget class="QToolButton" name="tbnMapFile"> |
|
| 238 |
<property name="text"> |
|
| 239 |
<string>...</string> |
|
| 240 |
</property> |
|
| 241 |
</widget> |
|
| 242 |
</item> |
|
| 243 |
</layout> |
|
| 244 |
</item> |
|
| 224 | 245 |
</layout> |
| 225 | 246 |
</item> |
| 226 | 247 |
<item row="1" column="0"> |
| src/plugins/georeferencer/qgstransformsettingsdialog.h (working copy) | ||
|---|---|---|
| 12 | 12 |
* (at your option) any later version. * |
| 13 | 13 |
* * |
| 14 | 14 |
***************************************************************************/ |
| 15 |
/* $Id: qgstransformsettingsdialog.h 13764 2010-06-21 12:11:11Z mhugent $ */
|
|
| 15 |
/* $Id$ */ |
|
| 16 | 16 | |
| 17 | 17 |
#ifndef QGSTRANSFORMSETTINGSDIALOG_H |
| 18 | 18 |
#define QGSTRANSFORMSETTINGSDIALOG_H |
| ... | ... | |
| 32 | 32 |
int countGCPpoints, QWidget *parent = 0 ); |
| 33 | 33 |
void getTransformSettings( QgsGeorefTransform::TransformParametrisation &tp, |
| 34 | 34 |
QgsImageWarper::ResamplingMethod &rm, QString &comprMethod, |
| 35 |
QString &raster, QString &proj, QString& pdfReportFile, bool &zt, bool &loadInQgis, |
|
| 35 |
QString &raster, QString &proj, QString& pdfMapFile, QString& pdfReportFile, bool &zt, bool &loadInQgis,
|
|
| 36 | 36 |
double& resX, double& resY ); |
| 37 | 37 |
static void resetSettings(); |
| 38 | 38 | |
| ... | ... | |
| 43 | 43 |
private slots: |
| 44 | 44 |
void on_tbnOutputRaster_clicked(); |
| 45 | 45 |
void on_tbnTargetSRS_clicked(); |
| 46 |
void on_tbnReportFile_clicked(); |
|
| 46 |
void on_tbnMapFile_clicked(); |
|
| 47 |
void on_tbnReportFile_clicked(); |
|
| 47 | 48 |
void on_leTargetSRS_textChanged( const QString &text ); |
| 48 | 49 |
void on_cmbTransformType_currentIndexChanged( const QString& text ); |
| 49 | 50 |
void on_mWorldFileCheckBox_stateChanged( int state ); |