Skip to content

Commit

Permalink
Add more function help; Fix header email info
Browse files Browse the repository at this point in the history
  • Loading branch information
NathanW2 committed Oct 17, 2011
1 parent 1cc6bdd commit 047c57c
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 9 deletions.
14 changes: 10 additions & 4 deletions src/core/qgsexpression.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -359,10 +359,16 @@ FnDef QgsExpression::BuiltinFunctions[] =
FnDef( "toreal", 1, fcnToReal, "Conversions" ),
FnDef( "tostring", 1, fcnToString, "Conversions" ),
// string manipulation
FnDef( "lower", 1, fcnLower, "String" ),
FnDef( "upper", 1, fcnUpper, "String" ),
FnDef( "length", 1, fcnLength, "String" ),
FnDef( "replace", 3, fcnReplace, "String" ),
FnDef( "lower", 1, fcnLower, "String", "<b>Convert to lower case</b> "\
"<br> Converts a string to lower case letters. " \
"<br> <i>Usage:</i><br>lower('HELLO WORLD') will return 'hello world'"),
FnDef( "upper", 1, fcnUpper, "String" , "<b>Convert to upper case</b> "\
"<br> Converts a string to upper case letters. " \
"<br> <i>Usage:</i><br>lower('hello world') will return 'HELLO WORLD'"),
FnDef( "length", 1, fcnLength, "String", "<b>Length of string</b> "\
"<br> Returns the legnth of a string. " \
"<br> <i>Usage:</i><br>length('hello') will return 5"),
FnDef( "replace", 3, fcnReplace, "String", "<b>Replace a section of a string.</b> "),
FnDef( "regexp_replace", 3, fcnRegexpReplace, "String" ),
FnDef( "substr", 3, fcnSubstr, "String" ),
// geometry accessors
Expand Down
15 changes: 15 additions & 0 deletions src/gui/qgsexpressionbuilderdialog.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/***************************************************************************
qgisexpressionbuilderdialog.h - A genric expression string builder dialog.
--------------------------------------
Date : 29-May-2011
Copyright : (C) 2011 by Nathan Woodrow
Email : woodrow.nathan at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#include "qgsexpressionbuilderdialog.h"
#include <QSettings>

Expand Down
15 changes: 15 additions & 0 deletions src/gui/qgsexpressionbuilderdialog.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/***************************************************************************
qgisexpressionbuilderdialog.h - A genric expression string builder dialog.
--------------------------------------
Date : 29-May-2011
Copyright : (C) 2011 by Nathan Woodrow
Email : woodrow.nathan at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/

#ifndef QGSEXPRESSIONBUILDERDIALOG_H
#define QGSEXPRESSIONBUILDERDIALOG_H

Expand Down
4 changes: 2 additions & 2 deletions src/gui/qgsexpressionbuilderwidget.cpp
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/***************************************************************************
qgisexpressionbuilder.cpp - A genric expression string builder widget.
qgisexpressionbuilderwidget.cpp - A genric expression string builder widget.
--------------------------------------
Date : 29-May-2011
Copyright : (C) 2011 by Nathan Woodrow
Email : nathan.woodrow at gmail dot com
Email : woodrow.nathan at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
Expand Down
6 changes: 3 additions & 3 deletions src/gui/qgsexpressionbuilderwidget.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/***************************************************************************
qgisexpressionbuilder.h - A genric expression string builder widget.
qgisexpressionbuilderwidget.h - A genric expression string builder widget.
--------------------------------------
Date : 29-May-2011
Copyright : (C) 2006 by Nathan Woodrow
Email : nathan.woodrow at gmail dot com
Copyright : (C) 2011 by Nathan Woodrow
Email : woodrow.nathan at gmail dot com
***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
Expand Down

0 comments on commit 047c57c

Please sign in to comment.