Merge pull request #5683 from Gustry/metadata_crs

fix #17456 improve CRS display in the metadata tab
qgis · Nov 21, 2017 · d62b4e9 · d62b4e9
2 parents 5be5c1e + 59cc543
commit d62b4e9
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -2060,6 +2060,7 @@ QgsRasterDataProvider        {#qgis_api_break_3_0_QgsRasterDataProvider}
 - useSrcNoDataValue() has been renamed to useSourceNoDataValue()
 - setUseSrcNoDataValue() has been renamed to setUseSourceNoDataValue()
 - srcNoDataValue() has been renamed to sourceNoDataValue()
+- metadata() was renamed to htmlMetadata()
 - draw() has been removed from the interface as it was not used anywhere.
 - The progress and progressUpdate signals were removed. Methods which previously emitted these
 signals now accept a QgsRasterBlockFeedback argument for reporting progress updates.

diff --git a/src/core/metadata/qgslayermetadataformatter.cpp b/src/core/metadata/qgslayermetadataformatter.cpp
@@ -96,12 +96,16 @@ QString QgsLayerMetadataFormatter::contactsSectionHtml() const
 QString QgsLayerMetadataFormatter::extentSectionHtml() const
 {
   QString myMetadata = QStringLiteral( "<table class=\"list-view\">\n" );
-  myMetadata += QStringLiteral( "<tr><td class=\"highlight\">" ) + QObject::tr( "CRS" ) + QStringLiteral( "</td><td>" ) + mMetadata.crs().authid() + QStringLiteral( " - " );
-  myMetadata += mMetadata.crs().description() + QStringLiteral( " - " );
-  if ( mMetadata.crs().isGeographic() )
-    myMetadata += QObject::tr( "Geographic" );
-  else
-    myMetadata += QObject::tr( "Projected" );
+  myMetadata += QStringLiteral( "<tr><td class=\"highlight\">" ) + QObject::tr( "CRS" ) + QStringLiteral( "</td><td>" );
+  if ( mMetadata.crs().isValid() )
+  {
+    myMetadata += mMetadata.crs().authid() + QStringLiteral( " - " );
+    myMetadata += mMetadata.crs().description() + QStringLiteral( " - " );
+    if ( mMetadata.crs().isGeographic() )
+      myMetadata += QObject::tr( "Geographic" );
+    else
+      myMetadata += QObject::tr( "Projected" );
+  }
   myMetadata += QLatin1String( "</td></tr>\n" );
 
   const QgsLayerMetadata::Extent extent = mMetadata.extent();

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3987,11 +3987,6 @@ QString QgsVectorLayer::htmlMetadata() const
   QgsLayerMetadataFormatter htmlFormatter( metadata() );
   QString myMetadata = QStringLiteral( "<html>\n<body>\n" );
 
-  // identification section
-  myMetadata += QStringLiteral( "<h1>" ) + tr( "Identification" ) + QStringLiteral( "</h1>\n<hr>\n" );
-  myMetadata += htmlFormatter.identificationSectionHtml( );
-  myMetadata += QLatin1String( "<br><br>\n" );
-
   // Begin Provider section
   myMetadata += QStringLiteral( "<h1>" ) + tr( "Information from provider" ) + QStringLiteral( "</h1>\n<hr>\n" );
   myMetadata += QLatin1String( "<table class=\"list-view\">\n" );
@@ -4048,6 +4043,11 @@ QString QgsVectorLayer::htmlMetadata() const
   // End Provider section
   myMetadata += QLatin1String( "</table>\n<br><br>" );
 
+  // identification section
+  myMetadata += QStringLiteral( "<h1>" ) + tr( "Identification" ) + QStringLiteral( "</h1>\n<hr>\n" );
+  myMetadata += htmlFormatter.identificationSectionHtml( );
+  myMetadata += QLatin1String( "<br><br>\n" );
+
   // extent section
   myMetadata += QStringLiteral( "<h1>" ) + tr( "Extent" ) + QStringLiteral( "</h1>\n<hr>\n" );
   myMetadata += htmlFormatter.extentSectionHtml( );

diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
@@ -307,11 +307,6 @@ QString QgsRasterLayer::htmlMetadata() const
   QgsLayerMetadataFormatter htmlFormatter( metadata() );
   QString myMetadata = QStringLiteral( "<html>\n<body>\n" );
 
-  // Identification section
-  myMetadata += QStringLiteral( "<h1>" ) + tr( "Identification" ) + QStringLiteral( "</h1>\n<hr>\n" );
-  myMetadata += htmlFormatter.identificationSectionHtml();
-  myMetadata += QLatin1String( "<br><br>\n" );
-
   // Begin Provider section
   myMetadata += QStringLiteral( "<h1>" ) + tr( "Information from provider" ) + QStringLiteral( "</h1>\n<hr>\n" );
   myMetadata += QLatin1String( "<table class=\"list-view\">\n" );
@@ -405,6 +400,11 @@ QString QgsRasterLayer::htmlMetadata() const
   // End Provider section
   myMetadata += QLatin1String( "</table>\n<br><br>" );
 
+  // Identification section
+  myMetadata += QStringLiteral( "<h1>" ) + tr( "Identification" ) + QStringLiteral( "</h1>\n<hr>\n" );
+  myMetadata += htmlFormatter.identificationSectionHtml();
+  myMetadata += QLatin1String( "<br><br>\n" );
+
   // extent section
   myMetadata += QStringLiteral( "<h1>" ) + tr( "Extent" ) + QStringLiteral( "</h1>\n<hr>\n" );
   myMetadata += htmlFormatter.extentSectionHtml( );

diff --git a/src/gui/qgsmetadatawidget.cpp b/src/gui/qgsmetadatawidget.cpp
@@ -414,6 +414,10 @@ void QgsMetadataWidget::setPropertiesFromLayer() const
   {
     selectionCrs->setCrs( mMetadata.crs() );
   }
+  else
+  {
+    selectionCrs->setOptionVisible( QgsProjectionSelectionWidget::CrsNotSet, true );
+  }
 
   // Links
   const QList<QgsLayerMetadata::Link> &links = mMetadata.links();