Skip to content

Commit 41a04d0

Browse files
nirvnnirvn
committedFeb 4, 2019
[ui] Improve 3D map scene config dialog (fixes #20685)
·
ltr-3_40final-3_6_0
1 parent ed45181 commit 41a04d0

File tree

1 file changed

+256
-231
lines changed

1 file changed

+256
-231
lines changed
 

‎src/ui/3d/map3dconfigwidget.ui

Lines changed: 256 additions & 231 deletions
Original file line numberDiff line numberDiff line change
@@ -6,250 +6,275 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>691</width>
10-
<height>1122</height>
9+
<width>465</width>
10+
<height>565</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Configure 3D Map Rendering</string>
15-
</property>
15+
</property>
1616
<layout class="QVBoxLayout" name="verticalLayout">
1717
<item>
18-
<widget class="QgsCollapsibleGroupBox" name="groupTerrain">
19-
<property name="title">
20-
<string>Terrain</string>
21-
</property>
22-
<layout class="QGridLayout" name="gridLayout">
23-
<item row="2" column="0">
24-
<widget class="QLabel" name="label_3">
25-
<property name="text">
26-
<string>Tile resolution</string>
27-
</property>
28-
</widget>
29-
</item>
30-
<item row="0" column="0">
31-
<widget class="QLabel" name="label">
32-
<property name="text">
33-
<string>Elevation</string>
34-
</property>
35-
</widget>
36-
</item>
37-
<item row="0" column="1" colspan="2">
38-
<widget class="QgsMapLayerComboBox" name="cboTerrainLayer"/>
39-
</item>
40-
<item row="1" column="0">
41-
<widget class="QLabel" name="label_2">
42-
<property name="text">
43-
<string>Vertical scale</string>
44-
</property>
45-
</widget>
46-
</item>
47-
<item row="1" column="1" colspan="2">
48-
<widget class="QgsDoubleSpinBox" name="spinTerrainScale">
49-
<property name="value">
50-
<double>1.000000000000000</double>
51-
</property>
52-
</widget>
53-
</item>
54-
<item row="2" column="1" colspan="2">
55-
<widget class="QgsSpinBox" name="spinTerrainResolution">
56-
<property name="suffix">
57-
<string> px</string>
58-
</property>
59-
<property name="maximum">
60-
<number>4096</number>
61-
</property>
62-
</widget>
63-
</item>
64-
<item row="3" column="0">
65-
<widget class="QLabel" name="label_8">
66-
<property name="text">
67-
<string>Skirt height</string>
68-
</property>
69-
</widget>
70-
</item>
71-
<item row="3" column="1" colspan="2">
72-
<widget class="QgsDoubleSpinBox" name="spinTerrainSkirtHeight">
73-
<property name="suffix">
74-
<string> map units</string>
75-
</property>
76-
<property name="decimals">
77-
<number>1</number>
78-
</property>
79-
<property name="maximum">
80-
<double>10000.000000000000000</double>
81-
</property>
82-
<property name="singleStep">
83-
<double>10.000000000000000</double>
84-
</property>
85-
</widget>
86-
</item>
87-
<item row="4" column="0">
88-
<widget class="QLabel" name="label_9">
89-
<property name="text">
90-
<string>Map theme</string>
91-
</property>
92-
</widget>
93-
</item>
94-
<item row="4" column="1" colspan="2">
95-
<widget class="QComboBox" name="cboTerrainMapTheme">
96-
<property name="editable">
97-
<bool>false</bool>
98-
</property>
99-
</widget>
100-
</item>
101-
</layout>
102-
</widget>
103-
</item>
104-
<item>
105-
<widget class="QgsCollapsibleGroupBox" name="groupTerrainShading">
106-
<property name="title">
107-
<string>Terrain shading</string>
108-
</property>
109-
<property name="checkable">
18+
<widget class="QgsScrollArea" name="scrollArea">
19+
<property name="widgetResizable">
11020
<bool>true</bool>
11121
</property>
112-
<layout class="QVBoxLayout" name="verticalLayout_2">
113-
<item>
114-
<widget class="QgsPhongMaterialWidget" name="widgetTerrainMaterial" native="true"/>
115-
</item>
116-
</layout>
117-
</widget>
118-
</item>
119-
<item>
120-
<widget class="QgsCollapsibleGroupBox" name="groupLights">
121-
<property name="title">
122-
<string>Lights</string>
123-
</property>
124-
<layout class="QVBoxLayout" name="verticalLayout_3">
125-
<item>
126-
<widget class="QgsLightsWidget" name="widgetLights" native="true"/>
127-
</item>
128-
</layout>
22+
<widget class="QWidget" name="scrollAreaWidgetContents">
23+
<property name="geometry">
24+
<rect>
25+
<x>0</x>
26+
<y>-303</y>
27+
<width>557</width>
28+
<height>1004</height>
29+
</rect>
30+
</property>
31+
<layout class="QVBoxLayout" name="verticalInnerLayout">
32+
<item>
33+
<widget class="QgsCollapsibleGroupBox" name="groupTerrain">
34+
<property name="title">
35+
<string>Terrain</string>
36+
</property>
37+
<layout class="QGridLayout" name="gridLayout">
38+
<item row="2" column="0">
39+
<widget class="QLabel" name="label_3">
40+
<property name="text">
41+
<string>Tile resolution</string>
42+
</property>
43+
</widget>
44+
</item>
45+
<item row="0" column="0">
46+
<widget class="QLabel" name="label">
47+
<property name="text">
48+
<string>Elevation</string>
49+
</property>
50+
</widget>
51+
</item>
52+
<item row="0" column="1" colspan="2">
53+
<widget class="QgsMapLayerComboBox" name="cboTerrainLayer"/>
54+
</item>
55+
<item row="1" column="0">
56+
<widget class="QLabel" name="label_2">
57+
<property name="text">
58+
<string>Vertical scale</string>
59+
</property>
60+
</widget>
61+
</item>
62+
<item row="1" column="1" colspan="2">
63+
<widget class="QgsDoubleSpinBox" name="spinTerrainScale">
64+
<property name="value">
65+
<double>1.000000000000000</double>
66+
</property>
67+
</widget>
68+
</item>
69+
<item row="2" column="1" colspan="2">
70+
<widget class="QgsSpinBox" name="spinTerrainResolution">
71+
<property name="suffix">
72+
<string> px</string>
73+
</property>
74+
<property name="maximum">
75+
<number>4096</number>
76+
</property>
77+
</widget>
78+
</item>
79+
<item row="3" column="0">
80+
<widget class="QLabel" name="label_8">
81+
<property name="text">
82+
<string>Skirt height</string>
83+
</property>
84+
</widget>
85+
</item>
86+
<item row="3" column="1" colspan="2">
87+
<widget class="QgsDoubleSpinBox" name="spinTerrainSkirtHeight">
88+
<property name="suffix">
89+
<string> map units</string>
90+
</property>
91+
<property name="decimals">
92+
<number>1</number>
93+
</property>
94+
<property name="maximum">
95+
<double>10000.000000000000000</double>
96+
</property>
97+
<property name="singleStep">
98+
<double>10.000000000000000</double>
99+
</property>
100+
</widget>
101+
</item>
102+
<item row="4" column="0">
103+
<widget class="QLabel" name="label_9">
104+
<property name="text">
105+
<string>Map theme</string>
106+
</property>
107+
</widget>
108+
</item>
109+
<item row="4" column="1" colspan="2">
110+
<widget class="QComboBox" name="cboTerrainMapTheme">
111+
<property name="editable">
112+
<bool>false</bool>
113+
</property>
114+
</widget>
115+
</item>
116+
</layout>
117+
</widget>
118+
</item>
119+
<item>
120+
<widget class="QgsCollapsibleGroupBox" name="groupTerrainShading">
121+
<property name="title">
122+
<string>Terrain shading</string>
123+
</property>
124+
<property name="checkable">
125+
<bool>true</bool>
126+
</property>
127+
<layout class="QVBoxLayout" name="verticalLayout_2">
128+
<item>
129+
<widget class="QgsPhongMaterialWidget" name="widgetTerrainMaterial" native="true"/>
130+
</item>
131+
</layout>
132+
</widget>
133+
</item>
134+
<item>
135+
<widget class="QgsCollapsibleGroupBox" name="groupLights">
136+
<property name="title">
137+
<string>Lights</string>
138+
</property>
139+
<layout class="QVBoxLayout" name="verticalLayout_3">
140+
<item>
141+
<widget class="QgsLightsWidget" name="widgetLights" native="true"/>
142+
</item>
143+
</layout>
144+
</widget>
145+
</item>
146+
<item>
147+
<layout class="QGridLayout" name="gridLayout_2">
148+
<item row="2" column="0">
149+
<widget class="QLabel" name="label_6">
150+
<property name="text">
151+
<string>Max. ground error</string>
152+
</property>
153+
</widget>
154+
</item>
155+
<item row="0" column="0">
156+
<widget class="QLabel" name="label_4">
157+
<property name="text">
158+
<string>Map tile resolution</string>
159+
</property>
160+
</widget>
161+
</item>
162+
<item row="0" column="1">
163+
<widget class="QgsSpinBox" name="spinMapResolution">
164+
<property name="suffix">
165+
<string> px</string>
166+
</property>
167+
<property name="maximum">
168+
<number>4096</number>
169+
</property>
170+
</widget>
171+
</item>
172+
<item row="1" column="0">
173+
<widget class="QLabel" name="label_5">
174+
<property name="text">
175+
<string>Max. screen error</string>
176+
</property>
177+
</widget>
178+
</item>
179+
<item row="2" column="1">
180+
<widget class="QgsDoubleSpinBox" name="spinGroundError">
181+
<property name="suffix">
182+
<string> map units</string>
183+
</property>
184+
<property name="decimals">
185+
<number>1</number>
186+
</property>
187+
<property name="minimum">
188+
<double>0.100000000000000</double>
189+
</property>
190+
<property name="maximum">
191+
<double>1000.000000000000000</double>
192+
</property>
193+
<property name="value">
194+
<double>1.000000000000000</double>
195+
</property>
196+
</widget>
197+
</item>
198+
<item row="3" column="0">
199+
<widget class="QLabel" name="label_7">
200+
<property name="text">
201+
<string>Zoom levels</string>
202+
</property>
203+
</widget>
204+
</item>
205+
<item row="3" column="1">
206+
<widget class="QLabel" name="labelZoomLevels">
207+
<property name="text">
208+
<string>0</string>
209+
</property>
210+
</widget>
211+
</item>
212+
<item row="1" column="1">
213+
<widget class="QgsDoubleSpinBox" name="spinScreenError">
214+
<property name="suffix">
215+
<string> px</string>
216+
</property>
217+
<property name="decimals">
218+
<number>1</number>
219+
</property>
220+
</widget>
221+
</item>
222+
</layout>
223+
</item>
224+
<item>
225+
<widget class="QCheckBox" name="chkShowLabels">
226+
<property name="text">
227+
<string>Show labels</string>
228+
</property>
229+
</widget>
230+
</item>
231+
<item>
232+
<widget class="QCheckBox" name="chkShowTileInfo">
233+
<property name="text">
234+
<string>Show map tile info</string>
235+
</property>
236+
</widget>
237+
</item>
238+
<item>
239+
<widget class="QCheckBox" name="chkShowBoundingBoxes">
240+
<property name="text">
241+
<string>Show bounding boxes</string>
242+
</property>
243+
</widget>
244+
</item>
245+
<item>
246+
<widget class="QCheckBox" name="chkShowCameraViewCenter">
247+
<property name="text">
248+
<string>Show camera's view center</string>
249+
</property>
250+
</widget>
251+
</item>
252+
<item>
253+
<spacer name="verticalSpacer">
254+
<property name="orientation">
255+
<enum>Qt::Vertical</enum>
256+
</property>
257+
<property name="sizeHint" stdset="0">
258+
<size>
259+
<width>20</width>
260+
<height>0</height>
261+
</size>
262+
</property>
263+
</spacer>
264+
</item>
265+
</layout>
266+
</widget>
129267
</widget>
130268
</item>
131-
<item>
132-
<layout class="QGridLayout" name="gridLayout_2">
133-
<item row="2" column="0">
134-
<widget class="QLabel" name="label_6">
135-
<property name="text">
136-
<string>Max. ground error</string>
137-
</property>
138-
</widget>
139-
</item>
140-
<item row="0" column="0">
141-
<widget class="QLabel" name="label_4">
142-
<property name="text">
143-
<string>Map tile resolution</string>
144-
</property>
145-
</widget>
146-
</item>
147-
<item row="0" column="1">
148-
<widget class="QgsSpinBox" name="spinMapResolution">
149-
<property name="suffix">
150-
<string> px</string>
151-
</property>
152-
<property name="maximum">
153-
<number>4096</number>
154-
</property>
155-
</widget>
156-
</item>
157-
<item row="1" column="0">
158-
<widget class="QLabel" name="label_5">
159-
<property name="text">
160-
<string>Max. screen error</string>
161-
</property>
162-
</widget>
163-
</item>
164-
<item row="2" column="1">
165-
<widget class="QgsDoubleSpinBox" name="spinGroundError">
166-
<property name="suffix">
167-
<string> map units</string>
168-
</property>
169-
<property name="decimals">
170-
<number>1</number>
171-
</property>
172-
<property name="minimum">
173-
<double>0.100000000000000</double>
174-
</property>
175-
<property name="maximum">
176-
<double>1000.000000000000000</double>
177-
</property>
178-
<property name="value">
179-
<double>1.000000000000000</double>
180-
</property>
181-
</widget>
182-
</item>
183-
<item row="3" column="0">
184-
<widget class="QLabel" name="label_7">
185-
<property name="text">
186-
<string>Zoom levels</string>
187-
</property>
188-
</widget>
189-
</item>
190-
<item row="3" column="1">
191-
<widget class="QLabel" name="labelZoomLevels">
192-
<property name="text">
193-
<string>0</string>
194-
</property>
195-
</widget>
196-
</item>
197-
<item row="1" column="1">
198-
<widget class="QgsDoubleSpinBox" name="spinScreenError">
199-
<property name="suffix">
200-
<string> px</string>
201-
</property>
202-
<property name="decimals">
203-
<number>1</number>
204-
</property>
205-
</widget>
206-
</item>
207-
</layout>
208-
</item>
209-
<item>
210-
<widget class="QCheckBox" name="chkShowLabels">
211-
<property name="text">
212-
<string>Show labels</string>
213-
</property>
214-
</widget>
215-
</item>
216-
<item>
217-
<widget class="QCheckBox" name="chkShowTileInfo">
218-
<property name="text">
219-
<string>Show map tile info</string>
220-
</property>
221-
</widget>
222-
</item>
223-
<item>
224-
<widget class="QCheckBox" name="chkShowBoundingBoxes">
225-
<property name="text">
226-
<string>Show bounding boxes</string>
227-
</property>
228-
</widget>
229-
</item>
230-
<item>
231-
<widget class="QCheckBox" name="chkShowCameraViewCenter">
232-
<property name="text">
233-
<string>Show camera's view center</string>
234-
</property>
235-
</widget>
236-
</item>
237-
<item>
238-
<spacer name="verticalSpacer">
239-
<property name="orientation">
240-
<enum>Qt::Vertical</enum>
241-
</property>
242-
<property name="sizeHint" stdset="0">
243-
<size>
244-
<width>20</width>
245-
<height>0</height>
246-
</size>
247-
</property>
248-
</spacer>
249-
</item>
250269
</layout>
251270
</widget>
252271
<customwidgets>
272+
<customwidget>
273+
<class>QgsScrollArea</class>
274+
<extends>QScrollArea</extends>
275+
<header>qgsscrollarea.h</header>
276+
<container>1</container>
277+
</customwidget>
253278
<customwidget>
254279
<class>QgsDoubleSpinBox</class>
255280
<extends>QDoubleSpinBox</extends>

0 commit comments

Comments
 (0)
Please sign in to comment.