Skip to content

Commit

Permalink
3.20 -> 3.22
Browse files Browse the repository at this point in the history
  • Loading branch information
@lbartoletti @nyalldawson
lbartoletti authored and nyalldawson committed Sep 12, 2021
1 parent 06f78b1 commit 4279428
Show file tree
Hide file tree
Showing 4 changed files with 42 additions and 32 deletions.
2 changes: 2 additions & 0 deletions python/core/auto_generated/qgscadutils.sip.in
View file
Expand Up @@ -39,7 +39,9 @@ The :py:class:`QgsCadUtils` class provides routines for CAD editing.

QgsCadUtils::AlignMapPointConstraint xConstraint;
QgsCadUtils::AlignMapPointConstraint yConstraint;

QgsCadUtils::AlignMapPointConstraint zConstraint;

QgsCadUtils::AlignMapPointConstraint mConstraint;
QgsCadUtils::AlignMapPointConstraint distanceConstraint;
QgsCadUtils::AlignMapPointConstraint angleConstraint;
Expand Down
30 changes: 15 additions & 15 deletions python/gui/auto_generated/qgsadvanceddigitizingdockwidget.sip.in
View file
Expand Up @@ -218,7 +218,7 @@ determines if CAD tools are enabled or if map tools behaves "nomally"
%Docstring
Determines if Z or M will be enabled.

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

bool constructionMode() const;
Expand Down Expand Up @@ -252,14 +252,14 @@ Returns the ``CadConstraint`` on the Y coordinate
%Docstring
Returns the ``CadConstraint`` on the Z coordinate

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

const CadConstraint *constraintM() const;
%Docstring
Returns the ``CadConstraint`` on the M coordinate

.. versionadded:: 3.20
.. versionadded:: 3.22
%End
bool commonAngleConstraint() const;
%Docstring
Expand Down Expand Up @@ -407,7 +407,7 @@ Can be used to set constraints by external widgets.

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void setM( const QString &value, WidgetSetMode mode );
Expand All @@ -422,7 +422,7 @@ Can be used to set constraints by external widgets.

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void setAngle( const QString &value, WidgetSetMode mode );
Expand Down Expand Up @@ -538,7 +538,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void valueMChanged( const QString &value );
Expand All @@ -550,7 +550,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void valueAngleChanged( const QString &value );
Expand Down Expand Up @@ -610,7 +610,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void lockMChanged( bool locked );
Expand All @@ -622,7 +622,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void lockAngleChanged( bool locked );
Expand Down Expand Up @@ -688,7 +688,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void relativeMChanged( bool relative );
Expand All @@ -702,7 +702,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void relativeAngleChanged( bool relative );
Expand Down Expand Up @@ -762,7 +762,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void enabledChangedM( bool enabled );
Expand All @@ -777,7 +777,7 @@ Could be used by widgets that must reflect the current advanced digitizing state

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void enabledChangedAngle( bool enabled );
Expand Down Expand Up @@ -843,7 +843,7 @@ Could be used by widgets to capture the focus when a field is being edited.

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void focusOnMRequested();
Expand All @@ -855,7 +855,7 @@ Could be used by widgets to capture the focus when a field is being edited.

unstable API (will likely change)

.. versionadded:: 3.20
.. versionadded:: 3.22
%End

void focusOnAngleRequested();
Expand Down
12 changes: 10 additions & 2 deletions src/core/qgscadutils.h
View file
Expand Up @@ -62,9 +62,17 @@ class CORE_EXPORT QgsCadUtils
QgsCadUtils::AlignMapPointConstraint xConstraint;
//! Constraint for Y coordinate
QgsCadUtils::AlignMapPointConstraint yConstraint;
//! Constraint for Z coordinate

/**
* Constraint for Z coordinate
* \since QGIS 3.22
*/
QgsCadUtils::AlignMapPointConstraint zConstraint;
//! Constraint for M coordinate

/**
* Constraint for M coordinate
* \since QGIS 3.22
*/
QgsCadUtils::AlignMapPointConstraint mConstraint;
//! Constraint for distance
QgsCadUtils::AlignMapPointConstraint distanceConstraint;
Expand Down
30 changes: 15 additions & 15 deletions src/gui/qgsadvanceddigitizingdockwidget.h
View file
Expand Up @@ -252,7 +252,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private

/**
* Determines if Z or M will be enabled.
* \since QGIS 3.20
* \since QGIS 3.22
*/
void switchZM( );

Expand All @@ -275,13 +275,13 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private

/**
* Returns the \a CadConstraint on the Z coordinate
* \since QGIS 3.20
* \since QGIS 3.22
*/
const CadConstraint *constraintZ() const { return mZConstraint.get(); }

/**
* Returns the \a CadConstraint on the M coordinate
* \since QGIS 3.20
* \since QGIS 3.22
*/
const CadConstraint *constraintM() const { return mMConstraint.get(); }
//! Returns TRUE if a constraint on a common angle is active
Expand Down Expand Up @@ -404,7 +404,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
* \param mode What type of interaction to emulate
* \param value The value (as a QString, as it could be an expression)
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void setZ( const QString &value, WidgetSetMode mode );

Expand All @@ -414,7 +414,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
* \param mode What type of interaction to emulate
* \param value The value (as a QString, as it could be an expression)
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void setM( const QString &value, WidgetSetMode mode );

Expand Down Expand Up @@ -503,15 +503,15 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
* Emitted whenever the Z \a value changes (either the mouse moved, or the user changed the input).
* Could be used by widgets that must reflect the current advanced digitizing state.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void valueZChanged( const QString &value );

/**
* Emitted whenever the M \a value changes (either the mouse moved, or the user changed the input).
* Could be used by widgets that must reflect the current advanced digitizing state.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void valueMChanged( const QString &value );

Expand Down Expand Up @@ -551,15 +551,15 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
* Emitted whenever the Z parameter is \a locked.
* Could be used by widgets that must reflect the current advanced digitizing state.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void lockZChanged( bool locked );

/**
* Emitted whenever the M parameter is \a locked.
* Could be used by widgets that must reflect the current advanced digitizing state.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void lockMChanged( bool locked );

Expand Down Expand Up @@ -605,7 +605,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
*
* \param relative Whether the Z parameter is relative or not.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void relativeZChanged( bool relative );

Expand All @@ -615,7 +615,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
*
* \param relative Whether the M parameter is relative or not.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void relativeMChanged( bool relative );

Expand Down Expand Up @@ -660,7 +660,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
*
* \param enabled Whether the Z parameter is enabled or not.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void enabledChangedZ( bool enabled );

Expand All @@ -671,7 +671,7 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
*
* \param enabled Whether the M parameter is enabled or not.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void enabledChangedM( bool enabled );

Expand Down Expand Up @@ -717,15 +717,15 @@ class GUI_EXPORT QgsAdvancedDigitizingDockWidget : public QgsDockWidget, private
* Emitted whenever the Z field should get the focus using the shortcuts (Z).
* Could be used by widgets to capture the focus when a field is being edited.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void focusOnZRequested();

/**
* Emitted whenever the M field should get the focus using the shortcuts (M).
* Could be used by widgets to capture the focus when a field is being edited.
* \note unstable API (will likely change)
* \since QGIS 3.20
* \since QGIS 3.22
*/
void focusOnMRequested();

Expand Down

0 comments on commit 4279428

Please sign in to comment.