Skip to content
Permalink
Browse files

switch display between identification section and provider in the met…

…adata tab
  • Loading branch information
Gustry committed Nov 21, 2017
1 parent b895b74 commit 59cc5434b887fbf219eada0c899dee2754377ff7
Showing with 11 additions and 10 deletions.
  1. +1 −0 doc/api_break.dox
  2. +5 −5 src/core/qgsvectorlayer.cpp
  3. +5 −5 src/core/raster/qgsrasterlayer.cpp
@@ -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.
@@ -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( );
@@ -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( );

0 comments on commit 59cc543

Please sign in to comment.
You can’t perform that action at this time.