New classes for circle and ellipse. #4358
Conversation
- supports < and > in addition to comma and dot - wraps around polygon rings (jumps from last node to the first) - moves view to node when it is outside of canvas view
[Server] WFS refactoring and QgsWfsProjectParser removal
src/core/geometry/qgscircle.cpp
Outdated
| double yDelta_b = pt3.y() - pt2.y(); | ||
| double xDelta_b = pt3.x() - pt2.x(); | ||
|
|
||
| if ( ( fabs( xDelta_a ) <= epsilon ) && ( fabs( yDelta_b ) <= epsilon ) ) |
There was a problem hiding this comment.
Use qAbs for better cross platform compatibility
src/core/geometry/qgscircle.cpp
Outdated
|
|
||
| if ( !isPerpendicular( pt1, pt2, pt3, epsilon ) ) | ||
| { | ||
| p1 = pt1 ; p2 = pt2; p3 = pt3; |
There was a problem hiding this comment.
These should be separate lines
src/core/geometry/qgscircle.cpp
Outdated
| double aSlope = yDelta_a / xDelta_a; | ||
| double bSlope = yDelta_b / xDelta_b; | ||
|
|
||
| if ( ( fabs( xDelta_a ) <= epsilon ) && ( fabs( yDelta_b ) <= epsilon ) ) |
src/core/geometry/qgscircle.cpp
Outdated
|
|
||
| if ( ( fabs( xDelta_a ) <= epsilon ) && ( fabs( yDelta_b ) <= epsilon ) ) | ||
| { | ||
| std::cout << "par ici" << std::endl; |
There was a problem hiding this comment.
Remove debugging line
src/core/geometry/qgscircle.h
Outdated
| QgsCircle(); | ||
|
|
||
| /** Constructs a circle by defining all the members. | ||
| * @param center The center of the circle. |
There was a problem hiding this comment.
Can you flip these to \param notation? We're trying to standardise on that format now
src/core/geometry/qgsellipse.h
Outdated
| * \class QgsEllipse | ||
| * \brief Ellipse geometry type. | ||
| * | ||
| * An ellipse is defined by a center point (mCenter) with a semi-major axis, a semi-minor axis and an azimuth. |
There was a problem hiding this comment.
I'd prefer to keep the internal variable names out of the API docs (since they aren't accessible through the python bindings)
src/core/geometry/qgsellipse.h
Outdated
| * @see setCenter() | ||
| * @note not available in Python bindings | ||
| */ | ||
| QgsPointV2 &rcenter() { return mCenter; } |
There was a problem hiding this comment.
If you're using sipify you'll need to wrap this in
#ifndef SIP_RUN
There was a problem hiding this comment.
SIP_SKIP should do the job
like here
src/core/geometry/qgsellipse.h
Outdated
| * @param pts List of points returned. | ||
| * @param segments Number of segments used to segment geometry. | ||
| */ | ||
| virtual void points( QgsPointSequence &pts, unsigned int segments = 36 ) const; |
There was a problem hiding this comment.
Any reason why not just the sequence instead of using a reference?
src/core/geometry/qgsellipse.h
Outdated
| /** Returns a segmented polygon. | ||
| * @param segments Number of segments used to segment geometry. | ||
| */ | ||
| virtual QgsPolygonV2 toPolygon( unsigned int segments = 36 ) const; |
There was a problem hiding this comment.
I think given that the main use for toPolygon and toLineString will be store the result in a QgsGeometry that these should be factories and return a pointer. It'll avoid the need for an extra clone to store the result in QgsGeometry.
src/core/geometry/qgsellipse.h
Outdated
|
|
||
| /** Returns the oriented minimal bounding box for the ellipse. | ||
| */ | ||
| virtual QgsPolygonV2 orientedBoundingBox() const; |
There was a problem hiding this comment.
Same here - this should return a pointer
|
Fantastic work as usual! |
class doxygen and class definition
Skip the autocreated Docstrings with rtype annotations if the member is overridden - better to use the base class Docstring in this case.
Allows argument names to be highlighted in Python docs
These classes have been replaced by more efficient and flexible classes (see QgsPointLocator, QgsSnappingUtils, QgsMapCanvasSnappingUtils)
* get rid of params to get rid of warnings
[needs-docs] use QgsPasswordLineEdit in the master password dialog
- remove methods which accept a QgsGeometry pointer, leave duplicate methods which accept QgsGeometry reference (caller should handle null geometry pointers in an acceptable way instead of just returning 0 measurements) - make protected members private. This class isn't designed to be subclassed - remove some methods not exposed to bindings and not used anywhere
method for processing
This temporary layer store (a QgsProject) is used as a store for layers that are added if a parameter that is evaluated to a layer requires that a new, non-active-project layer is loaded. It means that these layers will remain accessible for the duration of the algorithm's execution (or models execution if an algorithm is run as part of a model), before being automatically discarded when the QgsProcessingContext used to run the algorithm/model goes out of scope. This approach has several benefits: - it means that algorithms (including c++ algorithms) are able to use both project and non-project layers without needing to handle any memory management themselves. - it means that layers are guaranteed to last for the duration of a model execution. This is currently an issue where models which use memory layers as intermediate outputs do not function correctly as the memory layers are destroyed before the model has finished executing - there should be no leakage of layers remaining open after an algorithm exits
[processing] Move some log handling to c++ class
* add Array and ArraySize annotations * also handle multiline skipped bodies * handle #if 0 blocks
|
@lbartoletti looks like you need to rebase this and re-run the updated sipify_all to update the python bindings. In your opinion is this ready to go now? |
Allow taking layers from QgsProject
* add In annotation * remove struct forward declarations * fix members initialization list in header * merge removal code for function bodies and constructor definition
* skip some operators * allow to remove an argument with SIP_PYARGREMOVE
|
@nyalldawson Yes, if it's ok for you, it's ok for me. I will improve this classes with the inclination after the class for regular polygons and possibly other CAD (geometry utils) tools |
…into circle_ellipse
|
Manually squashed and merged as 84471f2 |
|
Many thanks @lbartoletti ! |
Two new classes from CADDigitze plugin.
Circle and ellipse have z (and m) value(s) but without inclination (for now).