Skip to content

Commit 2a02aa0

Browse files
m-kuhnm-kuhn
committed
Improve Geometry Validation Dock Layout
This reduces distance between the error list and the buttons to zoom to the location.
1 parent 4e9c4b5 commit 2a02aa0

3 files changed

+80
-134
lines changed

‎src/app/qgsgeometryvalidationdock.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ QgsGeometryValidationDock::QgsGeometryValidationDock( const QString &title, QgsM
5050
connect( mMapCanvas, &QgsMapCanvas::currentLayerChanged, this, &QgsGeometryValidationDock::updateLayerTransform );
5151
connect( mMapCanvas, &QgsMapCanvas::destinationCrsChanged, this, &QgsGeometryValidationDock::updateLayerTransform );
5252
connect( mMapCanvas, &QgsMapCanvas::transformContextChanged, this, &QgsGeometryValidationDock::updateLayerTransform );
53-
connect( mTopologyChecksPendingButton, &QToolButton::clicked, this, &QgsGeometryValidationDock::triggerTopologyChecks );
5453

5554
mFeatureRubberband = new QgsRubberBand( mMapCanvas );
5655
mErrorRubberband = new QgsRubberBand( mMapCanvas );
@@ -131,13 +130,6 @@ void QgsGeometryValidationDock::zoomToFeature()
131130
}
132131
}
133132

134-
void QgsGeometryValidationDock::triggerTopologyChecks()
135-
{
136-
QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( mMapCanvas->currentLayer() );
137-
if ( layer )
138-
mGeometryValidationService->triggerTopologyChecks( layer );
139-
}
140-
141133
void QgsGeometryValidationDock::updateLayerTransform()
142134
{
143135
if ( !mMapCanvas->currentLayer() )
@@ -305,7 +297,6 @@ void QgsGeometryValidationDock::onLayerEditingStatusChanged()
305297
}
306298
}
307299
}
308-
mTopologyChecksPendingButton->setEnabled( enabled );
309300
}
310301

311302
void QgsGeometryValidationDock::onLayerDestroyed( QObject *layer )

‎src/app/qgsgeometryvalidationdock.h

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ class QgsGeometryValidationDock : public QgsDockWidget, public Ui_QgsGeometryVal
5353
void gotoPreviousError();
5454
void zoomToProblem();
5555
void zoomToFeature();
56-
void triggerTopologyChecks();
5756
void updateLayerTransform();
5857
void onDataChanged( const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector<int> &roles );
5958
void onRowsInserted();

‎src/ui/qgsgeometryvalidationdockbase.ui

+80-124
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,93 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>418</width>
10-
<height>404</height>
9+
<width>616</width>
10+
<height>968</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Geometry Validation</string>
1515
</property>
1616
<widget class="QWidget" name="dockWidgetContents">
1717
<layout class="QGridLayout" name="gridLayout_2">
18-
<item row="3" column="0" colspan="2">
18+
<item row="0" column="5">
19+
<spacer name="horizontalSpacer_4">
20+
<property name="orientation">
21+
<enum>Qt::Horizontal</enum>
22+
</property>
23+
<property name="sizeHint" stdset="0">
24+
<size>
25+
<width>0</width>
26+
<height>20</height>
27+
</size>
28+
</property>
29+
</spacer>
30+
</item>
31+
<item row="0" column="3">
32+
<widget class="QToolButton" name="mZoomToFeatureButton">
33+
<property name="text">
34+
<string>Zoom To Feature</string>
35+
</property>
36+
<property name="icon">
37+
<iconset resource="../../images/images.qrc">
38+
<normaloff>:/images/themes/default/mActionZoomToSelected.svg</normaloff>:/images/themes/default/mActionZoomToSelected.svg</iconset>
39+
</property>
40+
<property name="toolButtonStyle">
41+
<enum>Qt::ToolButtonTextBesideIcon</enum>
42+
</property>
43+
</widget>
44+
</item>
45+
<item row="0" column="6">
46+
<widget class="QToolButton" name="mNextButton">
47+
<property name="text">
48+
<string>Next</string>
49+
</property>
50+
<property name="arrowType">
51+
<enum>Qt::RightArrow</enum>
52+
</property>
53+
</widget>
54+
</item>
55+
<item row="0" column="2">
56+
<spacer name="horizontalSpacer_3">
57+
<property name="orientation">
58+
<enum>Qt::Horizontal</enum>
59+
</property>
60+
<property name="sizeHint" stdset="0">
61+
<size>
62+
<width>0</width>
63+
<height>20</height>
64+
</size>
65+
</property>
66+
</spacer>
67+
</item>
68+
<item row="0" column="4">
69+
<widget class="QToolButton" name="mZoomToProblemButton">
70+
<property name="text">
71+
<string>Zoom To Problem</string>
72+
</property>
73+
<property name="icon">
74+
<iconset resource="../../images/images.qrc">
75+
<normaloff>:/images/themes/default/mActionZoomToLayer.svg</normaloff>:/images/themes/default/mActionZoomToLayer.svg</iconset>
76+
</property>
77+
<property name="toolButtonStyle">
78+
<enum>Qt::ToolButtonTextBesideIcon</enum>
79+
</property>
80+
</widget>
81+
</item>
82+
<item row="0" column="1">
83+
<widget class="QToolButton" name="mPreviousButton">
84+
<property name="text">
85+
<string>Previous</string>
86+
</property>
87+
<property name="arrowType">
88+
<enum>Qt::LeftArrow</enum>
89+
</property>
90+
</widget>
91+
</item>
92+
<item row="1" column="0" colspan="8">
93+
<widget class="QListView" name="mErrorListView"/>
94+
</item>
95+
<item row="2" column="0" colspan="8">
1996
<widget class="QWidget" name="mProblemDetailWidget" native="true">
2097
<layout class="QGridLayout" name="gridLayout">
2198
<property name="leftMargin">
@@ -30,106 +107,6 @@
30107
<property name="bottomMargin">
31108
<number>0</number>
32109
</property>
33-
<item row="1" column="6">
34-
<widget class="QToolButton" name="mNextButton">
35-
<property name="text">
36-
<string>Next</string>
37-
</property>
38-
<property name="arrowType">
39-
<enum>Qt::RightArrow</enum>
40-
</property>
41-
</widget>
42-
</item>
43-
<item row="1" column="1">
44-
<widget class="QToolButton" name="mPreviousButton">
45-
<property name="text">
46-
<string>Previous</string>
47-
</property>
48-
<property name="arrowType">
49-
<enum>Qt::LeftArrow</enum>
50-
</property>
51-
</widget>
52-
</item>
53-
<item row="1" column="2">
54-
<spacer name="horizontalSpacer_3">
55-
<property name="orientation">
56-
<enum>Qt::Horizontal</enum>
57-
</property>
58-
<property name="sizeHint" stdset="0">
59-
<size>
60-
<width>0</width>
61-
<height>20</height>
62-
</size>
63-
</property>
64-
</spacer>
65-
</item>
66-
<item row="1" column="0">
67-
<spacer name="horizontalSpacer">
68-
<property name="orientation">
69-
<enum>Qt::Horizontal</enum>
70-
</property>
71-
<property name="sizeHint" stdset="0">
72-
<size>
73-
<width>0</width>
74-
<height>20</height>
75-
</size>
76-
</property>
77-
</spacer>
78-
</item>
79-
<item row="1" column="3">
80-
<widget class="QToolButton" name="mZoomToFeatureButton">
81-
<property name="text">
82-
<string>Zoom To Feature</string>
83-
</property>
84-
<property name="icon">
85-
<iconset resource="../../images/images.qrc">
86-
<normaloff>:/images/themes/default/mActionZoomToSelected.svg</normaloff>:/images/themes/default/mActionZoomToSelected.svg</iconset>
87-
</property>
88-
<property name="toolButtonStyle">
89-
<enum>Qt::ToolButtonTextBesideIcon</enum>
90-
</property>
91-
</widget>
92-
</item>
93-
<item row="1" column="4">
94-
<widget class="QToolButton" name="mZoomToProblemButton">
95-
<property name="text">
96-
<string>Zoom To Problem</string>
97-
</property>
98-
<property name="icon">
99-
<iconset resource="../../images/images.qrc">
100-
<normaloff>:/images/themes/default/mActionZoomToLayer.svg</normaloff>:/images/themes/default/mActionZoomToLayer.svg</iconset>
101-
</property>
102-
<property name="toolButtonStyle">
103-
<enum>Qt::ToolButtonTextBesideIcon</enum>
104-
</property>
105-
</widget>
106-
</item>
107-
<item row="1" column="7">
108-
<spacer name="horizontalSpacer_2">
109-
<property name="orientation">
110-
<enum>Qt::Horizontal</enum>
111-
</property>
112-
<property name="sizeHint" stdset="0">
113-
<size>
114-
<width>0</width>
115-
<height>20</height>
116-
</size>
117-
</property>
118-
</spacer>
119-
</item>
120-
<item row="1" column="5">
121-
<spacer name="horizontalSpacer_4">
122-
<property name="orientation">
123-
<enum>Qt::Horizontal</enum>
124-
</property>
125-
<property name="sizeHint" stdset="0">
126-
<size>
127-
<width>0</width>
128-
<height>20</height>
129-
</size>
130-
</property>
131-
</spacer>
132-
</item>
133110
<item row="0" column="2" colspan="4">
134111
<widget class="QLabel" name="mProblemDescriptionLabel">
135112
<property name="sizePolicy">
@@ -165,27 +142,6 @@
165142
</layout>
166143
</widget>
167144
</item>
168-
<item row="2" column="0" colspan="2">
169-
<widget class="QListView" name="mErrorListView"/>
170-
</item>
171-
<item row="0" column="1">
172-
<widget class="QToolButton" name="mTopologyChecksPendingButton">
173-
<property name="text">
174-
<string>…</string>
175-
</property>
176-
<property name="icon">
177-
<iconset resource="../../images/images.qrc">
178-
<normaloff>:/images/themes/default/mIconTopologicalEditing.svg</normaloff>:/images/themes/default/mIconTopologicalEditing.svg</iconset>
179-
</property>
180-
</widget>
181-
</item>
182-
<item row="1" column="0">
183-
<widget class="QLabel" name="mValidationRunningLabel">
184-
<property name="text">
185-
<string/>
186-
</property>
187-
</widget>
188-
</item>
189145
</layout>
190146
</widget>
191147
</widget>

0 commit comments

Comments
 (0)