sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-12-04 00:06:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixes after rebase

Browse Source
This commit is contained in:
Martin Dobias 2023-07-20 09:14:21 +02:00
parent 644efd2dbd
commit e8f0e1cca1
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
python/core/auto_generated/geometry/qgsbox3d.sip.in
View File

@ -385,13 +385,13 @@ If the specified precision is less than 0, a suitable minimum precision is used.
.. versionadded:: 3.34
%End
QgsBox3d operator-( const QgsVector3D &v ) const;
QgsBox3D operator-( const QgsVector3D &v ) const;
QgsBox3d operator+( const QgsVector3D &v ) const;
QgsBox3D operator+( const QgsVector3D &v ) const;
QgsBox3d &operator-=( const QgsVector3D &v );
QgsBox3D &operator-=( const QgsVector3D &v );
QgsBox3d &operator+=( const QgsVector3D &v );
QgsBox3D &operator+=( const QgsVector3D &v );
};

12
src/core/geometry/qgsbox3d.cpp
View File

@ -304,19 +304,19 @@ QString QgsBox3D::toString( int precision ) const
return rep;
}
QgsBox3d QgsBox3d::operator-( const QgsVector3D &v ) const
QgsBox3D QgsBox3D::operator-( const QgsVector3D &v ) const
{
return QgsBox3d( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(), mZmin - v.z(),
return QgsBox3D( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(), mZmin - v.z(),
mBounds2d.xMaximum() - v.x(), mBounds2d.yMaximum() - v.y(), mZmax - v.z() );
}
QgsBox3d QgsBox3d::operator+( const QgsVector3D &v ) const
QgsBox3D QgsBox3D::operator+( const QgsVector3D &v ) const
{
return QgsBox3d( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(), mZmin + v.z(),
return QgsBox3D( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(), mZmin + v.z(),
mBounds2d.xMaximum() + v.x(), mBounds2d.yMaximum() + v.y(), mZmax + v.z() );
}
QgsBox3d &QgsBox3d::operator-=( const QgsVector3D &v )
QgsBox3D &QgsBox3D::operator-=( const QgsVector3D &v )
{
mBounds2d.set( mBounds2d.xMinimum() - v.x(), mBounds2d.yMinimum() - v.y(),
mBounds2d.xMaximum() - v.x(), mBounds2d.yMaximum() - v.y() );
@ -325,7 +325,7 @@ QgsBox3d &QgsBox3d::operator-=( const QgsVector3D &v )
return *this;
}
QgsBox3d &QgsBox3d::operator+=( const QgsVector3D &v )
QgsBox3D &QgsBox3D::operator+=( const QgsVector3D &v )
{
mBounds2d.set( mBounds2d.xMinimum() + v.x(), mBounds2d.yMinimum() + v.y(),
mBounds2d.xMaximum() + v.x(), mBounds2d.yMaximum() + v.y() );

8
src/core/geometry/qgsbox3d.h
View File

@ -388,25 +388,25 @@ class CORE_EXPORT QgsBox3D
* Returns a box offset from this one in the direction of the reversed vector.
* \since QGIS 3.34
*/
QgsBox3d operator-( const QgsVector3D &v ) const;
QgsBox3D operator-( const QgsVector3D &v ) const;
/**
* Returns a box offset from this one in the direction of the vector.
* \since QGIS 3.34
*/
QgsBox3d operator+( const QgsVector3D &v ) const;
QgsBox3D operator+( const QgsVector3D &v ) const;
/**
* Moves this box in the direction of the reversed vector.
* \since QGIS 3.34
*/
QgsBox3d &operator-=( const QgsVector3D &v );
QgsBox3D &operator-=( const QgsVector3D &v );
/**
* Moves this box in the direction of the vector.
* \since QGIS 3.34
*/
QgsBox3d &operator+=( const QgsVector3D &v );
QgsBox3D &operator+=( const QgsVector3D &v );
private: