Add missing ~ operator to expression builder

qgis · Jan 19, 2017 · 1f3c67f8e31835bda7551f7ea4a0f9598bc84926 · 1f3c67f
1 parent f43dc8e
commit 1f3c67f8e31835bda7551f7ea4a0f9598bc84926
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/resources/function_help/json/op_regex b/resources/function_help/json/op_regex
@@ -0,0 +1,14 @@
+{
+  "name": "~",
+  "type": "operator",
+  "description": "Performs a regular expression match on a string value.",
+  "arguments": [
+        { "arg": "string", "description": "A string value" },
+        { "arg": "regex", "description": "A regular expression. Slashes must be escaped, eg \\\\\\\\d." }
+  ],
+  "examples": [
+	{ "expression":"'hello' ~ 'll'", "returns":"1"},
+	{ "expression":"'hello' ~ '^ll'", "returns":"0"},
+	{ "expression":"'hello' ~ 'llo$'", "returns":"1"}
+  ]
+}
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -453,6 +453,7 @@ void QgsExpressionBuilderWidget::updateFunctionTree()
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( "%" ), QStringLiteral( " % " ) );
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( "^" ), QStringLiteral( " ^ " ) );
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( "=" ), QStringLiteral( " = " ) );
+  registerItem( QStringLiteral( "Operators" ), QStringLiteral( "~" ), QStringLiteral( " ~ " ) );
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( ">" ), QStringLiteral( " > " ) );
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( "<" ), QStringLiteral( " < " ) );
   registerItem( QStringLiteral( "Operators" ), QStringLiteral( "<>" ), QStringLiteral( " <> " ) );