Skip to content

Commit 41a330f

Browse files
committedSep 20, 2015
More expression help
1 parent 2a6cff4 commit 41a330f

File tree

9 files changed

+112
-7
lines changed

9 files changed

+112
-7
lines changed
 

‎resources/function_help/text/*

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>* multiplication operator</h3>
2+
<p>Multiplication of two values</p>
3+
<p>If one of the values is NULL the result will be NULL.</p>
4+
5+
<h4>Syntax</h4>
6+
<pre> value1 * value2 </pre>
7+
8+
<h4>Arguments</h4>
9+
None
10+
11+
<h4>Examples</h4>
12+
<pre> 5 * 4 &rarr; 20 </pre>
13+
<pre> 5 * NULL &rarr; NULL </pre>

‎resources/function_help/text/+

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>+ addition operator</h3>
2+
<p>Addition of two values</p>
3+
<p>If one of the values is NULL the result will be NULL.</p>
4+
5+
<h4>Syntax</h4>
6+
<pre> value1 + value2 </pre>
7+
8+
<h4>Arguments</h4>
9+
None
10+
11+
<h4>Examples</h4>
12+
<pre> 5 + 4 &rarr; 9 </pre>
13+
<pre> 5 + NULL &rarr; NULL </pre>

‎resources/function_help/text/-

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>- subtract operator</h3>
2+
<p>Subtraction of two values</p>
3+
<p>If one of the values is NULL the result will be NULL.</p>
4+
5+
<h4>Syntax</h4>
6+
<pre> value1 - value2 </pre>
7+
8+
<h4>Arguments</h4>
9+
None
10+
11+
<h4>Examples</h4>
12+
<pre> 5 - 4 &rarr; 1 </pre>
13+
<pre> 5 - NULL &rarr; NULL </pre>

‎resources/function_help/text/<

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>&lt; Less than operator</h3>
2+
<p>Compares two values and evaluates to 1 if the left value is less than the right value</p>
3+
4+
<h4>Syntax</h4>
5+
<pre> value1 &lt; value2 </pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Examples</h4>
11+
<pre> 5 &lt; 4 &rarr; 0 </pre>
12+
<pre> 5 &lt; 5 &rarr; 0 </pre>
13+
<pre> 4 &lt; 5 &rarr; 1 </pre>

‎resources/function_help/text/<=

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>&lt;= Less than or equal operator</h3>
2+
<p>Compares two values and evaluates to 1 if the left value is less than or equal to the right value</p>
3+
4+
<h4>Syntax</h4>
5+
<pre> value1 &lt;= value2 </pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Examples</h4>
11+
<pre> 5 &lt;= 4 &rarr; 0 </pre>
12+
<pre> 5 &lt;= 5 &rarr; 1 </pre>
13+
<pre> 4 &lt;= 5 &rarr; 1 </pre>

‎resources/function_help/text/<>

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<h3>&lt;&gt; Unequal operator</h3>
2+
<p>Compares two values and evaluates to 1 if they are not equal.</p>
3+
4+
<h4>Syntax</h4>
5+
<pre> value1 &lt;&gt; value2 </pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Examples</h4>
11+
<pre> 5 &lt;&gt; 4 &rarr; 1 </pre>
12+
<pre> 4 &lt;&gt; 4 &rarr; 0 </pre>
13+
<pre> 5 &lt;&gt; NULL &rarr; NULL </pre>
14+
<pre> NULL &lt;&gt; NULL &rarr; NULL </pre>

‎resources/function_help/text/>

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>&gt; Greater than operator</h3>
2+
<p>Compares two values and evaluates to 1 if the left value is greater than the right value</p>
3+
4+
<h4>Syntax</h4>
5+
<pre> value1 &gt; value2 </pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Examples</h4>
11+
<pre> 5 &gt; 4 &rarr; 1 </pre>
12+
<pre> 5 &gt; 5 &rarr; 0 </pre>
13+
<pre> 4 &gt; 5 &rarr; 0 </pre>

‎resources/function_help/text/>=

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>&gt;= Greater or equal operator</h3>
2+
<p>Compares two values and evaluates to 1 if the left value is greater than or equal to the right value</p>
3+
4+
<h4>Syntax</h4>
5+
<pre> value1 &gt;= value2 </pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Examples</h4>
11+
<pre> 5 &gt;= 4 &rarr; 1 </pre>
12+
<pre> 5 &gt;= 5 &rarr; 1 </pre>
13+
<pre> 4 &gt;= 5 &rarr; 0 </pre>

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -428,18 +428,18 @@ void QgsExpressionBuilderWidget::updateFunctionTree()
428428
mModel->clear();
429429
mExpressionGroups.clear();
430430
// TODO Can we move this stuff to QgsExpression, like the functions?
431-
registerItem( "Operators", "+", " + ", tr( "Addition operator" ) );
432-
registerItem( "Operators", "-", " - ", tr( "Subtraction operator" ) );
433-
registerItem( "Operators", "*", " * ", tr( "Multiplication operator" ) );
431+
registerItem( "Operators", "+", " + " );
432+
registerItem( "Operators", "-", " - " );
433+
registerItem( "Operators", "*", " * " );
434434
registerItem( "Operators", "/", " / ", tr( "Division operator" ) );
435435
registerItem( "Operators", "%", " % ", tr( "Modulo operator" ) );
436436
registerItem( "Operators", "^", " ^ ", tr( "Power operator" ) );
437437
registerItem( "Operators", "=", " = ", tr( "Equal operator" ) );
438-
registerItem( "Operators", ">", " > ", tr( "Greater as operator" ) );
439-
registerItem( "Operators", "<", " < ", tr( "Less than operator" ) );
438+
registerItem( "Operators", ">", " > " );
439+
registerItem( "Operators", "<", " < " );
440440
registerItem( "Operators", "<>", " <> ", tr( "Unequal operator" ) );
441-
registerItem( "Operators", "<=", " <= ", tr( "Less or equal operator" ) );
442-
registerItem( "Operators", ">=", " >= ", tr( "Greater or equal operator" ) );
441+
registerItem( "Operators", "<=", " <= " );
442+
registerItem( "Operators", ">=", " >= " );
443443
registerItem( "Operators", "||", " || " );
444444
registerItem( "Operators", "IN", " IN " );
445445
registerItem( "Operators", "LIKE", " LIKE " );

0 commit comments

Comments
 (0)
Please sign in to comment.