Skip to content

Commit decb981

Browse files
jef-njef-n
committedJul 22, 2012
more function help improvements
·
ltr-3_40Before-merge-new_vector_api
1 parent d66c307 commit decb981

37 files changed

+314
-8
lines changed
 

‎resources/function_help/$area-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $area</h3>
2+
Liefert den Flächeninhalt des aktuellen Objekts
3+
4+
<h4>Syntax</h4>
5+
<pre>$area</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$area &rarr; 4711.42</pre>
12+

‎resources/function_help/$area-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$area function</h3>
2+
Returns the area size of the current feature.
3+
4+
<h4>Syntax</h4>
5+
<pre>$area</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$area &rarr; 42</pre>
12+

‎resources/function_help/$id-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $id</h3>
2+
Liefert die Feature-ID des aktuellen Objekts zurück.
3+
4+
<h4>Syntax</h4>
5+
<pre>$id</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$id &rarr; 42</pre>
12+

‎resources/function_help/$id-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$id function</h3>
2+
Returns the feature id of the current row.
3+
4+
<h4>Syntax</h4>
5+
<pre>$id</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$id &rarr; 42</pre>
12+

‎resources/function_help/$length-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $length</h3>
2+
Liefert die Länge der aktuellen Geometrie.
3+
4+
<h4>Syntax</h4>
5+
<pre>$length</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$length &rarr; 42.4711</pre>
12+

‎resources/function_help/$length-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$length function</h3>
2+
Returns the length the current feature.
3+
4+
<h4>Syntax</h4>
5+
<pre>$length</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$length &rarr; 42.4711</pre>
12+

‎resources/function_help/$perimeter-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $perimeter</h3>
2+
Liefert den Umfang des aktuellen Objekts zurück.
3+
4+
<h4>Syntax</h4>
5+
<pre>$perimeter</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$perimeter &rarr; 42</pre>
12+

‎resources/function_help/$perimeter-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$perimeter function</h3>
2+
Returns the perimeter length of the current feature.
3+
4+
<h4>Syntax</h4>
5+
<pre>$perimeter</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$perimeter &rarr; 42</pre>
12+

‎resources/function_help/$rownum-de_DE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<h3>Funktion $rownum</h3>
2+
Ergibt die Zeilennummer des aktuellen Datensatzes
3+
4+
<h4>Syntax</h4>
5+
<pre>$rownum</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$rownum &rarr; 4711</pre>

‎resources/function_help/$rownum-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$rownum function</h3>
2+
Returns the number of the current row.
3+
4+
<h4>Syntax</h4>
5+
<pre>$rownum</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$rownum &rarr; 4711</pre>
12+

‎resources/function_help/$x-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $x</h3>
2+
Liefert die X-Koordinate des aktuellen Punkts zurück.
3+
4+
<h4>Syntax</h4>
5+
<pre>$x</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$x &rarr; 42</pre>
12+

‎resources/function_help/$x-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$x function</h3>
2+
Returns the x coordinate of the current feature.
3+
4+
<h4>Syntax</h4>
5+
<pre>$x</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$x &rarr; 42</pre>
12+

‎resources/function_help/$y-de_DE

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>Funktion $y</h3>
2+
Liefert die Y-Koordinate des aktuellen Objekts zurück.
3+
4+
<h4>Syntax</h4>
5+
<pre>$y</pre>
6+
7+
<h4>Argumente</h4>
8+
Keine
9+
10+
<h4>Beispiel</h4>
11+
<pre>$y &rarr; 42</pre>
12+

‎resources/function_help/$y-en_US

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<h3>$y function</h3>
2+
Returns the y coordinate of the current feature.
3+
4+
<h4>Syntax</h4>
5+
<pre>$y</pre>
6+
7+
<h4>Arguments</h4>
8+
None
9+
10+
<h4>Example</h4>
11+
<pre>$y &rarr; 42</pre>
12+

‎resources/function_help/Bedingungen-de_DE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3>Gruppe Bedingungen</h3>
2+
Dies Gruppe enthält Funktionen die mit Bedingungen umgehen.

‎resources/function_help/Conditions-en_US

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3>Conditions Group</h3>
2+
This group contains functions that operate on condition.

‎resources/function_help/Date and Time-de_DE

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

‎resources/function_help/Datensatz-de_DE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
<h3>Gruppe Datensatz</h3>

‎resources/function_help/Datum und Zeit-de_DE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
<h3>Datum- und Zeitgruppe</h3>
2+
Diese Gruppe enthält Funktionen zur Verarbeitung von Daten und Zeiten.

‎resources/function_help/Geometry-de_DE renamed to ‎resources/function_help/Geometrie-de_DE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<h3>Geometrie-Gruppe</h3>
1+
<h3>Gruppe Geometrie</h3>
22
Dies Gruppe enthält Funktionen für Geometrieobjekten (z.B. Länge und Flächeninhalt).

‎resources/function_help/Math-de_DE renamed to ‎resources/function_help/Mathematik-de_DE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<h3>Mathematik-Gruppe</h3>
1+
<h3>Gruppe Mathematik</h3>
22
Die Gruppe enthält mathematische Funktionen (z.B. Quadratwurzel, Sinus und Cosinus)

‎resources/function_help/Operators-de_DE renamed to ‎resources/function_help/Operatoren-de_DE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<h3>Operatoren-Gruppe</h3>
1+
<h3>Gruppe Operatoren</h3>
22
Die Gruppe enthält Operatoren (z.B. +, - und *)

‎resources/function_help/Record-de_DE

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎resources/function_help/String-de_DE renamed to ‎resources/function_help/Zeichenketten-de_DE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
<h3>Zeichenketten-Gruppe</h3>
1+
<h3>Gruppe Zeichenketten</h3>
22
Dies Gruppen enthält Funktionen für Zeichenketten (z.B. Ersetzen und in Großbuchstaben umwandeln).

‎resources/function_help/concat-de_DE

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>Funktion concat()</h3>
2+
Fügt Zeichenketten zu einer zusammen.
3+
4+
<p><h4>Syntax</h4>
5+
substr(<i>zeichenkette<i>[, <i>zeichenkette</i>...])</p>
6+
7+
<p><h4>Argumente</h4>
8+
<!-- List args for functions here-->
9+
<i> zeichenkette</i> &rarr; ist string. Ein Zeichenkette.<br>
10+
11+
<p><h4>Beispiel</h4>
12+
<!-- Show example of function.-->
13+
concat('a','b','c','d','e') &rarr; 'abcde'</p>

‎resources/function_help/concat-en_US

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<h3>concat() function</h3>
2+
Concatenates several strings to one.
3+
4+
<h4>Syntax</h4>
5+
concat(<i>string<i>[,<i>string</i>...])
6+
7+
<h4>Arguments</h4>
8+
<!-- List args for functions here-->
9+
<i> string</i> &rarr; is string. a string.<br>
10+
11+
<h4>Example</h4>
12+
<!-- Show example of function.-->
13+
concat('a','b','c','d','e') &rarr; 'abcde'

‎resources/function_help/regexp_replace-de_DE

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<h3>Funktion regexp_replace()</h3>
2+
Liefert eine Zeichenkette in der der angegebene reguläre Ausdruck ersetzt wurde.
3+
4+
<p><h4>Syntax</h4>
5+
regexp_replace(<i>a</i>, <i>streiche</i>, <i>setze</i>)
6+
7+
<p><h4>Argumente</h4>
8+
<!-- List args for functions here-->
9+
<i>a</i> &rarr; ist string. Die ursprüngliche Zeichenkette.<br>
10+
<i>streiche</i> &rarr; ist string. Die zu ersetzende reguläre Ausdruck.<br>
11+
<i>setze</i> &rarr; ist string. Die Zeichenkette durch die <i>streiche</i> ersetzt werden soll<br></p>
12+
13+
<p><h4>Beispiel</h4>
14+
<!-- Show example of function.-->
15+
<pre>regexp_replace('QGIS SHOULD ROCK','(SHOULD)','DOES (was:\1)')</pre> &rarr; 'QGIS DOES (was: SHOULD) ROCK'

‎resources/function_help/regexp_replace-en_US

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<h3>regexp_replace() function</h3>
2+
Returns a string with the supplied regular expression replaced.
3+
4+
<p><h4>Syntax</h4>
5+
replace(<i>string,before,after</i>)</p>
6+
7+
<p><h4>Arguments</h4>
8+
<!-- List args for functions here-->
9+
<i> string</i> &rarr; is string. The start string.<br>
10+
<i> before</i> &rarr; is string. The string to replace.<br>
11+
<i> after</i> &rarr; is string. The string that will replace <i>before</i><br></p>
12+
13+
<p><h4>Example</h4>
14+
<!-- Show example of function.-->
15+
replace('QGIS SHOULD ROCK','SHOULD','DOES') &rarr; 'QGIS DOES ROCK'</p>

‎resources/function_help/strpos-de_DE

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<h3>Funktion strpos()</h3>
2+
Bestimmt die Position eines regulären Ausdrucks in einer Zeichenkette.
3+
4+
<h4>Syntax</h4>
5+
strpos(<i>heuhaufen<i>,<i>nadel</i>)
6+
<br><br>
7+
Gibt -1 zurück, wenn der Ausdruck nicht gefunden wurde.
8+
9+
<h4>Argumente</h4>
10+
<!-- List args for functions here-->
11+
<i> heuhaufen</i> &rarr; ist string. Zeichenkette in der gesucht werden soll.<br>
12+
<i> nadel</i> &rarr; ist string. Der gesuchte reguläre Ausdruck.<br>
13+
14+
<h4>Beispiel</h4>
15+
<!-- Show example of function.-->
16+
strpos('HELLO WORLD','WORLD') &rarr; 6<br>
17+
strpos('HELLO WORLD','GOOD BYE') &rarr; -1<br>

‎resources/function_help/strpos-en_US

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<h3>strpos() function</h3>
2+
Return the index of a regular expression in a string.
3+
4+
<h4>Syntax</h4>
5+
strpos(<i>haystack</i>, <i>needle</i>)
6+
<br><br>
7+
Returns -1 if the expression isn't found.
8+
9+
<p><h4>Arguments</h4>
10+
<!-- List args for functions here-->
11+
<i> haystack</i> &rarr; is string. The string that is to be searched.<br>
12+
<i> needle</i> &rarr; is number. The regular expression to look for.<br>
13+
14+
<h4>Example</h4>
15+
<!-- Show example of function.-->
16+
strpos('HELLO WORLD','WORLD') &rarr; 6<br>
17+
strpos('HELLO WORLD','GOODBYE') &rarr; -1<br>

‎resources/function_help/xat-de_DE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<h3>Funktion xat</h3>
2+
Liefert eine X-Koordinate der Geometrie der aktuellen Geometrie.
3+
4+
<h4>Syntax</h4>
5+
<code>xat(i)</code>
6+
7+
<h4>Argumente</h4>
8+
<code>i</code> - ist int. X-Koordinate des n-ten Punkts einer Linie (Indizes beginnen bei 0; Negative Werte beziehen sich auf das Linienende)
9+
10+
<h4>Beispiel</h4>
11+
<pre>xat(1) &rarr; 5</pre>

‎resources/function_help/xat-en_US

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<h3>xat function</h3>
2+
Retrieves a x coordinate of the current feature
3+
4+
<h4>Syntax</h4>
5+
<code>xat(i)</code>
6+
7+
<h4>Arguments</h4>
8+
<code>i<code> - is int. index of point of a line (indices start at 0; negative values apply to the last index).
9+
10+
<h4>Example</h4>
11+
<pre>xat(1) &rarr; 5</pre>

‎resources/function_help/yat-de_DE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<h3>Funktion yat</h3>
2+
Liefert eine Y-Koordinate der Geometrie der aktuellen Geometrie.
3+
4+
<h4>Syntax</h4>
5+
<code>xat(i)</code>
6+
7+
<h4>Argumente</h4>
8+
<code>i</code> - ist int. Y-Koordinate des n-ten Punkts einer Linie (Indizes beginnen bei 0; Negative Werte beziehen sich auf das Linienende)
9+
10+
<h4>Beispiel</h4>
11+
<pre>yat(1) &rarr; 5</pre>

‎resources/function_help/yat-en_US

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<h3>yat function</h3>
2+
Retrieves a y coordinate of the current feature
3+
4+
<h4>Syntax</h4>
5+
<code>yat(i)</code>
6+
7+
<h4>Arguments</h4>
8+
<code>i<code> - is int. index of point of a line (indices start at 0; negative values apply to the last index).
9+
10+
<h4>Example</h4>
11+
<pre>yat(1) &rarr; 5</pre>

‎src/core/qgsexpression.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,8 @@ const QList<QgsExpression::FunctionDef> &QgsExpression::BuiltinFunctions()
785785
<< FunctionDef( "todate", 1, fcnToDate, QObject::tr( "Conversions" ) )
786786
<< FunctionDef( "totime", 1, fcnToTime, QObject::tr( "Conversions" ) )
787787
<< FunctionDef( "tointerval", 1, fcnToInterval, QObject::tr( "Conversions" ) )
788-
<< FunctionDef( "coalesce", -1, fcnCoalesce, QObject::tr( "Conversions" ) )
788+
// conditionals
789+
<< FunctionDef( "coalesce", -1, fcnCoalesce, QObject::tr( "Conditionals" ) )
789790
// Date and Time
790791
<< FunctionDef( "$now", 0, fcnNow, QObject::tr( "Date and Time" ) )
791792
<< FunctionDef( "age", 2, fcnAge, QObject::tr( "Date and Time" ) )

0 commit comments

Comments
 (0)
Please sign in to comment.