RuleExpressionBuilder.patch
src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp (working copy) | ||
---|---|---|
176 | 176 |
#include "qgscategorizedsymbolrendererv2widget.h" |
177 | 177 |
#include "qgsgraduatedsymbolrendererv2.h" |
178 | 178 |
#include "qgsgraduatedsymbolrendererv2widget.h" |
179 |
#include "qgssearchquerybuilder.h" |
|
179 | 180 |
#include <QDialogButtonBox> |
180 | 181 |
#include <QInputDialog> |
181 | 182 | |
... | ... | |
315 | 316 |
l->addWidget( symbolSel ); |
316 | 317 |
groupSymbol->setLayout( l ); |
317 | 318 | |
319 |
connect( btnExpressionBuilder, SIGNAL( clicked() ), this, SLOT( buildExpreesion() ) ); |
|
318 | 320 |
connect( btnTestFilter, SIGNAL( clicked() ), this, SLOT( testFilter() ) ); |
319 | 321 |
} |
320 | 322 | |
323 |
void QgsRendererRulePropsDialog::buildExpreesion() |
|
324 |
{ |
|
325 |
QgsSearchQueryBuilder dlg( mLayer, this ); |
|
326 |
dlg.setSearchString( editFilter->text() ); |
|
327 | ||
328 |
if ( dlg.exec() ) |
|
329 |
editFilter->setText( dlg.searchString() ); |
|
330 |
} |
|
331 | ||
321 | 332 |
void QgsRendererRulePropsDialog::testFilter() |
322 | 333 |
{ |
323 | 334 |
QgsSearchString filterParsed; |
src/gui/symbology-ng/qgsrulebasedrendererv2widget.h (working copy) | ||
---|---|---|
110 | 110 | |
111 | 111 |
public slots: |
112 | 112 |
void testFilter(); |
113 |
void buildExpreesion(); |
|
113 | 114 | |
114 | 115 |
protected: |
115 | 116 |
QgsRuleBasedRendererV2::Rule mRule; |
src/ui/qgsrendererrulepropsdialogbase.ui (working copy) | ||
---|---|---|
16 | 16 |
<layout class="QVBoxLayout" name="verticalLayout"> |
17 | 17 |
<item> |
18 | 18 |
<layout class="QHBoxLayout" name="horizontalLayout"> |
19 |
<property name="rightMargin"> |
|
20 |
<number>0</number> |
|
21 |
</property> |
|
19 | 22 |
<item> |
20 | 23 |
<widget class="QLabel" name="label"> |
21 | 24 |
<property name="text"> |
... | ... | |
27 | 30 |
<widget class="QLineEdit" name="editFilter"/> |
28 | 31 |
</item> |
29 | 32 |
<item> |
33 |
<widget class="QPushButton" name="btnExpressionBuilder"> |
|
34 |
<property name="sizePolicy"> |
|
35 |
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> |
|
36 |
<horstretch>0</horstretch> |
|
37 |
<verstretch>0</verstretch> |
|
38 |
</sizepolicy> |
|
39 |
</property> |
|
40 |
<property name="text"> |
|
41 |
<string>Builder</string> |
|
42 |
</property> |
|
43 |
</widget> |
|
44 |
</item> |
|
45 |
<item> |
|
30 | 46 |
<widget class="QPushButton" name="btnTestFilter"> |
31 | 47 |
<property name="text"> |
32 | 48 |
<string>Test</string> |