Skip to content
Permalink
Browse files

Fix bad regex

  • Loading branch information
nyalldawson committed May 27, 2018
1 parent 71107d1 commit 4b1b752633201de8c8623d9421a9938355614535
Showing with 51 additions and 51 deletions.
  1. +2 −2 python/core/auto_generated/effects/qgsimageoperation.sip.in
  2. +1 −1 python/core/auto_generated/geometry/qgsgeometry.sip.in
  3. +1 −1 python/core/auto_generated/geometry/qgspoint.sip.in
  4. +13 −13 python/core/auto_generated/geometry/qgstriangle.sip.in
  5. +1 −1 python/core/auto_generated/geometry/qgswkbtypes.sip.in
  6. +2 −2 python/core/auto_generated/layout/qgslayouttable.sip.in
  7. +1 −1 python/core/auto_generated/mesh/qgsmeshlayer.sip.in
  8. +3 −3 python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in
  9. +1 −1 python/core/auto_generated/qgsaggregatecalculator.sip.in
  10. +1 −1 python/core/auto_generated/qgscacheindex.sip.in
  11. +3 −3 python/core/auto_generated/qgscolorscheme.sip.in
  12. +3 −3 python/core/auto_generated/qgsdistancearea.sip.in
  13. +1 −1 python/core/auto_generated/qgsfield.sip.in
  14. +1 −1 python/core/auto_generated/qgsfontutils.sip.in
  15. +1 −1 python/core/auto_generated/qgsmaplayerstore.sip.in
  16. +1 −1 python/core/auto_generated/qgsmultirenderchecker.sip.in
  17. +3 −3 python/core/auto_generated/qgsproject.sip.in
  18. +1 −1 python/core/auto_generated/qgsproviderregistry.sip.in
  19. +2 −2 python/core/auto_generated/qgsrenderchecker.sip.in
  20. +2 −2 python/core/auto_generated/qgsvectordataprovider.sip.in
  21. +1 −1 python/core/auto_generated/qgsvectorlayer.sip.in
  22. +1 −1 python/core/auto_generated/raster/qgsrasterdataprovider.sip.in
  23. +2 −2 python/core/auto_generated/symbology/qgssymbol.sip.in
  24. +1 −1 python/gui/auto_generated/editorwidgets/core/qgseditorwidgetfactory.sip.in
  25. +1 −1 python/server/auto_generated/qgsserver.sip.in
  26. +1 −1 scripts/sipify.pl
@@ -163,7 +163,7 @@ Calculates the non-transparent region of an image.
:param image: source image
:param minSize: minimum size for returned region, if desired. If the
non-transparent region of the image is smaller than this minimum size,
it will be centered in the returned rectangle.
it will be centered in the returned rectangle.
:param center: return rectangle will be centered on the center of the original image if set to true

.. versionadded:: 2.9
@@ -178,7 +178,7 @@ Crop any transparent border from around an image.
:param image: source image
:param minSize: minimum size for cropped image, if desired. If the
cropped image is smaller than the minimum size, it will be centered
in the returned image.
in the returned image.
:param center: cropped image will be centered on the center of the original image if set to true

.. versionadded:: 2.9
@@ -1241,7 +1241,7 @@ Merges any connected lines in a LineString/MultiLineString geometry and
converts them to single line strings.

:return: a LineString or MultiLineString geometry, with any connected lines
joined. An empty geometry will be returned if the input geometry was not a
joined. An empty geometry will be returned if the input geometry was not a
MultiLineString geometry.

.. versionadded:: 3.0
@@ -296,7 +296,7 @@ M value is preserved.
:param inclination: angle to project in Z (3D). If the point is 2D, the Z value is assumed to be 0.

:return: The point projected. If a 2D point is projected a 3D point will be returned except if
inclination is 90. A 3D point is always returned if a 3D point is projected.
inclination is 90. A 3D point is always returned if a 3D point is projected.
Example:
.. code-block:: python

@@ -115,7 +115,7 @@ Returns coordinates of a vertex.
Returns the three lengths of the triangle.

:return: Lengths of triangle ABC where [AB] is at 0, [BC] is at 1, [CA] is at 2.
An empty list is returned for empty triangle.
An empty list is returned for empty triangle.
* Example:
.. code-block:: python

@@ -131,7 +131,7 @@ An empty list is returned for empty triangle.
Returns the three angles of the triangle.

:return: Angles in radians of triangle ABC where angle BAC is at 0, angle ABC is at 1, angle BCA is at 2.
An empty list is returned for empty triangle.
An empty list is returned for empty triangle.
* Example:
.. code-block:: python

@@ -249,7 +249,7 @@ Is the triangle scalene (all sides have differen lengths)?
An altitude is a segment (defined by a :py:class:`QgsLineString`) from a vertex to the opposite side (or, if necessary, to the extension of the opposite side).

:return: Three altitudes from this triangle.
An empty list is returned for empty triangle.
An empty list is returned for empty triangle.
* Example:
.. code-block:: python

@@ -265,7 +265,7 @@ An empty list is returned for empty triangle.
A median is a segment (defined by a :py:class:`QgsLineString`) from a vertex to the midpoint of the opposite side.

:return: Three medians from this triangle.
An empty list is returned for empty triangle.
An empty list is returned for empty triangle.
* Example:
.. code-block:: python

@@ -283,7 +283,7 @@ The segment (defined by a :py:class:`QgsLineString`) returned bisect the angle o
:param lengthTolerance: The tolerance to use.

:return: Three angle bisector from this triangle.
An empty list is returned for empty triangle.
An empty list is returned for empty triangle.
* Example:
.. code-block:: python

@@ -299,7 +299,7 @@ An empty list is returned for empty triangle.
Medial (or midpoint) triangle of a triangle ABC is the triangle with vertices at the midpoints of the triangle's sides.

:return: The medial from this triangle.
An empty triangle is returned for empty triangle.
An empty triangle is returned for empty triangle.
* Example:
.. code-block:: python

@@ -317,7 +317,7 @@ An orthocenter is the point of intersection of the altitudes of a triangle.
:param lengthTolerance: The tolerance to use

:return: The orthocenter of the triangle.
An empty point is returned for empty triangle.
An empty point is returned for empty triangle.
* Example:
.. code-block:: python

@@ -333,7 +333,7 @@ An empty point is returned for empty triangle.
Center of the circumscribed circle of the triangle.

:return: The center of the circumscribed circle of the triangle.
An empty point is returned for empty triangle.
An empty point is returned for empty triangle.
* Example:
.. code-block:: python

@@ -349,7 +349,7 @@ An empty point is returned for empty triangle.
Radius of the circumscribed circle of the triangle.

:return: The radius of the circumscribed circle of the triangle.
0.0 is returned for empty triangle.
0.0 is returned for empty triangle.
* Example:
.. code-block:: python

@@ -365,7 +365,7 @@ Radius of the circumscribed circle of the triangle.
Circumscribed circle of the triangle.

:return: The circumbscribed of the triangle with a :py:class:`QgsCircle`.
An empty circle is returned for empty triangle.
An empty circle is returned for empty triangle.
Example:
.. code-block:: python

@@ -382,7 +382,7 @@ Center of the inscribed circle of the triangle. Z dimension is
supported and is retrieved from the first 3D point amongst vertices.

:return: The center of the inscribed circle of the triangle.
An empty point is returned for empty triangle.
An empty point is returned for empty triangle.
* Example:
.. code-block:: python

@@ -398,7 +398,7 @@ An empty point is returned for empty triangle.
Radius of the inscribed circle of the triangle.

:return: The radius of the inscribed circle of the triangle.
0.0 is returned for empty triangle.
0.0 is returned for empty triangle.
* Example:
.. code-block:: python

@@ -414,7 +414,7 @@ Radius of the inscribed circle of the triangle.
Inscribed circle of the triangle.

:return: The inscribed of the triangle with a :py:class:`QgsCircle`.
An empty circle is returned for empty triangle.
An empty circle is returned for empty triangle.
Example:
.. code-block:: python

@@ -173,7 +173,7 @@ Returns the inherent dimension of the geometry type as an integer. Returned valu
always be less than or equal to the coordinate dimension.

:return: 0 for point geometries, 1 for line geometries, 2 for polygon geometries
Invalid geometry types will return a dimension of 0.
Invalid geometry types will return a dimension of 0.

.. seealso:: :py:func:`coordDimensions`
%End
@@ -580,7 +580,7 @@ height.
:param firstRow: index of first row visible in frame (where 0 = first row in table)
:param includeHeader: set to true if frame would include a header row
:param includeEmptyRows: set to true to also include rows which would be empty in the returned count. For instance,
if the frame would include all table content rows and have space left for extra rows then setting this parameter
if the frame would include all table content rows and have space left for extra rows then setting this parameter
to true would also include a count of these extra blank rows.

:return: number of visible content rows (excluding header row)
@@ -593,7 +593,7 @@ Calculates how many content rows are visible within a given frame.
:param frameIndex: index number for frame
:param firstRow: index of first row visible in frame (where 0 = first row in table)
:param includeEmptyRows: set to true to also include rows which would be empty in the returned count. For instance,
if the frame would include all table content rows and have space left for extra rows then setting this parameter
if the frame would include all table content rows and have space left for extra rows then setting this parameter
to true would also include a count of these extra blank rows.

:return: number of visible content rows (excludes header rows)
@@ -92,7 +92,7 @@ interprets the supplied path (url) of the data source to connect to and access t
data.

:param path: The path or url of the parameter. Typically this encodes
parameters used by the data provider as url query items.
parameters used by the data provider as url query items.
:param baseName: The name used to represent the layer in the legend
:param providerLib: The name of the data provider, e.g., "mesh_memory", "mdal"
:param options: general mesh layer options
@@ -526,7 +526,7 @@ should raise GeoAlgorithmExecutionException for the same purpose.

:return: A map of algorithm outputs. These may be output layer references, or calculated
values such as statistical calculations. Unless the algorithm subclass overrides
the postProcessAlgorithm() step this returned map will be used as the output for the
the postProcessAlgorithm() step this returned map will be used as the output for the
algorithm.

.. seealso:: :py:func:`prepareAlgorithm`
@@ -556,8 +556,8 @@ postProcessAlgorithm will not be called if the prepareAlgorithm() step failed (r
or if an exception was raised by the processAlgorithm() step.

:return: A map of algorithm outputs. These may be output layer references, or calculated
values such as statistical calculations. Implementations which return a non-empty
map will override any results returned by processAlgorithm().
values such as statistical calculations. Implementations which return a non-empty
map will override any results returned by processAlgorithm().

.. seealso:: :py:func:`prepareAlgorithm`

@@ -125,7 +125,7 @@ Calculates the value of an aggregate.

:param aggregate: aggregate to calculate
:param fieldOrExpression: source field or expression to use as basis for aggregated values.
If an expression is used, then the context parameter must be set.
If an expression is used, then the context parameter must be set.
:param context: expression context for evaluating expressions
:param ok: if specified, will be set to true if aggregate calculation was successful

@@ -57,7 +57,7 @@ and set the iterator to a valid iterator over the cached features. If it is not
it will return false.

:param featureIterator: A reference to a :py:class:`QgsFeatureIterator`. A valid featureIterator will
be assigned in case this index is able to answer the request and the return
be assigned in case this index is able to answer the request and the return
value is true.
:param featureRequest: The feature request, for which this index is queried.

@@ -80,10 +80,10 @@ Gets a list of colors from the scheme. The colors can optionally
be generated using the supplied context and base color.

:param context: string specifying an optional context for the returned
colors. For instance, a "recent colors" scheme may filter returned colors
by context so that colors used only in a "composer" context are returned.
colors. For instance, a "recent colors" scheme may filter returned colors
by context so that colors used only in a "composer" context are returned.
:param baseColor: base color for the scheme's colors. Some color schemes
may take advantage of this to filter or modify their returned colors
may take advantage of this to filter or modify their returned colors
to colors related to the base color.

:return: a list of QPairs of color and color name
@@ -142,7 +142,7 @@ Measures the area of a geometry.
:param geometry: geometry to measure

:return: area of geometry. For geometry collections, non surface geometries will be ignored. The units for the
returned area can be retrieved by calling areaUnits().
returned area can be retrieved by calling areaUnits().

.. versionadded:: 2.12

@@ -160,7 +160,7 @@ Measures the length of a geometry.
:param geometry: geometry to measure

:return: length of geometry. For geometry collections, non curve geometries will be ignored. The units for the
returned distance can be retrieved by calling lengthUnits().
returned distance can be retrieved by calling lengthUnits().

.. versionadded:: 2.12

@@ -178,7 +178,7 @@ Measures the perimeter of a polygon geometry.
:param geometry: geometry to measure

:return: perimeter of geometry. For geometry collections, any non-polygon geometries will be ignored. The units for the
returned perimeter can be retrieved by calling lengthUnits().
returned perimeter can be retrieved by calling lengthUnits().

.. versionadded:: 2.12

@@ -46,7 +46,7 @@ Constructor. Constructs a new QgsField object.
:param type: Field variant type, currently supported: String / Int / Double
:param typeName: Field type (e.g., char, varchar, text, int, serial, double).
Field types are usually unique to the source and are stored exactly
as returned from the data store.
as returned from the data store.
:param len: Field length
:param prec: Field precision. Usually decimal places but may also be
used in conjunction with other fields types (e.g., variable character fields)
@@ -212,7 +212,7 @@ Returns a CSS string representing the specified font as closely as possible.

:param font: QFont to convert
:param pointToPixelMultiplier: scaling factor to apply to convert point sizes to pixel font sizes.
The CSS returned by this function will always use pixels for font sizes, so this parameter
The CSS returned by this function will always use pixels for font sizes, so this parameter
should be set to a suitable value to convert point sizes to pixels (e.g., taking into account
destination DPI)

@@ -99,7 +99,7 @@ The layersAdded() and layerWasAdded() signals will always be emitted.

:return: a list of the map layers that were added
successfully. If a layer is invalid, or already exists in the store,
it will not be part of the returned list.
it will not be part of the returned list.


.. seealso:: :py:func:`addMapLayer`
@@ -105,7 +105,7 @@ Test using renderer to generate the image to be compared.

:param mismatchCount: - defaults to 0 - the number of pixels that
are allowed to be different from the control image. In some cases
rendering may be non-deterministic. This parameter allows you to account
rendering may be non-deterministic. This parameter allows you to account
for that by providing a tolerance.

.. note::
@@ -733,14 +733,14 @@ The legendLayersAdded() signal is emitted only if addToLegend is true.
:param mapLayers: A list of layer which should be added to the registry
:param addToLegend: If true (by default), the layers will be added to the
legend and to the main canvas. If you have a private
layer you can set this parameter to false to hide it.
layer you can set this parameter to false to hide it.
:param takeOwnership: Ownership will be transferred to the layer registry.
If you specify false here you have take care of deleting
the layers yourself. Not available in Python.

:return: a list of the map layers that were added
successfully. If a layer is invalid, or already exists in the registry,
it will not be part of the returned QList.
it will not be part of the returned QList.


.. note::
@@ -771,7 +771,7 @@ addMapLayers() instead.
:param mapLayer: A layer to add to the registry
:param addToLegend: If true (by default), the layer will be added to the
legend and to the main canvas. If you have a private
layer you can set this parameter to false to hide it.
layer you can set this parameter to false to hide it.
:param takeOwnership: Ownership will be transferred to the layer registry.
If you specify false here you have take care of deleting
the layer yourself. Not available in Python.
@@ -113,7 +113,7 @@ Gets pointer to provider function
:param functionName: name of function

:return: pointer to function or NULL on error. If the provider uses direct provider
function pointers instead of a library None will be returned.
function pointers instead of a library None will be returned.
%End

QLibrary *createProviderLibrary( const QString &providerKey ) const /Factory/;
@@ -103,7 +103,7 @@ Test using renderer to generate the image to be compared.
e.g. /tmp/theTestName.png
:param mismatchCount: - defaults to 0 - the number of pixels that
are allowed to be different from the control image. In some cases
rendering may be non-deterministic. This parameter allows you to account
rendering may be non-deterministic. This parameter allows you to account
for that by providing a tolerance.

.. note::
@@ -119,7 +119,7 @@ Test using two arbitrary images (map renderer will not be used)
e.g. /tmp/theTestName.png
:param mismatchCount: - defaults to 0 - the number of pixels that
are allowed to be different from the control image. In some cases
rendering may be non-deterministic. This parameter allows you to account
rendering may be non-deterministic. This parameter allows you to account
for that by providing a tolerance.
:param renderedImageFile: to optionally override the output filename
\note: make sure to call setExpectedImage and setRenderedImage first.
@@ -298,7 +298,7 @@ capability implement an optimised version of this method.
:param attr_map: a map containing changed attributes
:param geometry_map: A QgsGeometryMap whose index contains the feature IDs
that will have their geometries changed.
The second map parameter being the new geometries themselves
The second map parameter being the new geometries themselves

:return: true in case of success and false in case of failure
%End
@@ -355,7 +355,7 @@ Changes geometries of existing features

:param geometry_map: A QgsGeometryMap whose index contains the feature IDs
that will have their geometries changed.
The second map parameter being the new geometries themselves
The second map parameter being the new geometries themselves

:return: True in case of success and false in case of failure
%End
@@ -339,7 +339,7 @@ interprets the supplied path (url) of the data source to connect to and access t
data.

:param path: The path or url of the parameter. Typically this encodes
parameters used by the data provider as url query items.
parameters used by the data provider as url query items.
:param baseName: The name used to represent the layer in the legend
:param providerLib: The name of the data provider, e.g., "memory", "postgres"
:param options: layer load options
@@ -206,7 +206,7 @@ Returns a new image downloader for the raster legend.
contextual legends.

:return: a download handler or null if the provider does not support
legend at all. Ownership of the returned object is transferred
legend at all. Ownership of the returned object is transferred
to caller.


0 comments on commit 4b1b752

Please sign in to comment.
You can’t perform that action at this time.