From 39521c765614ba706990856d64ca7e459720a5d0 Mon Sep 17 00:00:00 2001 From: Etienne Trimaille Date: Fri, 15 Dec 2017 16:35:30 +0100 Subject: [PATCH] fix contact table in metadata (#5881) * fix contact table in metadata * fix datetime picker in temporal extent --- src/gui/qgsmetadatawidget.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/gui/qgsmetadatawidget.cpp b/src/gui/qgsmetadatawidget.cpp index 29c8c42923c..6908efdc2d6 100644 --- a/src/gui/qgsmetadatawidget.cpp +++ b/src/gui/qgsmetadatawidget.cpp @@ -432,7 +432,12 @@ void QgsMetadataWidget::setPropertiesFromLayer() const { // Even if it's a list, it seems we use only one for now (cf discussion with Tom) dateTimeFrom->setDateTime( temporalExtents.at( 0 ).begin() ); - dateTimeFrom->setDateTime( temporalExtents.at( 0 ).end() ); + dateTimeTo->setDateTime( temporalExtents.at( 0 ).end() ); + } + else + { + dateTimeFrom->clear(); + dateTimeTo->clear(); } // Contacts @@ -456,13 +461,14 @@ void QgsMetadataWidget::setPropertiesFromLayer() const const QList &addresses = contact.addresses; for ( const QgsLayerMetadata::Address &address : addresses ) { - int currentRow = tabKeywords->rowCount() - 1; - tabAddresses->item( currentRow, 0 )->setText( address.type ); - tabAddresses->item( currentRow, 1 )->setText( address.address ); - tabAddresses->item( currentRow, 2 )->setText( address.postalCode ); - tabAddresses->item( currentRow, 3 )->setText( address.city ); - tabAddresses->item( currentRow, 4 )->setText( address.administrativeArea ); - tabAddresses->item( currentRow, 5 )->setText( address.country ); + int currentRow = tabAddresses->rowCount(); + tabAddresses->setRowCount( currentRow + 1 ); + tabAddresses->setItem( currentRow, 0, new QTableWidgetItem( address.type ) ); + tabAddresses->setItem( currentRow, 1, new QTableWidgetItem( address.address ) ); + tabAddresses->setItem( currentRow, 2, new QTableWidgetItem( address.postalCode ) ); + tabAddresses->setItem( currentRow, 3, new QTableWidgetItem( address.city ) ); + tabAddresses->setItem( currentRow, 4, new QTableWidgetItem( address.administrativeArea ) ); + tabAddresses->setItem( currentRow, 5, new QTableWidgetItem( address.country ) ); } }