Skip to content

Commit 047c57c

Browse files
committedOct 17, 2011
Add more function help; Fix header email info
1 parent 1cc6bdd commit 047c57c

File tree

5 files changed

+45
-9
lines changed

5 files changed

+45
-9
lines changed
 

‎src/core/qgsexpression.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -359,10 +359,16 @@ FnDef QgsExpression::BuiltinFunctions[] =
359359
FnDef( "toreal", 1, fcnToReal, "Conversions" ),
360360
FnDef( "tostring", 1, fcnToString, "Conversions" ),
361361
// string manipulation
362-
FnDef( "lower", 1, fcnLower, "String" ),
363-
FnDef( "upper", 1, fcnUpper, "String" ),
364-
FnDef( "length", 1, fcnLength, "String" ),
365-
FnDef( "replace", 3, fcnReplace, "String" ),
362+
FnDef( "lower", 1, fcnLower, "String", "<b>Convert to lower case</b> "\
363+
"<br> Converts a string to lower case letters. " \
364+
"<br> <i>Usage:</i><br>lower('HELLO WORLD') will return 'hello world'"),
365+
FnDef( "upper", 1, fcnUpper, "String" , "<b>Convert to upper case</b> "\
366+
"<br> Converts a string to upper case letters. " \
367+
"<br> <i>Usage:</i><br>lower('hello world') will return 'HELLO WORLD'"),
368+
FnDef( "length", 1, fcnLength, "String", "<b>Length of string</b> "\
369+
"<br> Returns the legnth of a string. " \
370+
"<br> <i>Usage:</i><br>length('hello') will return 5"),
371+
FnDef( "replace", 3, fcnReplace, "String", "<b>Replace a section of a string.</b> "),
366372
FnDef( "regexp_replace", 3, fcnRegexpReplace, "String" ),
367373
FnDef( "substr", 3, fcnSubstr, "String" ),
368374
// geometry accessors

‎src/gui/qgsexpressionbuilderdialog.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/***************************************************************************
2+
qgisexpressionbuilderdialog.h - A genric expression string builder dialog.
3+
--------------------------------------
4+
Date : 29-May-2011
5+
Copyright : (C) 2011 by Nathan Woodrow
6+
Email : woodrow.nathan at gmail dot com
7+
***************************************************************************
8+
* *
9+
* This program is free software; you can redistribute it and/or modify *
10+
* it under the terms of the GNU General Public License as published by *
11+
* the Free Software Foundation; either version 2 of the License, or *
12+
* (at your option) any later version. *
13+
* *
14+
***************************************************************************/
15+
116
#include "qgsexpressionbuilderdialog.h"
217
#include <QSettings>
318

‎src/gui/qgsexpressionbuilderdialog.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
/***************************************************************************
2+
qgisexpressionbuilderdialog.h - A genric expression string builder dialog.
3+
--------------------------------------
4+
Date : 29-May-2011
5+
Copyright : (C) 2011 by Nathan Woodrow
6+
Email : woodrow.nathan at gmail dot com
7+
***************************************************************************
8+
* *
9+
* This program is free software; you can redistribute it and/or modify *
10+
* it under the terms of the GNU General Public License as published by *
11+
* the Free Software Foundation; either version 2 of the License, or *
12+
* (at your option) any later version. *
13+
* *
14+
***************************************************************************/
15+
116
#ifndef QGSEXPRESSIONBUILDERDIALOG_H
217
#define QGSEXPRESSIONBUILDERDIALOG_H
318

‎src/gui/qgsexpressionbuilderwidget.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/***************************************************************************
2-
qgisexpressionbuilder.cpp - A genric expression string builder widget.
2+
qgisexpressionbuilderwidget.cpp - A genric expression string builder widget.
33
--------------------------------------
44
Date : 29-May-2011
55
Copyright : (C) 2011 by Nathan Woodrow
6-
Email : nathan.woodrow at gmail dot com
6+
Email : woodrow.nathan at gmail dot com
77
***************************************************************************
88
* *
99
* This program is free software; you can redistribute it and/or modify *

‎src/gui/qgsexpressionbuilderwidget.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/***************************************************************************
2-
qgisexpressionbuilder.h - A genric expression string builder widget.
2+
qgisexpressionbuilderwidget.h - A genric expression string builder widget.
33
--------------------------------------
44
Date : 29-May-2011
5-
Copyright : (C) 2006 by Nathan Woodrow
6-
Email : nathan.woodrow at gmail dot com
5+
Copyright : (C) 2011 by Nathan Woodrow
6+
Email : woodrow.nathan at gmail dot com
77
***************************************************************************
88
* *
99
* This program is free software; you can redistribute it and/or modify *

0 commit comments

Comments
 (0)
Please sign in to comment.