Skip to content

Commit 3777aad

Browse files
3nidsnyalldawson
3nids
authored and
nyalldawson
committedDec 15, 2017
added some options
·
ltr-3_40final-3_0_0
1 parent 2b1f82f commit 3777aad

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed
 

‎src/app/qgsdatumtransformtablemodel.cpp

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#include "qgsdatumtransformtablemodel.h"
2+
#include "qgscoordinatetransform.h"
23

34
QgsDatumTransformTableModel::QgsDatumTransformTableModel( QObject *parent )
45
: QAbstractTableModel( parent )
@@ -27,8 +28,8 @@ int QgsDatumTransformTableModel::columnCount( const QModelIndex &parent ) const
2728
QVariant QgsDatumTransformTableModel::data( const QModelIndex &index, int role ) const
2829
{
2930
QString sourceCrs;
30-
int sourceTransform = -1;
3131
QString destinationCrs;
32+
int sourceTransform = -1;
3233
int destinationTransform = -1;
3334

3435
if ( index.row() < mTransformContext.sourceDestinationDatumTransforms().count() )
@@ -41,7 +42,6 @@ QVariant QgsDatumTransformTableModel::data( const QModelIndex &index, int role )
4142
destinationTransform = transforms.second;
4243
}
4344

44-
4545
switch ( role )
4646
{
4747
case Qt::DisplayRole:
@@ -50,11 +50,19 @@ QVariant QgsDatumTransformTableModel::data( const QModelIndex &index, int role )
5050
case SourceCrsColumn:
5151
return sourceCrs;
5252
case SourceTransformColumn:
53-
return sourceTransform;
53+
if (sourceTransform != -1)
54+
{
55+
return QgsCoordinateTransform::datumTransformString( sourceTransform );
56+
}
57+
break;
5458
case DestinationCrsColumn:
5559
return destinationCrs;
5660
case DestinationTransformColumn:
57-
return destinationTransform;
61+
if (sourceTransform != -1)
62+
{
63+
return QgsCoordinateTransform::datumTransformString( destinationTransform );
64+
}
65+
break;
5866
default:
5967
break;
6068
}

‎src/app/qgsoptions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WindowFlags fl, const QList<QgsOpti
457457
//default datum transformations
458458
mSettings->beginGroup( QStringLiteral( "/Projections" ) );
459459

460-
chkShowDatumTransformDialog->setChecked( mSettings->value( QStringLiteral( "showDatumTransformDialog" ), false ).toBool() );
460+
mShowDatumTransformDialogCheckBox->setChecked( mSettings->value( QStringLiteral( "showDatumTransformDialog" ), false ).toBool() );
461461

462462
QStringList projectionKeys = mSettings->allKeys();
463463

@@ -1385,7 +1385,7 @@ void QgsOptions::saveOptions()
13851385
mSettings->setValue( QStringLiteral( "/Projections/layerDefaultCrs" ), mLayerDefaultCrs.authid() );
13861386
mSettings->setValue( QStringLiteral( "/Projections/projectDefaultCrs" ), mDefaultCrs.authid() );
13871387

1388-
mSettings->setValue( QStringLiteral( "/Projections/showDatumTransformDialog" ), chkShowDatumTransformDialog->isChecked() );
1388+
mSettings->setValue( QStringLiteral( "/Projections/showDatumTransformDialog" ), mShowDatumTransformDialogCheckBox->isChecked() );
13891389

13901390
//measurement settings
13911391

‎src/app/qgsprojectproperties.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
165165
mDatumTransformTableView->setSelectionBehavior( QAbstractItemView::SelectRows );
166166
connect( mDatumTransformAddButton, &QToolButton::clicked, this, &QgsProjectProperties::addDatumTransform );
167167

168+
bool show = mSettings->value( QStringLiteral( "showDatumTransformDialog" ), false ).toBool();
169+
mShowDatumTransformDialogCheckBox->setChecked( show );
170+
168171
QPolygonF mainCanvasPoly = mapCanvas->mapSettings().visiblePolygon();
169172
QgsGeometry g = QgsGeometry::fromQPolygonF( mainCanvasPoly );
170173
// close polygon

‎src/ui/qgsprojectpropertiesbase.ui

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -797,7 +797,9 @@
797797
</property>
798798
<layout class="QVBoxLayout" name="verticalLayout_21">
799799
<item>
800-
<widget class="QgsProjectionSelectionTreeWidget" name="projectionSelector" native="true"/>
800+
<widget class="QgsProjectionSelectionTreeWidget" name="projectionSelector" native="true">
801+
<zorder>mDatumTransformGroupBox</zorder>
802+
</widget>
801803
</item>
802804
</layout>
803805
</widget>
@@ -808,7 +810,7 @@
808810
<string>Datum transformations</string>
809811
</property>
810812
<layout class="QGridLayout" name="gridLayout_2">
811-
<item row="0" column="2">
813+
<item row="1" column="2">
812814
<widget class="QToolButton" name="mDatumTransformEditButton">
813815
<property name="text">
814816
<string>...</string>
@@ -819,7 +821,7 @@
819821
</property>
820822
</widget>
821823
</item>
822-
<item row="0" column="1">
824+
<item row="1" column="1">
823825
<widget class="QToolButton" name="mDatumTransformRemoveButton">
824826
<property name="text">
825827
<string>...</string>
@@ -830,7 +832,10 @@
830832
</property>
831833
</widget>
832834
</item>
833-
<item row="0" column="0">
835+
<item row="2" column="0" colspan="4">
836+
<widget class="QTableView" name="mDatumTransformTableView"/>
837+
</item>
838+
<item row="1" column="0">
834839
<widget class="QToolButton" name="mDatumTransformAddButton">
835840
<property name="text">
836841
<string>...</string>
@@ -841,7 +846,7 @@
841846
</property>
842847
</widget>
843848
</item>
844-
<item row="0" column="3">
849+
<item row="1" column="3">
845850
<spacer name="horizontalSpacer_5">
846851
<property name="orientation">
847852
<enum>Qt::Horizontal</enum>
@@ -854,8 +859,15 @@
854859
</property>
855860
</spacer>
856861
</item>
857-
<item row="1" column="0" colspan="4">
858-
<widget class="QTableView" name="mDatumTransformTableView"/>
862+
<item row="0" column="0" colspan="4">
863+
<widget class="QCheckBox" name="mShowDatumTransformDialogCheckBox">
864+
<property name="enabled">
865+
<bool>false</bool>
866+
</property>
867+
<property name="text">
868+
<string>Ask for datum transformation if several are available (defined in global setting)</string>
869+
</property>
870+
</widget>
859871
</item>
860872
</layout>
861873
<zorder>cbxProjectionEnabled</zorder>
@@ -864,6 +876,7 @@
864876
<zorder>mDatumTransformRemoveButton</zorder>
865877
<zorder>mDatumTransformEditButton</zorder>
866878
<zorder>horizontalSpacer_5</zorder>
879+
<zorder>mShowDatumTransformDialogCheckBox</zorder>
867880
</widget>
868881
</item>
869882
</layout>

0 commit comments

Comments
 (0)
Please sign in to comment.