Skip to content

Commit e6b624c

Browse files
committed
Add option for using WFS type name title for the added layer name
1 parent 7fff3b1 commit e6b624c

File tree

2 files changed

+29
-14
lines changed

2 files changed

+29
-14
lines changed

src/providers/wfs/qgswfssourceselect.cpp

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget* parent, Qt::WFlags fl, bool emb
7878
treeView->setItemDelegate( mItemDelegate );
7979

8080
QSettings settings;
81-
QgsDebugMsg( "restoring geometry" );
81+
QgsDebugMsg( "restoring settings" );
8282
restoreGeometry( settings.value( "/Windows/WFSSourceSelect/geometry" ).toByteArray() );
83+
cbxUseTitleLayerName->setChecked( settings.value( "/Windows/WFSSourceSelect/UseTitleLayerName", false ).toBool() );
8384

8485
mModel = new QStandardItemModel();
8586
mModel->setHorizontalHeaderItem( 0, new QStandardItem( "Title" ) );
@@ -100,8 +101,9 @@ QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget* parent, Qt::WFlags fl, bool emb
100101
QgsWFSSourceSelect::~QgsWFSSourceSelect()
101102
{
102103
QSettings settings;
103-
QgsDebugMsg( "saving geometry" );
104+
QgsDebugMsg( "saving settings" );
104105
settings.setValue( "/Windows/WFSSourceSelect/geometry", saveGeometry() );
106+
settings.setValue( "/Windows/WFSSourceSelect/UseTitleLayerName", cbxUseTitleLayerName->isChecked() );
105107

106108
delete mItemDelegate;
107109
delete mProjectionSelector;
@@ -377,7 +379,13 @@ void QgsWFSSourceSelect::addLayer()
377379
}
378380
int row = idx.row();
379381
QString typeName = mModel->item( row, 1 )->text(); //WFS repository's name for layer
382+
QString titleName = mModel->item( row, 0 )->text(); //WFS type name title for layer name (if option is set)
380383
QString filter = mModel->item( row, 4 )->text(); //optional filter specified by user
384+
QString layerName = typeName;
385+
if ( cbxUseTitleLayerName->isChecked() && !titleName.isEmpty() )
386+
{
387+
layerName = titleName;
388+
}
381389
QgsDebugMsg( "Layer " + typeName + " Filter is " + filter );
382390
//is "cache features" checked?
383391
if ( mModel->item( row, 3 )->checkState() == Qt::Checked )
@@ -388,7 +396,7 @@ void QgsWFSSourceSelect::addLayer()
388396
{ //no: include BBOX of current canvas extent in URI
389397
mUri = conn.uriGetFeature( typeName, pCrsString, filter, extent );
390398
}
391-
emit addWfsLayer( mUri, typeName );
399+
emit addWfsLayer( mUri, layerName );
392400
}
393401
accept();
394402
}

src/ui/qgswfssourceselectbase.ui

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,17 @@
1414
<string>Add WFS Layer from a Server</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17-
<item row="3" column="0">
17+
<item row="5" column="0">
18+
<widget class="QDialogButtonBox" name="buttonBox">
19+
<property name="orientation">
20+
<enum>Qt::Horizontal</enum>
21+
</property>
22+
<property name="standardButtons">
23+
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
24+
</property>
25+
</widget>
26+
</item>
27+
<item row="4" column="0">
1828
<widget class="QGroupBox" name="gbCRS">
1929
<property name="title">
2030
<string>Coordinate reference system</string>
@@ -62,16 +72,6 @@
6272
</layout>
6373
</widget>
6474
</item>
65-
<item row="4" column="0">
66-
<widget class="QDialogButtonBox" name="buttonBox">
67-
<property name="orientation">
68-
<enum>Qt::Horizontal</enum>
69-
</property>
70-
<property name="standardButtons">
71-
<set>QDialogButtonBox::Close|QDialogButtonBox::Help</set>
72-
</property>
73-
</widget>
74-
</item>
7575
<item row="1" column="0">
7676
<layout class="QHBoxLayout" name="horizontalLayoutFilter">
7777
<item>
@@ -210,6 +210,13 @@
210210
</attribute>
211211
</widget>
212212
</item>
213+
<item row="3" column="0">
214+
<widget class="QCheckBox" name="cbxUseTitleLayerName">
215+
<property name="text">
216+
<string>Use title for layer name</string>
217+
</property>
218+
</widget>
219+
</item>
213220
</layout>
214221
</widget>
215222
<tabstops>

0 commit comments

Comments
 (0)