more function help improvements

jef-n · jef-n · commit decb98184f93 · 2012-07-23T01:36:59.000+02:00
diff --git a/resources/function_help/$area-de_DE b/resources/function_help/$area-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $area</h3>
+Liefert den Flächeninhalt des aktuellen Objekts
+
+<h4>Syntax</h4>
+<pre>$area</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$area &rarr; 4711.42</pre>
+
diff --git a/resources/function_help/$area-en_US b/resources/function_help/$area-en_US
@@ -0,0 +1,12 @@
+<h3>$area function</h3>
+Returns the area size of the current feature.
+
+<h4>Syntax</h4>
+<pre>$area</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$area &rarr; 42</pre>
+
diff --git a/resources/function_help/$id-de_DE b/resources/function_help/$id-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $id</h3>
+Liefert die Feature-ID des aktuellen Objekts zurück.
+
+<h4>Syntax</h4>
+<pre>$id</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$id &rarr; 42</pre>
+
diff --git a/resources/function_help/$id-en_US b/resources/function_help/$id-en_US
@@ -0,0 +1,12 @@
+<h3>$id function</h3>
+Returns the feature id of the current row.
+
+<h4>Syntax</h4>
+<pre>$id</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$id &rarr; 42</pre>
+
diff --git a/resources/function_help/$length-de_DE b/resources/function_help/$length-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $length</h3>
+Liefert die Länge der aktuellen Geometrie.
+
+<h4>Syntax</h4>
+<pre>$length</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$length &rarr; 42.4711</pre>
+
diff --git a/resources/function_help/$length-en_US b/resources/function_help/$length-en_US
@@ -0,0 +1,12 @@
+<h3>$length function</h3>
+Returns the length the current feature.
+
+<h4>Syntax</h4>
+<pre>$length</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$length &rarr; 42.4711</pre>
+
diff --git a/resources/function_help/$perimeter-de_DE b/resources/function_help/$perimeter-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $perimeter</h3>
+Liefert den Umfang des aktuellen Objekts zurück.
+
+<h4>Syntax</h4>
+<pre>$perimeter</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$perimeter &rarr; 42</pre>
+
diff --git a/resources/function_help/$perimeter-en_US b/resources/function_help/$perimeter-en_US
@@ -0,0 +1,12 @@
+<h3>$perimeter function</h3>
+Returns the perimeter length of the current feature.
+
+<h4>Syntax</h4>
+<pre>$perimeter</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$perimeter &rarr; 42</pre>
+
diff --git a/resources/function_help/$rownum-de_DE b/resources/function_help/$rownum-de_DE
@@ -0,0 +1,11 @@
+<h3>Funktion $rownum</h3>
+Ergibt die Zeilennummer des aktuellen Datensatzes
+
+<h4>Syntax</h4>
+<pre>$rownum</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$rownum &rarr; 4711</pre>
diff --git a/resources/function_help/$rownum-en_US b/resources/function_help/$rownum-en_US
@@ -0,0 +1,12 @@
+<h3>$rownum function</h3>
+Returns the number of the current row.
+
+<h4>Syntax</h4>
+<pre>$rownum</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$rownum &rarr; 4711</pre>
+
diff --git a/resources/function_help/$x-de_DE b/resources/function_help/$x-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $x</h3>
+Liefert die X-Koordinate des aktuellen Punkts zurück.
+
+<h4>Syntax</h4>
+<pre>$x</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$x &rarr; 42</pre>
+
diff --git a/resources/function_help/$x-en_US b/resources/function_help/$x-en_US
@@ -0,0 +1,12 @@
+<h3>$x function</h3>
+Returns the x coordinate of the current feature.
+
+<h4>Syntax</h4>
+<pre>$x</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$x &rarr; 42</pre>
+
diff --git a/resources/function_help/$y-de_DE b/resources/function_help/$y-de_DE
@@ -0,0 +1,12 @@
+<h3>Funktion $y</h3>
+Liefert die Y-Koordinate des aktuellen Objekts zurück.
+
+<h4>Syntax</h4>
+<pre>$y</pre>
+
+<h4>Argumente</h4>
+Keine
+
+<h4>Beispiel</h4>
+<pre>$y &rarr; 42</pre>
+
diff --git a/resources/function_help/$y-en_US b/resources/function_help/$y-en_US
@@ -0,0 +1,12 @@
+<h3>$y function</h3>
+Returns the y coordinate of the current feature.
+
+<h4>Syntax</h4>
+<pre>$y</pre>
+
+<h4>Arguments</h4>
+None
+
+<h4>Example</h4>
+<pre>$y &rarr; 42</pre>
+
diff --git a/resources/function_help/Bedingungen-de_DE b/resources/function_help/Bedingungen-de_DE
@@ -0,0 +1,2 @@
+<h3>Gruppe Bedingungen</h3>
+Dies Gruppe enthält Funktionen die mit Bedingungen umgehen.
diff --git a/resources/function_help/Conditions-en_US b/resources/function_help/Conditions-en_US
@@ -0,0 +1,2 @@
+<h3>Conditions Group</h3>
+This group contains functions that operate on condition.
diff --git a/resources/function_help/Date and Time-de_DE b/resources/function_help/Date and Time-de_DE
diff --git a/resources/function_help/Datensatz-de_DE b/resources/function_help/Datensatz-de_DE
@@ -0,0 +1 @@
+<h3>Gruppe Datensatz</h3>
diff --git a/resources/function_help/Datum und Zeit-de_DE b/resources/function_help/Datum und Zeit-de_DE
@@ -0,0 +1,2 @@
+<h3>Datum- und Zeitgruppe</h3>
+Diese Gruppe enthält Funktionen zur Verarbeitung von Daten und Zeiten.
diff --git a/resources/function_help/Felder und Werte-de_DE b/resources/function_help/Felder und Werte-de_DE
diff --git a/resources/function_help/Geometrie-de_DE b/resources/function_help/Geometrie-de_DE
@@ -1,2 +1,2 @@
-<h3>Geometrie-Gruppe</h3>
+<h3>Gruppe Geometrie</h3>
 Dies Gruppe enthält Funktionen für Geometrieobjekten (z.B. Länge und Flächeninhalt).
diff --git a/resources/function_help/Mathematik-de_DE b/resources/function_help/Mathematik-de_DE
@@ -1,2 +1,2 @@
-<h3>Mathematik-Gruppe</h3>
+<h3>Gruppe Mathematik</h3>
 Die Gruppe enthält mathematische Funktionen (z.B. Quadratwurzel, Sinus und Cosinus)
diff --git a/resources/function_help/Operatoren-de_DE b/resources/function_help/Operatoren-de_DE
@@ -1,2 +1,2 @@
-<h3>Operatoren-Gruppe</h3>
+<h3>Gruppe Operatoren</h3>
 Die Gruppe enthält Operatoren (z.B. +, - und *)
diff --git a/resources/function_help/Record-de_DE b/resources/function_help/Record-de_DE
diff --git a/resources/function_help/Umwandlungen-de_DE b/resources/function_help/Umwandlungen-de_DE
diff --git a/resources/function_help/Zeichenketten-de_DE b/resources/function_help/Zeichenketten-de_DE
@@ -1,2 +1,2 @@
-<h3>Zeichenketten-Gruppe</h3>
+<h3>Gruppe Zeichenketten</h3>
 Dies Gruppen enthält Funktionen für Zeichenketten (z.B. Ersetzen und in Großbuchstaben umwandeln).
diff --git a/resources/function_help/concat-de_DE b/resources/function_help/concat-de_DE
@@ -0,0 +1,13 @@
+<h3>Funktion concat()</h3>
+Fügt Zeichenketten zu einer zusammen.
+
+<p><h4>Syntax</h4>
+     substr(<i>zeichenkette<i>[, <i>zeichenkette</i>...])</p>
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  zeichenkette</i> &rarr; ist string.  Ein Zeichenkette.<br>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+     concat('a','b','c','d','e') &rarr; 'abcde'</p>
diff --git a/resources/function_help/concat-en_US b/resources/function_help/concat-en_US
@@ -0,0 +1,13 @@
+<h3>concat() function</h3>
+Concatenates several strings to one.
+
+<h4>Syntax</h4>
+     concat(<i>string<i>[,<i>string</i>...])
+
+<h4>Arguments</h4>
+<!-- List args for functions here-->
+<i>  string</i> &rarr; is string.  a string.<br>
+
+<h4>Example</h4>
+<!-- Show example of function.-->
+     concat('a','b','c','d','e') &rarr; 'abcde'
diff --git a/resources/function_help/regexp_replace-de_DE b/resources/function_help/regexp_replace-de_DE
@@ -0,0 +1,15 @@
+<h3>Funktion regexp_replace()</h3>
+Liefert eine Zeichenkette in der der angegebene reguläre Ausdruck ersetzt wurde.
+
+<p><h4>Syntax</h4>
+     regexp_replace(<i>a</i>, <i>streiche</i>, <i>setze</i>)
+
+<p><h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>a</i> &rarr; ist string.  Die ursprüngliche Zeichenkette.<br>
+<i>streiche</i> &rarr; ist string.  Die zu ersetzende reguläre Ausdruck.<br>
+<i>setze</i> &rarr; ist string.  Die Zeichenkette durch die <i>streiche</i> ersetzt werden soll<br></p>
+
+<p><h4>Beispiel</h4>
+<!-- Show example of function.-->
+<pre>regexp_replace('QGIS SHOULD ROCK','(SHOULD)','DOES (was:\1)')</pre> &rarr; 'QGIS DOES (was: SHOULD) ROCK'
diff --git a/resources/function_help/regexp_replace-en_US b/resources/function_help/regexp_replace-en_US
@@ -0,0 +1,15 @@
+<h3>regexp_replace() function</h3>
+Returns a string with the supplied regular expression replaced.
+
+<p><h4>Syntax</h4>
+     replace(<i>string,before,after</i>)</p>
+
+<p><h4>Arguments</h4>
+<!-- List args for functions here-->
+<i>  string</i> &rarr; is string.  The start string.<br>
+<i>  before</i> &rarr; is string.  The string to replace.<br>
+<i>  after</i> &rarr; is string.  The string that will replace <i>before</i><br></p>
+
+<p><h4>Example</h4>
+<!-- Show example of function.-->
+     replace('QGIS SHOULD ROCK','SHOULD','DOES') &rarr; 'QGIS DOES ROCK'</p>
diff --git a/resources/function_help/strpos-de_DE b/resources/function_help/strpos-de_DE
@@ -0,0 +1,17 @@
+<h3>Funktion strpos()</h3>
+Bestimmt die Position eines regulären Ausdrucks in einer Zeichenkette.
+
+<h4>Syntax</h4>
+     strpos(<i>heuhaufen<i>,<i>nadel</i>)
+<br><br>
+Gibt -1 zurück, wenn der Ausdruck nicht gefunden wurde.
+
+<h4>Argumente</h4>
+<!-- List args for functions here-->
+<i>  heuhaufen</i> &rarr; ist string.  Zeichenkette in der gesucht werden soll.<br>
+<i>  nadel</i> &rarr; ist string.  Der gesuchte reguläre Ausdruck.<br>
+
+<h4>Beispiel</h4>
+<!-- Show example of function.-->
+     strpos('HELLO WORLD','WORLD') &rarr; 6<br>
+     strpos('HELLO WORLD','GOOD BYE') &rarr; -1<br>
diff --git a/resources/function_help/strpos-en_US b/resources/function_help/strpos-en_US
@@ -0,0 +1,17 @@
+<h3>strpos() function</h3>
+Return the index of a regular expression in a string.
+
+<h4>Syntax</h4>
+     strpos(<i>haystack</i>, <i>needle</i>)
+<br><br>
+Returns -1 if the expression isn't found.
+
+<p><h4>Arguments</h4>
+<!-- List args for functions here-->
+<i>  haystack</i> &rarr; is string.  The string that is to be searched.<br>
+<i>  needle</i> &rarr; is number.  The regular expression to look for.<br>
+
+<h4>Example</h4>
+<!-- Show example of function.-->
+     strpos('HELLO WORLD','WORLD') &rarr; 6<br>
+     strpos('HELLO WORLD','GOODBYE') &rarr; -1<br>
diff --git a/resources/function_help/xat-de_DE b/resources/function_help/xat-de_DE
@@ -0,0 +1,11 @@
+<h3>Funktion xat</h3>
+Liefert eine X-Koordinate der Geometrie der aktuellen Geometrie.
+
+<h4>Syntax</h4>
+<code>xat(i)</code>
+
+<h4>Argumente</h4>
+<code>i</code> - ist int. X-Koordinate des n-ten Punkts einer Linie (Indizes beginnen bei 0; Negative Werte beziehen sich auf das Linienende)
+
+<h4>Beispiel</h4>
+<pre>xat(1) &rarr; 5</pre>
diff --git a/resources/function_help/xat-en_US b/resources/function_help/xat-en_US
@@ -0,0 +1,11 @@
+<h3>xat function</h3>
+Retrieves a x coordinate of the current feature
+
+<h4>Syntax</h4>
+<code>xat(i)</code>
+
+<h4>Arguments</h4>
+<code>i<code> - is int. index of point of a line (indices start at 0; negative values apply to the last index).
+
+<h4>Example</h4>
+<pre>xat(1) &rarr; 5</pre>
diff --git a/resources/function_help/yat-de_DE b/resources/function_help/yat-de_DE
@@ -0,0 +1,11 @@
+<h3>Funktion yat</h3>
+Liefert eine Y-Koordinate der Geometrie der aktuellen Geometrie.
+
+<h4>Syntax</h4>
+<code>xat(i)</code>
+
+<h4>Argumente</h4>
+<code>i</code> - ist int. Y-Koordinate des n-ten Punkts einer Linie (Indizes beginnen bei 0; Negative Werte beziehen sich auf das Linienende)
+
+<h4>Beispiel</h4>
+<pre>yat(1) &rarr; 5</pre>
diff --git a/resources/function_help/yat-en_US b/resources/function_help/yat-en_US
@@ -0,0 +1,11 @@
+<h3>yat function</h3>
+Retrieves a y coordinate of the current feature
+
+<h4>Syntax</h4>
+<code>yat(i)</code>
+
+<h4>Arguments</h4>
+<code>i<code> - is int. index of point of a line (indices start at 0; negative values apply to the last index).
+
+<h4>Example</h4>
+<pre>yat(1) &rarr; 5</pre>
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
@@ -785,7 +785,8 @@ const QList<QgsExpression::FunctionDef> &QgsExpression::BuiltinFunctions()
     << FunctionDef( "todate", 1, fcnToDate, QObject::tr( "Conversions" ) )
     << FunctionDef( "totime", 1, fcnToTime, QObject::tr( "Conversions" ) )
     << FunctionDef( "tointerval", 1, fcnToInterval, QObject::tr( "Conversions" ) )
-    << FunctionDef( "coalesce", -1, fcnCoalesce, QObject::tr( "Conversions" ) )
+    // conditionals
+    << FunctionDef( "coalesce", -1, fcnCoalesce, QObject::tr( "Conditionals" ) )
     // Date and Time
     << FunctionDef( "$now", 0, fcnNow, QObject::tr( "Date and Time" ) )
     << FunctionDef( "age", 2, fcnAge, QObject::tr( "Date and Time" ) )
