sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

avoid duplicate function help entry

Browse Source
This commit is contained in:
Juergen E. Fischer 2015-01-09 19:20:32 +01:00
parent bdd4388c53
commit b52fff303f
4 changed files with 41 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
resources/function_help/CMakeLists.txt
View File

@ -1,4 +1,5 @@
FILE(GLOB HELP_FILES *)
LIST(REMOVE_ITEM HELP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
SET(HELP_OUTPUT "${CMAKE_SOURCE_DIR}/src/core/qgsexpression_texts.cpp")

0
resources/function_help/Geometry → resources/function_help/GeometryGroup
View File

76
src/core/qgsexpression.cpp
View File

@ -1765,43 +1765,43 @@ const QList<QgsExpression::Function*> &QgsExpression::Functions()
<< new StaticFunction( "color_hsva", 4, fncColorHsva, "Color" )
<< new StaticFunction( "color_cmyk", 4, fcnColorCmyk, "Color" )
<< new StaticFunction( "color_cmyka", 5, fncColorCmyka, "Color" )
<< new StaticFunction( "$geometry", 0, fcnGeometry, "Geometry", "", true )
<< new StaticFunction( "$area", 0, fcnGeomArea, "Geometry", "", true )
<< new StaticFunction( "$length", 0, fcnGeomLength, "Geometry", "", true )
<< new StaticFunction( "$perimeter", 0, fcnGeomPerimeter, "Geometry", "", true )
<< new StaticFunction( "$x", 0, fcnX, "Geometry", "", true )
<< new StaticFunction( "$y", 0, fcnY, "Geometry", "", true )
<< new StaticFunction( "xat", 1, fcnXat, "Geometry", "", true )
<< new StaticFunction( "yat", 1, fcnYat, "Geometry", "", true )
<< new StaticFunction( "xmin", 1, fcnXMin, "Geometry", "", true )
<< new StaticFunction( "xmax", 1, fcnXMax, "Geometry", "", true )
<< new StaticFunction( "ymin", 1, fcnYMin, "Geometry", "", true )
<< new StaticFunction( "ymax", 1, fcnYMax, "Geometry", "", true )
<< new StaticFunction( "geomFromWKT", 1, fcnGeomFromWKT, "Geometry" )
<< new StaticFunction( "geomFromGML", 1, fcnGeomFromGML, "Geometry" )
<< new StaticFunction( "bbox", 2, fcnBbox, "Geometry" )
<< new StaticFunction( "disjoint", 2, fcnDisjoint, "Geometry" )
<< new StaticFunction( "intersects", 2, fcnIntersects, "Geometry" )
<< new StaticFunction( "touches", 2, fcnTouches, "Geometry" )
<< new StaticFunction( "crosses", 2, fcnCrosses, "Geometry" )
<< new StaticFunction( "contains", 2, fcnContains, "Geometry" )
<< new StaticFunction( "overlaps", 2, fcnOverlaps, "Geometry" )
<< new StaticFunction( "within", 2, fcnWithin, "Geometry" )
<< new StaticFunction( "buffer", -1, fcnBuffer, "Geometry" )
<< new StaticFunction( "centroid", 1, fcnCentroid, "Geometry" )
<< new StaticFunction( "bounds", 1, fcnBounds, "Geometry", "", true )
<< new StaticFunction( "bounds_width", 1, fcnBoundsWidth, "Geometry", "", true )
<< new StaticFunction( "bounds_height", 1, fcnBoundsHeight, "Geometry", "", true )
<< new StaticFunction( "convexHull", 1, fcnConvexHull, "Geometry" )
<< new StaticFunction( "difference", 2, fcnDifference, "Geometry" )
<< new StaticFunction( "distance", 2, fcnDistance, "Geometry" )
<< new StaticFunction( "intersection", 2, fcnIntersection, "Geometry" )
<< new StaticFunction( "symDifference", 2, fcnSymDifference, "Geometry" )
<< new StaticFunction( "combine", 2, fcnCombine, "Geometry" )
<< new StaticFunction( "union", 2, fcnCombine, "Geometry" )
<< new StaticFunction( "geomToWKT", -1, fcnGeomToWKT, "Geometry" )
<< new StaticFunction( "geometry", 1, fcnGetGeometry, "Geometry" )
<< new StaticFunction( "transform", 3, fcnTransformGeometry, "Geometry" )
<< new StaticFunction( "$geometry", 0, fcnGeometry, "GeometryGroup", "", true )
<< new StaticFunction( "$area", 0, fcnGeomArea, "GeometryGroup", "", true )
<< new StaticFunction( "$length", 0, fcnGeomLength, "GeometryGroup", "", true )
<< new StaticFunction( "$perimeter", 0, fcnGeomPerimeter, "GeometryGroup", "", true )
<< new StaticFunction( "$x", 0, fcnX, "GeometryGroup", "", true )
<< new StaticFunction( "$y", 0, fcnY, "GeometryGroup", "", true )
<< new StaticFunction( "xat", 1, fcnXat, "GeometryGroup", "", true )
<< new StaticFunction( "yat", 1, fcnYat, "GeometryGroup", "", true )
<< new StaticFunction( "xmin", 1, fcnXMin, "GeometryGroup", "", true )
<< new StaticFunction( "xmax", 1, fcnXMax, "GeometryGroup", "", true )
<< new StaticFunction( "ymin", 1, fcnYMin, "GeometryGroup", "", true )
<< new StaticFunction( "ymax", 1, fcnYMax, "GeometryGroup", "", true )
<< new StaticFunction( "geomFromWKT", 1, fcnGeomFromWKT, "GeometryGroup" )
<< new StaticFunction( "geomFromGML", 1, fcnGeomFromGML, "GeometryGroup" )
<< new StaticFunction( "bbox", 2, fcnBbox, "GeometryGroup" )
<< new StaticFunction( "disjoint", 2, fcnDisjoint, "GeometryGroup" )
<< new StaticFunction( "intersects", 2, fcnIntersects, "GeometryGroup" )
<< new StaticFunction( "touches", 2, fcnTouches, "GeometryGroup" )
<< new StaticFunction( "crosses", 2, fcnCrosses, "GeometryGroup" )
<< new StaticFunction( "contains", 2, fcnContains, "GeometryGroup" )
<< new StaticFunction( "overlaps", 2, fcnOverlaps, "GeometryGroup" )
<< new StaticFunction( "within", 2, fcnWithin, "GeometryGroup" )
<< new StaticFunction( "buffer", -1, fcnBuffer, "GeometryGroup" )
<< new StaticFunction( "centroid", 1, fcnCentroid, "GeometryGroup" )
<< new StaticFunction( "bounds", 1, fcnBounds, "GeometryGroup", "", true )
<< new StaticFunction( "bounds_width", 1, fcnBoundsWidth, "GeometryGroup", "", true )
<< new StaticFunction( "bounds_height", 1, fcnBoundsHeight, "GeometryGroup", "", true )
<< new StaticFunction( "convexHull", 1, fcnConvexHull, "GeometryGroup" )
<< new StaticFunction( "difference", 2, fcnDifference, "GeometryGroup" )
<< new StaticFunction( "distance", 2, fcnDistance, "GeometryGroup" )
<< new StaticFunction( "intersection", 2, fcnIntersection, "GeometryGroup" )
<< new StaticFunction( "symDifference", 2, fcnSymDifference, "GeometryGroup" )
<< new StaticFunction( "combine", 2, fcnCombine, "GeometryGroup" )
<< new StaticFunction( "union", 2, fcnCombine, "GeometryGroup" )
<< new StaticFunction( "geomToWKT", -1, fcnGeomToWKT, "GeometryGroup" )
<< new StaticFunction( "geometry", 1, fcnGetGeometry, "GeometryGroup" )
<< new StaticFunction( "transform", 3, fcnTransformGeometry, "GeometryGroup" )
<< new StaticFunction( "$rownum", 0, fcnRowNumber, "Record" )
<< new StaticFunction( "$id", 0, fcnFeatureId, "Record" )
<< new StaticFunction( "$currentfeature", 0, fcnFeature, "Record" )
@ -2836,7 +2836,7 @@ QString QgsExpression::group( QString name )
gGroups.insert( "Date and Time", QObject::tr( "Date and Time" ) );
gGroups.insert( "String", QObject::tr( "String" ) );
gGroups.insert( "Color", QObject::tr( "Color" ) );
gGroups.insert( "Geometry", QObject::tr( "Geometry" ) );
gGroups.insert( "GeometryGroup", QObject::tr( "Geometry" ) );
gGroups.insert( "Record", QObject::tr( "Record" ) );
}

4
src/core/qgsexpressionparser.yy
View File

@ -214,9 +214,9 @@ expression:
int fnIndex = QgsExpression::functionIndex(*$1);
if (fnIndex == -1)
{
if ( !QgsExpression::hasSpecialColumn( *$1 ) )
if ( !QgsExpression::hasSpecialColumn( *$1 ) )
{
exp_error(parser_ctx, "Special column is not known");
exp_error(parser_ctx, "Special column is not known");
YYERROR;
}
// $var is equivalent to _specialcol_( "$var" )