@@ -38,8 +38,8 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf
38
38
mQgisIface = qgisIface;
39
39
40
40
// setHorizontalHeaderItems();
41
+ mRulesTable ->hideColumn ( 3 );
41
42
mRulesTable ->hideColumn ( 4 );
42
- mRulesTable ->hideColumn ( 5 );
43
43
44
44
mTestConfMap = testMap;
45
45
mRulesTable ->setSelectionBehavior ( QAbstractItemView::SelectRows );
@@ -69,7 +69,7 @@ rulesDialog::rulesDialog( const QMap<QString, TopologyRule> &testMap, QgisInterf
69
69
void rulesDialog::setHorizontalHeaderItems ()
70
70
{
71
71
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 ( " " );
73
73
mRulesTable ->setHorizontalHeaderLabels ( labels );
74
74
}
75
75
@@ -78,11 +78,9 @@ void rulesDialog::readTest( int index, QgsProject *project )
78
78
QString testName;
79
79
QString layer1Id;
80
80
QString layer2Id;
81
- QString tolerance;
82
81
QString postfix = QStringLiteral ( " %1" ).arg ( index );
83
82
84
83
testName = project->readEntry ( QStringLiteral ( " Topol" ), " /testname_" + postfix, QLatin1String ( " " ) );
85
- tolerance = project->readEntry ( QStringLiteral ( " Topol" ), " /tolerance_" + postfix, QLatin1String ( " " ) );
86
84
layer1Id = project->readEntry ( QStringLiteral ( " Topol" ), " /layer1_" + postfix, QLatin1String ( " " ) );
87
85
layer2Id = project->readEntry ( QStringLiteral ( " Topol" ), " /layer2_" + postfix, QLatin1String ( " " ) );
88
86
@@ -127,19 +125,11 @@ void rulesDialog::readTest( int index, QgsProject *project )
127
125
newItem->setFlags ( newItem->flags () & ~Qt::ItemIsEditable );
128
126
mRulesTable ->setItem ( row, 2 , newItem );
129
127
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
-
138
128
// add layer ids to hidden columns
139
129
newItem = new QTableWidgetItem ( layer1Id );
140
- mRulesTable ->setItem ( row, 4 , newItem );
130
+ mRulesTable ->setItem ( row, 3 , newItem );
141
131
newItem = new QTableWidgetItem ( layer2Id );
142
- mRulesTable ->setItem ( row, 5 , newItem );
132
+ mRulesTable ->setItem ( row, 4 , newItem );
143
133
}
144
134
145
135
void rulesDialog::projectRead ()
@@ -197,19 +187,6 @@ void rulesDialog::showControls( const QString &testName )
197
187
{
198
188
mLayer2Box ->setVisible ( false );
199
189
}
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
-
213
190
}
214
191
215
192
void rulesDialog::addRule ()
@@ -250,13 +227,6 @@ void rulesDialog::addRule()
250
227
251
228
mRulesTable ->setItem ( row, 2 , newItem );
252
229
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
-
260
230
QString layer1ID, layer2ID;
261
231
// add layer ids to hidden columns
262
232
// -1 for "No layer" string
@@ -269,25 +239,23 @@ void rulesDialog::addRule()
269
239
270
240
// TODO: use setItemData (or something like that) instead of hidden columns
271
241
newItem = new QTableWidgetItem ( layer1ID );
272
- mRulesTable ->setItem ( row, 4 , newItem );
242
+ mRulesTable ->setItem ( row, 3 , newItem );
273
243
newItem = new QTableWidgetItem ( layer2ID );
274
- mRulesTable ->setItem ( row, 5 , newItem );
244
+ mRulesTable ->setItem ( row, 4 , newItem );
275
245
276
246
// save state to the project file.....
277
247
QString postfix = QStringLiteral ( " %1" ).arg ( row );
278
248
QgsProject *project = QgsProject::instance ();
279
249
280
250
project->writeEntry ( QStringLiteral ( " Topol" ), QStringLiteral ( " /testCount" ), row + 1 );
281
251
project->writeEntry ( QStringLiteral ( " Topol" ), " /testname_" + postfix, test );
282
- project->writeEntry ( QStringLiteral ( " Topol" ), " /tolerance_" + postfix, QStringLiteral ( " %1" ).arg ( mToleranceBox ->value () ) );
283
252
project->writeEntry ( QStringLiteral ( " Topol" ), " /layer1_" + postfix, layer1ID );
284
253
project->writeEntry ( QStringLiteral ( " Topol" ), " /layer2_" + postfix, layer2ID );
285
254
286
255
// reset controls to default
287
256
mRuleBox ->setCurrentIndex ( 0 );
288
257
mLayer1Box ->setCurrentIndex ( 0 );
289
258
mLayer2Box ->setCurrentIndex ( 0 );
290
- mToleranceBox ->setValue ( 0 );
291
259
}
292
260
293
261
void rulesDialog::deleteTest ()
0 commit comments