Skip to content

Commit 957c4f1

Browse files
vinayanvinayan
committed
Merge pull request #593 from mach0/topocheck
modified topology checker mostly GUI overhaul
2 parents 7962361 + cfaa71c commit 957c4f1

File tree

5 files changed

+177
-172
lines changed

5 files changed

+177
-172
lines changed

‎src/plugins/topology/checkDock.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ checkDock::checkDock( QgisInterface* qIface, QWidget* parent )
8787
connect( mValidateAllButton, SIGNAL( clicked() ), this, SLOT( validateAll() ) );
8888
//connect( mValidateSelectedButton, SIGNAL( clicked() ), this, SLOT( validateSelected() ) );
8989
connect( mValidateExtentButton, SIGNAL( clicked() ), this, SLOT( validateExtent() ) );
90-
connect( mToggleRubberbands, SIGNAL( clicked() ), this, SLOT( toggleErrorMarkers() ) );
90+
connect( mToggleRubberband, SIGNAL( clicked() ), this, SLOT( toggleErrorMarker() ) );
9191

9292
connect( mFixButton, SIGNAL( clicked() ), this, SLOT( fix() ) );
9393
connect( mErrorTableView, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( errorListClicked( const QModelIndex & ) ) );
@@ -380,6 +380,7 @@ void checkDock::runTests( ValidateType type )
380380
mErrorList << errors;
381381
}
382382
mMarkersVisible = true;
383+
mToggleRubberband->setChecked( true );
383384
mErrorListModel->resetModel();
384385
}
385386

@@ -406,6 +407,7 @@ void checkDock::validate( ValidateType type )
406407
clearVertexMarkers();
407408

408409
mErrorTableView->resizeColumnsToContents();
410+
mToggleRubberband->setChecked( true );
409411
}
410412

411413
void checkDock::validateExtent()
@@ -423,21 +425,19 @@ void checkDock::validateSelected()
423425
validate( ValidateSelected );
424426
}
425427

426-
void checkDock::toggleErrorMarkers()
428+
void checkDock::toggleErrorMarker()
427429
{
428-
QList<QgsRubberBand*>::const_iterator it;
429-
for ( it = mRbErrorMarkers.begin(); it != mRbErrorMarkers.end(); ++it )
430-
{
431-
QgsRubberBand* rb = *it;
432-
if ( mMarkersVisible == true )
433-
{
434-
rb->hide();
435-
}
436-
else
430+
QList<QgsRubberBand*>::const_iterator it;
431+
for ( it = mRbErrorMarkers.begin(); it != mRbErrorMarkers.end(); ++it )
437432
{
438-
rb->show();
433+
QgsRubberBand* rb = *it;
434+
if ( mToggleRubberband->isChecked() )
435+
{
436+
rb->show();
437+
}
438+
else
439+
{
440+
rb->hide();
441+
}
439442
}
440-
}
441-
mMarkersVisible = !mMarkersVisible;
442-
443443
}

‎src/plugins/topology/checkDock.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class checkDock : public QDockWidget, public Ui::checkDock
7676
/**
7777
* toggles the visibility of rubber band error markers
7878
*/
79-
void toggleErrorMarkers();
79+
void toggleErrorMarker();
8080
/**
8181
* Handles error selection
8282
* @param index clicked index in the table

‎src/plugins/topology/checkDock.ui

+61-47
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,65 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>436</width>
10-
<height>439</height>
9+
<width>307</width>
10+
<height>280</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Topology Checker</string>
1515
</property>
1616
<widget class="QWidget" name="dockWidgetContents">
17-
<layout class="QGridLayout" name="gridLayout">
17+
<layout class="QGridLayout" name="gridLayout_2">
1818
<item row="0" column="0">
19-
<layout class="QVBoxLayout" name="verticalLayout">
19+
<layout class="QHBoxLayout" name="horizontalLayout">
2020
<item>
21-
<layout class="QHBoxLayout" name="horizontalLayout">
22-
<item>
23-
<widget class="QPushButton" name="mValidateAllButton">
24-
<property name="text">
25-
<string>Validate All</string>
26-
</property>
27-
</widget>
28-
</item>
29-
<item>
30-
<widget class="QPushButton" name="mValidateExtentButton">
31-
<property name="text">
32-
<string>Validate Extent</string>
33-
</property>
34-
</widget>
35-
</item>
36-
</layout>
21+
<widget class="QTableView" name="mErrorTableView"/>
3722
</item>
23+
</layout>
24+
</item>
25+
<item row="1" column="0">
26+
<layout class="QHBoxLayout" name="horizontalLayout_4">
3827
<item>
39-
<widget class="QPushButton" name="mToggleRubberbands">
28+
<widget class="QPushButton" name="mConfigureButton">
4029
<property name="text">
41-
<string>Toggle Error Markers</string>
30+
<string>Configure</string>
4231
</property>
4332
</widget>
4433
</item>
34+
</layout>
35+
</item>
36+
<item row="2" column="0">
37+
<layout class="QHBoxLayout" name="horizontalLayout_3">
4538
<item>
46-
<widget class="QTableView" name="mErrorTableView"/>
39+
<widget class="QPushButton" name="mValidateAllButton">
40+
<property name="text">
41+
<string>Validate All</string>
42+
</property>
43+
</widget>
44+
</item>
45+
<item>
46+
<widget class="QPushButton" name="mValidateExtentButton">
47+
<property name="text">
48+
<string>Validate Extent</string>
49+
</property>
50+
</widget>
51+
</item>
52+
</layout>
53+
</item>
54+
<item row="3" column="0">
55+
<layout class="QHBoxLayout" name="horizontalLayout_5">
56+
<item>
57+
<widget class="QCheckBox" name="mToggleRubberband">
58+
<property name="toolTip">
59+
<string>Show topology errors</string>
60+
</property>
61+
<property name="text">
62+
<string>Show errors</string>
63+
</property>
64+
<property name="checked">
65+
<bool>false</bool>
66+
</property>
67+
</widget>
4768
</item>
4869
<item>
4970
<widget class="QLabel" name="mComment">
@@ -52,32 +73,25 @@
5273
</property>
5374
</widget>
5475
</item>
55-
<item>
56-
<layout class="QHBoxLayout" name="horizontalLayout_2">
57-
<item>
58-
<widget class="QPushButton" name="mConfigureButton">
59-
<property name="text">
60-
<string>Configure</string>
61-
</property>
62-
</widget>
63-
</item>
64-
<item>
65-
<widget class="QComboBox" name="mFixBox">
66-
<item>
67-
<property name="text">
68-
<string>Select automatic fix</string>
69-
</property>
70-
</item>
71-
</widget>
72-
</item>
76+
</layout>
77+
</item>
78+
<item row="4" column="0">
79+
<layout class="QGridLayout" name="gridLayout">
80+
<item row="0" column="0">
81+
<widget class="QComboBox" name="mFixBox">
7382
<item>
74-
<widget class="QPushButton" name="mFixButton">
75-
<property name="text">
76-
<string>Fix!</string>
77-
</property>
78-
</widget>
83+
<property name="text">
84+
<string>Select automatic fix</string>
85+
</property>
7986
</item>
80-
</layout>
87+
</widget>
88+
</item>
89+
<item row="0" column="1">
90+
<widget class="QPushButton" name="mFixButton">
91+
<property name="text">
92+
<string>Fix!</string>
93+
</property>
94+
</widget>
8195
</item>
8296
</layout>
8397
</item>

0 commit comments

Comments
 (0)