Skip to content

Commit e5d6920

Browse files
committed
allow to have single dest/source transform in dialog
1 parent c18eadd commit e5d6920

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/gui/qgsdatumtransformdialog.cpp

+7-5
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ void QgsDatumTransformDialog::load( const QPair<int, int> &selectedDatumTransfor
7878
bool itemDisabled = false;
7979
bool itemHidden = false;
8080

81-
if ( transform.sourceTransformId == -1 || transform.destinationTransformId == -1 )
81+
if ( transform.sourceTransformId == -1 && transform.destinationTransformId == -1 )
8282
continue;
8383

8484
for ( int i = 0; i < 2; ++i )
@@ -157,8 +157,8 @@ void QgsDatumTransformDialog::load( const QPair<int, int> &selectedDatumTransfor
157157

158158
void QgsDatumTransformDialog::setOKButtonEnabled()
159159
{
160-
QTableWidgetItem *item = mDatumTransformTableWidget->currentItem();
161-
mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( mSourceCrs.isValid() && mDestinationCrs.isValid() && item );
160+
int row = mDatumTransformTableWidget->currentRow();
161+
mButtonBox->button( QDialogButtonBox::Ok )->setEnabled( mSourceCrs.isValid() && mDestinationCrs.isValid() && row >= 0 );
162162
}
163163

164164
QgsDatumTransformDialog::~QgsDatumTransformDialog()
@@ -190,8 +190,10 @@ QPair<QPair<QgsCoordinateReferenceSystem, int>, QPair<QgsCoordinateReferenceSyst
190190

191191
if ( row >= 0 )
192192
{
193-
sdt.first.second = mDatumTransformTableWidget->item( row, 0 )->data( Qt::UserRole ).toInt();
194-
sdt.second.second = mDatumTransformTableWidget->item( row, 1 )->data( Qt::UserRole ).toInt();
193+
QTableWidgetItem *srcItem = mDatumTransformTableWidget->item( row, 0 );
194+
sdt.first.second = srcItem ? srcItem->data( Qt::UserRole ).toInt() : -1;
195+
QTableWidgetItem *destItem = mDatumTransformTableWidget->item( row, 1 );
196+
sdt.second.second = destItem ? destItem->data( Qt::UserRole ).toInt() : -1;
195197
}
196198
else
197199
{

0 commit comments

Comments
 (0)