Skip to content

Commit 8ebd47b

Browse files
nyalldawsonnyalldawson
committed
[needs-docs] Drop unused/misleading 'tolerance' setting from topology
checker Fixes #9621
1 parent d9e9f2a commit 8ebd47b

File tree

5 files changed

+66
-446
lines changed

5 files changed

+66
-446
lines changed

‎src/plugins/topology/checkDock.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,9 +324,8 @@ void checkDock::runTests( ValidateType type )
324324
for ( int i = 0; i < mTestTable->rowCount(); ++i )
325325
{
326326
QString testName = mTestTable->item( i, 0 )->text();
327-
QString toleranceStr = mTestTable->item( i, 3 )->text();
328-
QString layer1Str = mTestTable->item( i, 4 )->text();
329-
QString layer2Str = mTestTable->item( i, 5 )->text();
327+
QString layer1Str = mTestTable->item( i, 3 )->text();
328+
QString layer2Str = mTestTable->item( i, 4 )->text();
330329

331330
// test if layer1 is in the registry
332331
if ( !( ( QgsVectorLayer * )QgsProject::instance()->mapLayers().contains( layer1Str ) ) )
@@ -348,7 +347,7 @@ void checkDock::runTests( ValidateType type )
348347
connect( mTest, &topolTest::progress, &progress, &QProgressDialog::setValue );
349348
// run the test
350349

351-
ErrorList errors = mTest->runTest( testName, layer1, layer2, type, toleranceStr.toDouble() );
350+
ErrorList errors = mTest->runTest( testName, layer1, layer2, type );
352351

353352
QList<TopolError *>::Iterator it;
354353

‎src/plugins/topology/rulesDialog.cpp

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf
3838
mQgisIface = qgisIface;
3939

4040
//setHorizontalHeaderItems();
41+
mRulesTable->hideColumn( 3 );
4142
mRulesTable->hideColumn( 4 );
42-
mRulesTable->hideColumn( 5 );
4343

4444
mTestConfMap = testMap;
4545
mRulesTable->setSelectionBehavior( QAbstractItemView::SelectRows );
@@ -69,7 +69,7 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf
6969
void rulesDialog::setHorizontalHeaderItems()
7070
{
7171
QStringList labels;
72-
labels << tr( "Test" ) << tr( "Layer #1" ) << tr( "Layer #2" ) << tr( "Tolerance" ) << QLatin1String( "" ) << QLatin1String( "" );
72+
labels << tr( "Test" ) << tr( "Layer #1" ) << tr( "Layer #2" ) << QLatin1String( "" ) << QLatin1String( "" );
7373
mRulesTable->setHorizontalHeaderLabels( labels );
7474
}
7575

@@ -78,11 +78,9 @@ void rulesDialog::readTest( int index, QgsProject *project )
7878
QString testName;
7979
QString layer1Id;
8080
QString layer2Id;
81-
QString tolerance;
8281
QString postfix = QStringLiteral( "%1" ).arg( index );
8382

8483
testName = project->readEntry( QStringLiteral( "Topol" ), "/testname_" + postfix, QLatin1String( "" ) );
85-
tolerance = project->readEntry( QStringLiteral( "Topol" ), "/tolerance_" + postfix, QLatin1String( "" ) );
8684
layer1Id = project->readEntry( QStringLiteral( "Topol" ), "/layer1_" + postfix, QLatin1String( "" ) );
8785
layer2Id = project->readEntry( QStringLiteral( "Topol" ), "/layer2_" + postfix, QLatin1String( "" ) );
8886

@@ -127,19 +125,11 @@ void rulesDialog::readTest( int index, QgsProject *project )
127125
newItem->setFlags( newItem->flags() & ~Qt::ItemIsEditable );
128126
mRulesTable->setItem( row, 2, newItem );
129127

130-
if ( mTestConfMap[testName].useTolerance )
131-
newItem = new QTableWidgetItem( tolerance );
132-
else
133-
newItem = new QTableWidgetItem( tr( "No tolerance" ) );
134-
135-
newItem->setFlags( newItem->flags() & ~Qt::ItemIsEditable );
136-
mRulesTable->setItem( row, 3, newItem );
137-
138128
// add layer ids to hidden columns
139129
newItem = new QTableWidgetItem( layer1Id );
140-
mRulesTable->setItem( row, 4, newItem );
130+
mRulesTable->setItem( row, 3, newItem );
141131
newItem = new QTableWidgetItem( layer2Id );
142-
mRulesTable->setItem( row, 5, newItem );
132+
mRulesTable->setItem( row, 4, newItem );
143133
}
144134

145135
void rulesDialog::projectRead()
@@ -197,19 +187,6 @@ void rulesDialog::showControls( const QString &testName )
197187
{
198188
mLayer2Box->setVisible( false );
199189
}
200-
201-
202-
if ( topologyRule.useTolerance )
203-
{
204-
mToleranceBox->setVisible( true );
205-
mToleranceLabel->setVisible( true );
206-
}
207-
else
208-
{
209-
mToleranceBox->setVisible( false );
210-
mToleranceLabel->setVisible( false );
211-
}
212-
213190
}
214191

215192
void rulesDialog::addRule()
@@ -250,13 +227,6 @@ void rulesDialog::addRule()
250227

251228
mRulesTable->setItem( row, 2, newItem );
252229

253-
if ( mTestConfMap[test].useTolerance )
254-
newItem = new QTableWidgetItem( QStringLiteral( "%1" ).arg( mToleranceBox->value() ) );
255-
else
256-
newItem = new QTableWidgetItem( tr( "No tolerance" ) );
257-
258-
mRulesTable->setItem( row, 3, newItem );
259-
260230
QString layer1ID, layer2ID;
261231
// add layer ids to hidden columns
262232
// -1 for "No layer" string
@@ -269,25 +239,23 @@ void rulesDialog::addRule()
269239

270240
//TODO: use setItemData (or something like that) instead of hidden columns
271241
newItem = new QTableWidgetItem( layer1ID );
272-
mRulesTable->setItem( row, 4, newItem );
242+
mRulesTable->setItem( row, 3, newItem );
273243
newItem = new QTableWidgetItem( layer2ID );
274-
mRulesTable->setItem( row, 5, newItem );
244+
mRulesTable->setItem( row, 4, newItem );
275245

276246
// save state to the project file.....
277247
QString postfix = QStringLiteral( "%1" ).arg( row );
278248
QgsProject *project = QgsProject::instance();
279249

280250
project->writeEntry( QStringLiteral( "Topol" ), QStringLiteral( "/testCount" ), row + 1 );
281251
project->writeEntry( QStringLiteral( "Topol" ), "/testname_" + postfix, test );
282-
project->writeEntry( QStringLiteral( "Topol" ), "/tolerance_" + postfix, QStringLiteral( "%1" ).arg( mToleranceBox->value() ) );
283252
project->writeEntry( QStringLiteral( "Topol" ), "/layer1_" + postfix, layer1ID );
284253
project->writeEntry( QStringLiteral( "Topol" ), "/layer2_" + postfix, layer2ID );
285254

286255
// reset controls to default
287256
mRuleBox->setCurrentIndex( 0 );
288257
mLayer1Box->setCurrentIndex( 0 );
289258
mLayer2Box->setCurrentIndex( 0 );
290-
mToleranceBox->setValue( 0 );
291259
}
292260

293261
void rulesDialog::deleteTest()

‎src/plugins/topology/rulesDialog.ui

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,20 +58,6 @@
5858
</item>
5959
<item row="2" column="0" colspan="2">
6060
<layout class="QHBoxLayout" name="horizontalLayout_5">
61-
<item>
62-
<layout class="QHBoxLayout" name="horizontalLayout_3">
63-
<item>
64-
<widget class="QLabel" name="mToleranceLabel">
65-
<property name="text">
66-
<string>Tolerance</string>
67-
</property>
68-
</widget>
69-
</item>
70-
<item>
71-
<widget class="QDoubleSpinBox" name="mToleranceBox"/>
72-
</item>
73-
</layout>
74-
</item>
7561
<item>
7662
<spacer name="horizontalSpacer_2">
7763
<property name="orientation">
@@ -86,22 +72,18 @@
8672
</spacer>
8773
</item>
8874
<item>
89-
<layout class="QHBoxLayout" name="horizontalLayout_4">
90-
<item>
91-
<widget class="QPushButton" name="mAddTestButton">
92-
<property name="text">
93-
<string>Add Rule</string>
94-
</property>
95-
</widget>
96-
</item>
97-
<item>
98-
<widget class="QPushButton" name="mDeleteTestButton">
99-
<property name="text">
100-
<string>Delete Rule</string>
101-
</property>
102-
</widget>
103-
</item>
104-
</layout>
75+
<widget class="QPushButton" name="mAddTestButton">
76+
<property name="text">
77+
<string>Add Rule</string>
78+
</property>
79+
</widget>
80+
</item>
81+
<item>
82+
<widget class="QPushButton" name="mDeleteTestButton">
83+
<property name="text">
84+
<string>Delete Rule</string>
85+
</property>
86+
</widget>
10587
</item>
10688
</layout>
10789
</item>
@@ -122,11 +104,6 @@
122104
<string>Layer #2</string>
123105
</property>
124106
</column>
125-
<column>
126-
<property name="text">
127-
<string>Tolerance</string>
128-
</property>
129-
</column>
130107
<column>
131108
<property name="text">
132109
<string>Layer1ID</string>
@@ -155,7 +132,6 @@
155132
<tabstop>mLayer1Box</tabstop>
156133
<tabstop>mRuleBox</tabstop>
157134
<tabstop>mLayer2Box</tabstop>
158-
<tabstop>mToleranceBox</tabstop>
159135
<tabstop>mAddTestButton</tabstop>
160136
<tabstop>mDeleteTestButton</tabstop>
161137
<tabstop>mRulesTable</tabstop>

0 commit comments

Comments
 (0)