Skip to content

Commit 88c9d5b

Browse files
mhugentmhugent
committed
Merge branch 'wms_layer_title_abstract'
2 parents c336eca + dcae360 commit 88c9d5b

File tree

9 files changed

+210
-81
lines changed

9 files changed

+210
-81
lines changed

‎src/app/qgsrasterlayerproperties.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -860,6 +860,9 @@ void QgsRasterLayerProperties::sync()
860860
txtbMetadata->document()->setDefaultStyleSheet( myStyle );
861861
txtbMetadata->setHtml( mRasterLayer->metadata() );
862862

863+
mLayerTitleLineEdit->setText( mRasterLayer->title() );
864+
mLayerAbstractTextEdit->setPlainText( mRasterLayer->abstract() );
865+
863866
} // QgsRasterLayerProperties::sync()
864867

865868
void QgsRasterLayerProperties::syncColormapTab()
@@ -1442,6 +1445,9 @@ void QgsRasterLayerProperties::apply()
14421445
mRasterLayer->thumbnailAsPixmap( &myQPixmap );
14431446
pixmapThumbnail->setPixmap( myQPixmap );
14441447

1448+
mRasterLayer->setTitle( mLayerTitleLineEdit->text() );
1449+
mRasterLayer->setAbstract( mLayerAbstractTextEdit->toPlainText() );
1450+
14451451
// update symbology
14461452
emit refreshLegend( mRasterLayer->id(), false );
14471453

‎src/app/qgsvectorlayerproperties.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,13 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
178178
mOverlayDialogs.push_back( d );
179179
}
180180

181+
//layer title and abstract
182+
if ( layer )
183+
{
184+
mLayerTitleLineEdit->setText( layer->title() );
185+
mLayerAbstractTextEdit->setPlainText( layer->abstract() );
186+
}
187+
181188
tabWidget->setCurrentIndex( 0 );
182189

183190
QSettings settings;
@@ -815,6 +822,10 @@ void QgsVectorLayerProperties::apply()
815822
( *it )->apply();
816823
}
817824

825+
//layer title and abstract
826+
layer->setTitle( mLayerTitleLineEdit->text() );
827+
layer->setAbstract( mLayerAbstractTextEdit->toPlainText() );
828+
818829
// update symbology
819830
emit refreshLegend( layer->id(), false );
820831

‎src/core/qgsmaplayer.cpp‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,20 @@ bool QgsMapLayer::readXML( const QDomNode& layer_node )
255255
mne = mnl.toElement();
256256
setLayerName( mne.text() );
257257

258+
//title
259+
QDomElement titleElem = layer_node.firstChildElement( "title" );
260+
if ( !titleElem.isNull() )
261+
{
262+
mTitle = titleElem.text();
263+
}
264+
265+
//abstract
266+
QDomElement abstractElem = layer_node.firstChildElement( "abstract" );
267+
if ( !abstractElem.isNull() )
268+
{
269+
mAbstract = abstractElem.text();
270+
}
271+
258272
//read transparency level
259273
QDomNode transparencyNode = layer_node.namedItem( "transparencyLevelInt" );
260274
if ( ! transparencyNode.isNull() )
@@ -340,7 +354,19 @@ bool QgsMapLayer::writeXML( QDomNode & layer_node, QDomDocument & document )
340354
QDomText layerNameText = document.createTextNode( name() );
341355
layerName.appendChild( layerNameText );
342356

357+
// layer title
358+
QDomElement layerTitle = document.createElement( "title" ) ;
359+
QDomText layerTitleText = document.createTextNode( title() );
360+
layerTitle.appendChild( layerTitleText );
361+
362+
// layer abstract
363+
QDomElement layerAbstract = document.createElement( "abstract" );
364+
QDomText layerAbstractText = document.createTextNode( abstract() );
365+
layerAbstract.appendChild( layerAbstractText );
366+
343367
maplayer.appendChild( layerName );
368+
maplayer.appendChild( layerTitle );
369+
maplayer.appendChild( layerAbstract );
344370

345371
// timestamp if supported
346372
if ( timestamp() > QDateTime() )

‎src/core/qgsmaplayer.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,12 @@ class CORE_EXPORT QgsMapLayer : public QObject
8787
*/
8888
QString const & name() const;
8989

90+
void setTitle( const QString& title ) { mTitle = title; }
91+
const QString& title() const { return mTitle; }
92+
93+
void setAbstract( const QString& abstract ) { mAbstract = abstract; }
94+
const QString& abstract() const { return mAbstract; }
95+
9096
/**Synchronises with changes in the datasource
9197
@note added in version 1.6*/
9298
virtual void reload() {}
@@ -415,6 +421,11 @@ class CORE_EXPORT QgsMapLayer : public QObject
415421
/** layer's Spatial reference system */
416422
QgsCoordinateReferenceSystem* mCRS;
417423

424+
QString mTitle;
425+
426+
/**Description of the layer*/
427+
QString mAbstract;
428+
418429
private:
419430

420431
/** private copy constructor - QgsMapLayer not copyable */

‎src/mapserver/qgsconfigparser.cpp‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -363,44 +363,34 @@ void QgsConfigParser::appendCRSElementsToLayer( QDomElement& layerElement, QDomD
363363

364364
//insert the CRS elements after the title element to be in accordance with the WMS 1.3 specification
365365
QDomElement titleElement = layerElement.firstChildElement( "Title" );
366+
QDomElement abstractElement = layerElement.firstChildElement( "Abstract" );
367+
QDomElement CRSPrecedingElement = abstractElement.isNull() ? titleElement : abstractElement; //last element before the CRS elements
366368

367369
//In case the number of advertised CRS is constrained
368370
QStringList constrainedCrsList = supportedOutputCrsList();
369371
if ( constrainedCrsList.size() > 0 )
370372
{
371373
for ( int i = constrainedCrsList.size() - 1; i >= 0; --i )
372374
{
373-
appendCRSElementToLayer( layerElement, titleElement, constrainedCrsList.at( i ), doc );
374-
#if 0
375-
QDomElement crsElement = doc.createElement( "CRS" );
376-
QDomText crsText = doc.createTextNode( constrainedCrsList.at( i ) );
377-
crsElement.appendChild( crsText );
378-
layerElement.insertAfter( crsElement, titleElement );
379-
#endif
375+
appendCRSElementToLayer( layerElement, CRSPrecedingElement, constrainedCrsList.at( i ), doc );
380376
}
381377
}
382378
else //no crs constraint
383379
{
384380
foreach( QString crs, crsList )
385381
{
386-
appendCRSElementToLayer( layerElement, titleElement, crs, doc );
387-
#if 0
388-
QDomElement crsElement = doc.createElement( "CRS" );
389-
QDomText crsText = doc.createTextNode( *crsIt );
390-
crsElement.appendChild( crsText );
391-
layerElement.insertAfter( crsElement, titleElement );
392-
#endif
382+
appendCRSElementToLayer( layerElement, CRSPrecedingElement, crs, doc );
393383
}
394384
}
395385
}
396386

397-
void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& titleElement, const QString& crsText, QDomDocument& doc ) const
387+
void QgsConfigParser::appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement, const QString& crsText, QDomDocument& doc ) const
398388
{
399389
QString version = doc.documentElement().attribute( "version" );
400390
QDomElement crsElement = doc.createElement( version == "1.1.1" ? "SRS" : "CRS" );
401391
QDomText crsTextNode = doc.createTextNode( crsText );
402392
crsElement.appendChild( crsTextNode );
403-
layerElement.insertAfter( crsElement, titleElement );
393+
layerElement.insertAfter( crsElement, precedingElement );
404394
}
405395

406396
QgsComposition* QgsConfigParser::createPrintComposition( const QString& composerTemplate, QgsMapRenderer* mapRenderer, const QMap< QString, QString >& parameterMap ) const

‎src/mapserver/qgsconfigparser.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class QgsConfigParser
170170
@return true in case of success*/
171171
bool crsSetForLayer( const QDomElement& layerElement, QSet<QString> &crsSet ) const;
172172
void appendCRSElementsToLayer( QDomElement& layerElement, QDomDocument& doc, const QStringList &crsList ) const;
173-
void appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& titleElement, const QString& crsText, QDomDocument& doc ) const;
173+
void appendCRSElementToLayer( QDomElement& layerElement, const QDomElement& precedingElement, const QString& crsText, QDomDocument& doc ) const;
174174

175175
void setDefaultLegendSettings();
176176
};

‎src/mapserver/qgsprojectparser.cpp‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,10 +239,24 @@ void QgsProjectParser::addLayers( QDomDocument &doc,
239239
layerElem.appendChild( nameElem );
240240

241241
QDomElement titleElem = doc.createElement( "Title" );
242-
QDomText titleText = doc.createTextNode( currentLayer->name() );
242+
QString titleName = currentLayer->title();
243+
if ( titleName.isEmpty() )
244+
{
245+
titleName = currentLayer->name();
246+
}
247+
QDomText titleText = doc.createTextNode( titleName );
243248
titleElem.appendChild( titleText );
244249
layerElem.appendChild( titleElem );
245250

251+
QString abstract = currentLayer->abstract();
252+
if ( !abstract.isEmpty() )
253+
{
254+
QDomElement abstractElem = doc.createElement( "Abstract" );
255+
QDomText abstractText = doc.createTextNode( abstract );
256+
abstractElem.appendChild( abstractText );
257+
layerElem.appendChild( abstractElem );
258+
}
259+
246260
//CRS
247261
QStringList crsList = createCRSListForLayer( currentLayer );
248262
appendCRSElementsToLayer( layerElem, doc, crsList );

‎src/ui/qgsrasterlayerpropertiesbase.ui‎

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1724,11 +1724,41 @@
17241724
<attribute name="title">
17251725
<string>Metadata</string>
17261726
</attribute>
1727-
<layout class="QGridLayout">
1728-
<property name="margin">
1729-
<number>0</number>
1730-
</property>
1727+
<layout class="QGridLayout" name="gridLayout_6">
17311728
<item row="0" column="0">
1729+
<widget class="QLabel" name="mLayerTitleLabel">
1730+
<property name="text">
1731+
<string>Title</string>
1732+
</property>
1733+
</widget>
1734+
</item>
1735+
<item row="1" column="0">
1736+
<widget class="QLineEdit" name="mLayerTitleLineEdit"/>
1737+
</item>
1738+
<item row="2" column="0">
1739+
<widget class="QLabel" name="mLayerAbstractLabel">
1740+
<property name="text">
1741+
<string>Abstract</string>
1742+
</property>
1743+
</widget>
1744+
</item>
1745+
<item row="3" column="0">
1746+
<widget class="QTextEdit" name="mLayerAbstractTextEdit">
1747+
<property name="sizePolicy">
1748+
<sizepolicy hsizetype="Expanding" vsizetype="Minimum">
1749+
<horstretch>0</horstretch>
1750+
<verstretch>0</verstretch>
1751+
</sizepolicy>
1752+
</property>
1753+
<property name="maximumSize">
1754+
<size>
1755+
<width>16777215</width>
1756+
<height>50</height>
1757+
</size>
1758+
</property>
1759+
</widget>
1760+
</item>
1761+
<item row="4" column="0">
17321762
<widget class="QTextBrowser" name="txtbMetadata"/>
17331763
</item>
17341764
</layout>
@@ -1771,22 +1801,24 @@
17711801
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
17721802
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
17731803
p, li { white-space: pre-wrap; }
1774-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
1804+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
17751805
&lt;table border=&quot;0&quot; style=&quot;-qt-table-type: root; margin-top:4px; margin-bottom:4px; margin-left:4px; margin-right:4px;&quot;&gt;
17761806
&lt;tr&gt;
17771807
&lt;td style=&quot;border: none;&quot;&gt;
1778-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1808+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
1809+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;&quot;&gt;&lt;/p&gt;
1810+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
17791811
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;/p&gt;
1780-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1781-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1782-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1783-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1784-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1785-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1786-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1787-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1788-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans';&quot;&gt;&lt;/p&gt;
1789-
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
1812+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1813+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1814+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1815+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1816+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1817+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1818+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1819+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1820+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;&quot;&gt;&lt;/p&gt;
1821+
&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';&quot;&gt;&lt;/p&gt;&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;&lt;/body&gt;&lt;/html&gt;</string>
17901822
</property>
17911823
</widget>
17921824
</item>

0 commit comments

Comments
 (0)