Skip to content

Commit cedd73e

Browse files
committed
More list formatting fixes
1 parent 561a832 commit cedd73e

38 files changed

+260
-119
lines changed

python/core/auto_generated/geometry/qgsabstractgeometry.sip.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,8 @@ Ownership is transferred to the caller.
528528
If the gridified geometry could not be calculated ``None`` will be returned.
529529
It may generate an invalid geometry (in some corner cases).
530530
It can also be thought as rounding the edges and it may be useful for removing errors.
531-
Example:
531+
532+
### Example:
532533

533534
In this case we use a 2D grid of 1x1 to gridify.
534535
In this case, it can be thought like rounding the x and y of all the points/vertices to full units (remove all decimals).
@@ -687,7 +688,8 @@ Checks validity of the geometry, and returns ``True`` if the geometry is valid.
687688
Returns Java-style iterator for traversal of parts of the geometry. This iterator
688689
can safely be used to modify parts of the geometry.
689690

690-
* Example:
691+
### Example:
692+
691693
.. code-block:: python
692694

693695
# print the WKT representation of each part in a multi-point geometry
@@ -726,7 +728,8 @@ Returns a read-only, Java-style iterator for traversal of vertices of all the ge
726728
The iterator returns a copy of individual vertices, and accordingly geometries cannot be
727729
modified using the iterator. See transformVertices() for a safe method to modify vertices "in-place".
728730

729-
* Example:
731+
### Example:
732+
730733
.. code-block:: python
731734

732735
# print the x and y coordinate for each vertex in a LineString

python/core/auto_generated/geometry/qgsgeometry.sip.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,8 @@ Returns a read-only, Java-style iterator for traversal of vertices of all the ge
410410
The iterator returns a copy of individual vertices, and accordingly geometries cannot be
411411
modified using the iterator. See transformVertices() for a safe method to modify vertices "in-place".
412412

413-
* Example:
413+
### Example:
414+
414415
.. code-block:: python
415416

416417
# print the x and y coordinate for each vertex in a LineString
@@ -437,7 +438,8 @@ can safely be used to modify parts of the geometry.
437438
This method forces a detach. Use constParts() to avoid the detach
438439
if the parts are not going to be modified.
439440

440-
* Example:
441+
### Example:
442+
441443
.. code-block:: python
442444

443445
# print the WKT representation of each part in a multi-point geometry
@@ -476,7 +478,8 @@ returns read-only references to parts and cannot be used to modify the parts.
476478
Unlike parts(), this method does not force a detach and is more efficient if read-only
477479
iteration only is required.
478480

479-
* Example:
481+
### Example:
482+
480483
.. code-block:: python
481484

482485
# print the WKT representation of each part in a multi-point geometry

python/core/auto_generated/geometry/qgsgeometryutils.sip.in

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ Compute the intersection between two segments
116116

117117
:return: - Whether the segments intersect
118118
- intersectionPoint: Output parameter, the intersection point
119-
* Example:
119+
120+
### Example:
121+
120122
.. code-block:: python
121123

122124
ret = QgsGeometryUtils.segmentIntersection( QgsPoint( 0, 0 ), QgsPoint( 0, 1 ), QgsPoint( 1, 1 ), QgsPoint( 1, 0 ) )
@@ -474,7 +476,9 @@ M value is computed if one of this point have M.
474476
:param pt2: second point.
475477

476478
:return: New point at middle between points pt1 and pt2.
477-
* Example:
479+
480+
### Example:
481+
478482
.. code-block:: python
479483

480484
p = QgsPoint( 4, 6 ) # 2D point
@@ -620,7 +624,9 @@ An algorithm to calculate an (approximate) intersection of two lines in 3D.
620624

621625
:return: - ``True`` if the intersection can be found, ``False`` - otherwise.
622626
- intersection: is the result intersection, of it can be found.
623-
example:
627+
628+
### Example:
629+
624630
.. code-block:: python
625631

626632
QgsGeometryUtils.linesIntersection3D(QgsVector3D(0,0,0), QgsVector3D(5,0,0), QgsVector3D(2,1,0), QgsVector3D(2,3,0))

python/core/auto_generated/geometry/qgspoint.sip.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,9 @@ M value is preserved.
316316

317317
:return: The point projected. If a 2D point is projected a 3D point will be returned except if
318318
inclination is 90. A 3D point is always returned if a 3D point is projected.
319-
Example:
319+
320+
### Example:
321+
320322
.. code-block:: python
321323

322324
p = QgsPoint( 1, 2 ) # 2D point

python/core/auto_generated/geometry/qgstriangle.sip.in

Lines changed: 54 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,9 @@ Returns the three lengths of the triangle.
116116

117117
:return: Lengths of triangle ABC where [AB] is at 0, [BC] is at 1, [CA] is at 2.
118118
An empty list is returned for empty triangle.
119-
* Example:
119+
120+
### Example:
121+
120122
.. code-block:: python
121123

122124
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -132,7 +134,9 @@ Returns the three angles of the triangle.
132134

133135
:return: Angles in radians of triangle ABC where angle BAC is at 0, angle ABC is at 1, angle BCA is at 2.
134136
An empty list is returned for empty triangle.
135-
* Example:
137+
138+
### Example:
139+
136140
.. code-block:: python
137141

138142
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -147,7 +151,9 @@ Returns the three angles of the triangle.
147151
Convenient method checking if the geometry is degenerate (have duplicate or colinear point(s)).
148152

149153
:return: ``True`` if the triangle is degenerate or empty, otherwise ``False``.
150-
Example:
154+
155+
### Example:
156+
151157
.. code-block:: python
152158

153159
tri = QgsTriangle()
@@ -171,7 +177,9 @@ Is the triangle isocele (two sides with the same length)?
171177
:param lengthTolerance: The tolerance to use
172178

173179
:return: ``True`` or ``False``. Always ``False`` for empty triangle.
174-
* Example:
180+
181+
### Example:
182+
175183
.. code-block:: python
176184

177185
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -191,7 +199,9 @@ Is the triangle equilateral (three sides with the same length)?
191199
:param lengthTolerance: The tolerance to use
192200

193201
:return: ``True`` or ``False``. Always ``False`` for empty triangle.
194-
* Example:
202+
203+
### Example:
204+
195205
.. code-block:: python
196206

197207
tri = QgsTriangle( QgsPoint( 10, 10 ), QgsPoint( 16, 10 ), QgsPoint( 13, 15.1962 ) )
@@ -211,7 +221,9 @@ Is the triangle right-angled?
211221
:param angleTolerance: The tolerance to use
212222

213223
:return: ``True`` or ``False``. Always ``False`` for empty triangle.
214-
* Example:
224+
225+
### Example:
226+
215227
.. code-block:: python
216228

217229
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -231,7 +243,9 @@ Is the triangle scalene (all sides have different lengths)?
231243
:param lengthTolerance: The tolerance to use
232244

233245
:return: ``True`` or ``False``. Always ``False`` for empty triangle.
234-
* Example:
246+
247+
### Example:
248+
235249
.. code-block:: python
236250

237251
tri = QgsTriangle( QgsPoint( 7.2825, 4.2368 ), QgsPoint( 13.0058, 3.3218 ), QgsPoint( 9.2145, 6.5242 ) )
@@ -250,7 +264,9 @@ An altitude is a segment (defined by a :py:class:`QgsLineString`) from a vertex
250264

251265
:return: Three altitudes from this triangle.
252266
An empty list is returned for empty triangle.
253-
* Example:
267+
268+
### Example:
269+
254270
.. code-block:: python
255271

256272
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -266,7 +282,9 @@ A median is a segment (defined by a :py:class:`QgsLineString`) from a vertex to
266282

267283
:return: Three medians from this triangle.
268284
An empty list is returned for empty triangle.
269-
* Example:
285+
286+
### Example:
287+
270288
.. code-block:: python
271289

272290
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -284,7 +302,9 @@ The segment (defined by a :py:class:`QgsLineString`) returned bisect the angle o
284302

285303
:return: Three angle bisector from this triangle.
286304
An empty list is returned for empty triangle.
287-
* Example:
305+
306+
### Example:
307+
288308
.. code-block:: python
289309

290310
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -300,7 +320,9 @@ Medial (or midpoint) triangle of a triangle ABC is the triangle with vertices at
300320

301321
:return: The medial from this triangle.
302322
An empty triangle is returned for empty triangle.
303-
* Example:
323+
324+
### Example:
325+
304326
.. code-block:: python
305327

306328
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -318,7 +340,9 @@ An orthocenter is the point of intersection of the altitudes of a triangle.
318340

319341
:return: The orthocenter of the triangle.
320342
An empty point is returned for empty triangle.
321-
* Example:
343+
344+
### Example:
345+
322346
.. code-block:: python
323347

324348
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -334,7 +358,9 @@ Center of the circumscribed circle of the triangle.
334358

335359
:return: The center of the circumscribed circle of the triangle.
336360
An empty point is returned for empty triangle.
337-
* Example:
361+
362+
### Example:
363+
338364
.. code-block:: python
339365

340366
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -350,7 +376,9 @@ Radius of the circumscribed circle of the triangle.
350376

351377
:return: The radius of the circumscribed circle of the triangle.
352378
0.0 is returned for empty triangle.
353-
* Example:
379+
380+
### Example:
381+
354382
.. code-block:: python
355383

356384
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -366,7 +394,9 @@ Circumscribed circle of the triangle.
366394

367395
:return: The circumbscribed of the triangle with a :py:class:`QgsCircle`.
368396
An empty circle is returned for empty triangle.
369-
Example:
397+
398+
### Example:
399+
370400
.. code-block:: python
371401

372402
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -383,7 +413,9 @@ supported and is retrieved from the first 3D point amongst vertices.
383413

384414
:return: The center of the inscribed circle of the triangle.
385415
An empty point is returned for empty triangle.
386-
* Example:
416+
417+
### Example:
418+
387419
.. code-block:: python
388420

389421
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -399,7 +431,9 @@ Radius of the inscribed circle of the triangle.
399431

400432
:return: The radius of the inscribed circle of the triangle.
401433
0.0 is returned for empty triangle.
402-
* Example:
434+
435+
### Example:
436+
403437
.. code-block:: python
404438

405439
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )
@@ -415,7 +449,9 @@ Inscribed circle of the triangle.
415449

416450
:return: The inscribed of the triangle with a :py:class:`QgsCircle`.
417451
An empty circle is returned for empty triangle.
418-
Example:
452+
453+
### Example:
454+
419455
.. code-block:: python
420456

421457
tri = QgsTriangle( QgsPoint( 0, 0 ), QgsPoint( 0, 5 ), QgsPoint( 5, 5 ) )

python/core/auto_generated/qgseditformconfig.sip.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,8 @@ If ``ui`` is a URL, a local copy of the file will be made and will be used to cr
138138
%Docstring
139139
Set the editor widget config for a widget which is not for a simple field.
140140

141-
Example:
141+
### Example:
142+
142143
.. code-block:: python
143144

144145
editFormConfig = layer.editFormConfig()

python/core/auto_generated/qgsfeature.sip.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,8 @@ This method is a shortcut for calling:
338338

339339
feature.setGeometry( QgsGeometry( geometry ) )
340340

341-
* Example:
341+
### Example:
342+
342343
.. code-block:: python
343344

344345
# Sets a feature's geometry to a point geometry

python/core/auto_generated/symbology/qgsrenderer.sip.in

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,9 @@ coordinates
527527
%Docstring
528528
Clones generic renderer data to another renderer.
529529
Currently clones
530-
* Order By
531-
* Paint Effect
530+
531+
- Order By
532+
- Paint Effect
532533

533534
:param destRenderer: destination renderer for copied effect
534535
%End

python/core/auto_generated/textrenderer/qgstextformat.sip.in

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,11 @@ the rendered text.
341341
.. warning::
342342

343343
Only a small subset of HTML formatting is supported. Currently this is restricted to:
344-
* text color formatting
344+
345+
- text color formatting
346+
- strikethrough
347+
- underline
348+
- overline
345349

346350
.. seealso:: :py:func:`setAllowHtmlFormatting`
347351

@@ -356,7 +360,11 @@ the rendered text.
356360
.. warning::
357361

358362
Only a small subset of HTML formatting is supported. Currently this is restricted to:
359-
* text color formatting
363+
364+
- text color formatting
365+
- strikethrough
366+
- underline
367+
- overline
360368

361369
.. seealso:: :py:func:`allowHtmlFormatting`
362370

python/gui/auto_generated/editorwidgets/core/qgseditorwidgetautoconf.sip.in

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ Base class for plugins allowing to pick automatically a widget type for editing
2626
virtual QgsEditorWidgetSetup editorWidgetSetup( const QgsVectorLayer *vl, const QString &fieldName, int &score /Out/ ) const = 0;
2727
%Docstring
2828
Typical scores are:
29-
* 0: no matching type found.
30-
* 10: a widget has been guessed from the type of field.
31-
* 20: a widget has been determined from an external configuration (for example a database table)
29+
30+
- 0: no matching type found.
31+
- 10: a widget has been guessed from the type of field.
32+
- 20: a widget has been determined from an external configuration (for example a database table)
3233

3334
:param vl: The vector layer for which this widget will be created
3435
:param fieldName: The field name on the specified layer for which this widget will be created

0 commit comments

Comments
 (0)