Skip to content

Commit 7cad24d

Browse files
alexbruyalexbruy
committedJan 15, 2018
[processing] improve layout of the raster calculator dialog
·
ltr-3_40final-3_0_0
1 parent 490aad1 commit 7cad24d

File tree

5 files changed

+294
-415
lines changed

5 files changed

+294
-415
lines changed
 

‎python/plugins/processing/algs/qgis/ui/AddNewExpressionDialog.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>596</width>
10-
<height>300</height>
9+
<width>424</width>
10+
<height>221</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎python/plugins/processing/algs/qgis/ui/ExpressionWidget.ui

Lines changed: 0 additions & 410 deletions
This file was deleted.

‎python/plugins/processing/algs/qgis/ui/PredefinedExpressionDialog.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
10-
<height>300</height>
9+
<width>287</width>
10+
<height>201</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">

‎python/plugins/processing/algs/qgis/ui/RasterCalculatorWidget.ui

Lines changed: 289 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,289 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<ui version="4.0">
3+
<class>Form</class>
4+
<widget class="QWidget" name="Form">
5+
<property name="geometry">
6+
<rect>
7+
<x>0</x>
8+
<y>0</y>
9+
<width>706</width>
10+
<height>445</height>
11+
</rect>
12+
</property>
13+
<property name="windowTitle">
14+
<string>Form</string>
15+
</property>
16+
<layout class="QVBoxLayout" name="verticalLayout_3">
17+
<item>
18+
<widget class="QSplitter" name="splitter">
19+
<property name="orientation">
20+
<enum>Qt::Horizontal</enum>
21+
</property>
22+
<widget class="QGroupBox" name="groupBox">
23+
<property name="title">
24+
<string>Layers</string>
25+
</property>
26+
<layout class="QVBoxLayout" name="verticalLayout">
27+
<item>
28+
<widget class="QListWidget" name="listWidget"/>
29+
</item>
30+
</layout>
31+
</widget>
32+
<widget class="QGroupBox" name="buttonsGroupBox">
33+
<property name="title">
34+
<string>Operators</string>
35+
</property>
36+
<layout class="QGridLayout" name="gridLayout">
37+
<item row="1" column="2">
38+
<widget class="QPushButton" name="mACosButton">
39+
<property name="text">
40+
<string>acos</string>
41+
</property>
42+
</widget>
43+
</item>
44+
<item row="1" column="3">
45+
<widget class="QPushButton" name="mASinButton">
46+
<property name="text">
47+
<string>asin</string>
48+
</property>
49+
</widget>
50+
</item>
51+
<item row="0" column="0">
52+
<widget class="QPushButton" name="mPlusPushButton">
53+
<property name="text">
54+
<string>+</string>
55+
</property>
56+
</widget>
57+
</item>
58+
<item row="2" column="0">
59+
<widget class="QPushButton" name="mExpButton">
60+
<property name="text">
61+
<string>^</string>
62+
</property>
63+
</widget>
64+
</item>
65+
<item row="3" column="2">
66+
<widget class="QPushButton" name="mEqualButton">
67+
<property name="text">
68+
<string>=</string>
69+
</property>
70+
</widget>
71+
</item>
72+
<item row="3" column="0">
73+
<widget class="QPushButton" name="mLessButton">
74+
<property name="text">
75+
<string>&lt;</string>
76+
</property>
77+
</widget>
78+
</item>
79+
<item row="1" column="0">
80+
<widget class="QPushButton" name="mMinusPushButton">
81+
<property name="text">
82+
<string>-</string>
83+
</property>
84+
</widget>
85+
</item>
86+
<item row="0" column="8">
87+
<spacer name="horizontalSpacer_3">
88+
<property name="orientation">
89+
<enum>Qt::Horizontal</enum>
90+
</property>
91+
<property name="sizeHint" stdset="0">
92+
<size>
93+
<width>2</width>
94+
<height>20</height>
95+
</size>
96+
</property>
97+
</spacer>
98+
</item>
99+
<item row="0" column="1">
100+
<widget class="QPushButton" name="mMultiplyPushButton">
101+
<property name="text">
102+
<string>*</string>
103+
</property>
104+
</widget>
105+
</item>
106+
<item row="3" column="4">
107+
<widget class="QPushButton" name="mLesserEqualButton">
108+
<property name="text">
109+
<string>&lt;=</string>
110+
</property>
111+
</widget>
112+
</item>
113+
<item row="1" column="1">
114+
<widget class="QPushButton" name="mDividePushButton">
115+
<property name="text">
116+
<string>/</string>
117+
</property>
118+
</widget>
119+
</item>
120+
<item row="2" column="5">
121+
<widget class="QPushButton" name="mCloseBracketPushButton">
122+
<property name="text">
123+
<string>)</string>
124+
</property>
125+
</widget>
126+
</item>
127+
<item row="0" column="3">
128+
<widget class="QPushButton" name="mSinButton">
129+
<property name="text">
130+
<string>sin</string>
131+
</property>
132+
</widget>
133+
</item>
134+
<item row="0" column="5">
135+
<widget class="QPushButton" name="mAndButton">
136+
<property name="text">
137+
<string>AND</string>
138+
</property>
139+
</widget>
140+
</item>
141+
<item row="2" column="2">
142+
<widget class="QPushButton" name="mTanButton">
143+
<property name="text">
144+
<string>tan</string>
145+
</property>
146+
</widget>
147+
</item>
148+
<item row="3" column="5">
149+
<widget class="QPushButton" name="mGreaterEqualButton">
150+
<property name="text">
151+
<string>&gt;=</string>
152+
</property>
153+
</widget>
154+
</item>
155+
<item row="3" column="3">
156+
<widget class="QPushButton" name="mNotEqualButton">
157+
<property name="text">
158+
<string>!=</string>
159+
</property>
160+
</widget>
161+
</item>
162+
<item row="3" column="1">
163+
<widget class="QPushButton" name="mGreaterButton">
164+
<property name="text">
165+
<string>&gt;</string>
166+
</property>
167+
</widget>
168+
</item>
169+
<item row="2" column="3">
170+
<widget class="QPushButton" name="mATanButton">
171+
<property name="text">
172+
<string>atan</string>
173+
</property>
174+
</widget>
175+
</item>
176+
<item row="0" column="2">
177+
<widget class="QPushButton" name="mCosButton">
178+
<property name="text">
179+
<string>cos</string>
180+
</property>
181+
</widget>
182+
</item>
183+
<item row="2" column="1">
184+
<widget class="QPushButton" name="mSqrtButton">
185+
<property name="text">
186+
<string>sqrt</string>
187+
</property>
188+
</widget>
189+
</item>
190+
<item row="0" column="4">
191+
<widget class="QPushButton" name="mLogButton">
192+
<property name="text">
193+
<string>log10</string>
194+
</property>
195+
</widget>
196+
</item>
197+
<item row="1" column="5">
198+
<widget class="QPushButton" name="mOrButton">
199+
<property name="text">
200+
<string>OR</string>
201+
</property>
202+
</widget>
203+
</item>
204+
<item row="2" column="4">
205+
<widget class="QPushButton" name="mOpenBracketPushButton">
206+
<property name="text">
207+
<string>(</string>
208+
</property>
209+
</widget>
210+
</item>
211+
<item row="1" column="4">
212+
<widget class="QPushButton" name="mLnButton">
213+
<property name="text">
214+
<string>ln</string>
215+
</property>
216+
</widget>
217+
</item>
218+
<item row="4" column="2">
219+
<spacer name="verticalSpacer">
220+
<property name="orientation">
221+
<enum>Qt::Vertical</enum>
222+
</property>
223+
<property name="sizeHint" stdset="0">
224+
<size>
225+
<width>20</width>
226+
<height>40</height>
227+
</size>
228+
</property>
229+
</spacer>
230+
</item>
231+
</layout>
232+
</widget>
233+
</widget>
234+
</item>
235+
<item>
236+
<widget class="QGroupBox" name="groupBox_3">
237+
<property name="title">
238+
<string>Expression</string>
239+
</property>
240+
<layout class="QVBoxLayout" name="verticalLayout_2">
241+
<item>
242+
<widget class="QPlainTextEdit" name="text"/>
243+
</item>
244+
</layout>
245+
</widget>
246+
</item>
247+
<item>
248+
<widget class="QGroupBox" name="groupBox_4">
249+
<property name="title">
250+
<string>Predefined expressions</string>
251+
</property>
252+
<layout class="QHBoxLayout" name="horizontalLayout">
253+
<item>
254+
<widget class="QComboBox" name="comboPredefined"/>
255+
</item>
256+
<item>
257+
<widget class="QPushButton" name="buttonAddPredefined">
258+
<property name="sizePolicy">
259+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
260+
<horstretch>0</horstretch>
261+
<verstretch>0</verstretch>
262+
</sizepolicy>
263+
</property>
264+
<property name="text">
265+
<string>Add…</string>
266+
</property>
267+
</widget>
268+
</item>
269+
<item>
270+
<widget class="QPushButton" name="buttonSavePredefined">
271+
<property name="sizePolicy">
272+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
273+
<horstretch>0</horstretch>
274+
<verstretch>0</verstretch>
275+
</sizepolicy>
276+
</property>
277+
<property name="text">
278+
<string>Save…</string>
279+
</property>
280+
</widget>
281+
</item>
282+
</layout>
283+
</widget>
284+
</item>
285+
</layout>
286+
</widget>
287+
<resources/>
288+
<connections/>
289+
</ui>

‎python/plugins/processing/algs/qgis/ui/RasterCalculatorWidgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def okPressed(self):
8888

8989

9090
WIDGET, BASE = uic.loadUiType(
91-
os.path.join(pluginPath, 'ExpressionWidget.ui'))
91+
os.path.join(pluginPath, 'RasterCalculatorWidget.ui'))
9292

9393

9494
class ExpressionWidget(BASE, WIDGET):

0 commit comments

Comments
 (0)
Please sign in to comment.