Skip to content
Permalink
Browse files

Misc typo fixes

  • Loading branch information
nyalldawson committed Aug 31, 2020
1 parent 2135d03 commit d1bc82ca7bdec6390a41128c48c793cde550f7f9
Showing with 60 additions and 60 deletions.
  1. +1 −1 python/3d/auto_generated/materials/qgsgoochmaterialsettings.sip.in
  2. +1 −1 python/3d/auto_generated/materials/qgsphongmaterialsettings.sip.in
  3. +1 −1 python/3d/auto_generated/materials/qgsphongtexturedmaterialsettings.sip.in
  4. +1 −1 python/3d/auto_generated/materials/qgssimplelinematerialsettings.sip.in
  5. +2 −2 python/3d/auto_generated/qgs3dexportobject.sip.in
  6. +1 −1 python/core/auto_generated/annotations/qgsannotationitem.sip.in
  7. +1 −1 python/core/auto_generated/mesh/qgsmeshdataset.sip.in
  8. +1 −1 python/gui/auto_generated/qgsnewvectortabledialog.sip.in
  9. +3 −3 scripts/spell_check/spelling.dat
  10. +1 −1 src/3d/materials/qgsgoochmaterialsettings.h
  11. +1 −1 src/3d/materials/qgsphongmaterialsettings.h
  12. +1 −1 src/3d/materials/qgsphongtexturedmaterialsettings.h
  13. +1 −1 src/3d/materials/qgssimplelinematerialsettings.h
  14. +1 −1 src/3d/qgs3d.cpp
  15. +2 −2 src/3d/qgs3dexportobject.h
  16. +1 −1 src/3d/qgs3dsceneexporter.cpp
  17. +1 −1 src/3d/symbols/qgsline3dsymbol.h
  18. +1 −1 src/3d/symbols/qgspoint3dsymbol.h
  19. +1 −1 src/3d/symbols/qgspolygon3dsymbol.h
  20. +20 −20 src/analysis/interpolation/qgsdualedgetriangulation.cpp
  21. +2 −2 src/analysis/interpolation/qgsdualedgetriangulation.h
  22. +1 −1 src/analysis/processing/qgsalgorithmnetworkanalysisbase.cpp
  23. +1 −1 src/core/3d/qgsabstract3dsymbol.h
  24. +1 −1 src/core/annotations/qgsannotationitem.h
  25. +1 −1 src/core/mesh/qgsmeshcalcnode.h
  26. +2 −2 src/core/mesh/qgsmeshdataset.h
  27. +1 −1 src/core/symbology/qgsstylemodel.h
  28. +1 −1 src/gui/qgsnewvectortabledialog.h
  29. +1 −1 src/providers/wms/qgswmscapabilities.h
  30. +1 −1 src/server/services/landingpage/qgslandingpage.cpp
  31. +1 −1 tests/src/3d/testqgstessellator.cpp
  32. +1 −1 tests/src/core/testqgsgeometry.cpp
  33. +1 −1 tests/src/python/test_qgsnewvectortabledialog.py
  34. +2 −2 tests/src/python/test_qgsserver_settings.py
@@ -44,7 +44,7 @@ Returns a new instance of QgsGoochMaterialSettings.

static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );
%Docstring
Returns ``True`` if the specified ``technique`` is suppored by the Gooch material.
Returns ``True`` if the specified ``technique`` is supported by the Gooch material.
%End

virtual QgsGoochMaterialSettings *clone() const /Factory/;
@@ -39,7 +39,7 @@ Constructor for QgsPhongMaterialSettings.

static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );
%Docstring
Returns ``True`` if the specified ``technique`` is suppored by the Phong material.
Returns ``True`` if the specified ``technique`` is supported by the Phong material.
%End

static QgsAbstractMaterialSettings *create() /Factory/;
@@ -38,7 +38,7 @@ Constructor for QgsPhongTexturedMaterialSettings.

static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );
%Docstring
Returns ``True`` if the specified ``technique`` is suppored by the Phong material.
Returns ``True`` if the specified ``technique`` is supported by the Phong material.
%End

static QgsAbstractMaterialSettings *create() /Factory/;
@@ -39,7 +39,7 @@ Constructor for QgsSimpleLineMaterialSettings.

static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );
%Docstring
Returns ``True`` if the specified ``technique`` is suppored by the material.
Returns ``True`` if the specified ``technique`` is supported by the material.
%End

static QgsAbstractMaterialSettings *create() /Factory/;
@@ -41,7 +41,7 @@ Qgs3DExportObject
Constructs an export object that will be filled with coordinates later

:param parentName:
The name of the parent (Will be useful to define scene hierarchie)
The name of the parent (Will be useful to define scene hierarchy)
:param parent:
The parent QObject (we use this to delete the Qgs3DExportObject instance once the exporter instance is deallocated)
%End
@@ -123,7 +123,7 @@ Saves the current object to the output stream while scaling the object and cente
%End
QString saveMaterial( QTextStream &mtlOut, const QString &folder );
%Docstring
saves the texture of the object and material informations
saves the texture of the object and material information
%End

};
@@ -72,7 +72,7 @@ Returns the bounding box of the item's geographic location, in the parent layer'
%Docstring
Renders the item to the specified render ``context``.

The ``feedback`` argument can be used to detect render cancelations during expensive
The ``feedback`` argument can be used to detect render cancellations during expensive
render operations.
%End

@@ -993,7 +993,7 @@ Set parameters of the item in accordance with the dataset group
%Docstring
Set parameters of the item in accordance with the persistent dataset group with ``uri``

:param uri: uri of the persistant dataset group
:param uri: uri of the persistent dataset group

.. versionadded:: 3.16
%End
@@ -35,7 +35,7 @@ The actual creation of the table is delegated to the connections API method
%Docstring
QgsNewVectorTableDialog constructor

:param connection: DB connection, ownership is NOT transfered
:param connection: DB connection, ownership is NOT transferred
:param parent: optional parent
%End

@@ -967,7 +967,7 @@ begginings:beginnings
beggins:begins
begining:beginning
beginnig:beginning
behaviour:behavior
behaviour:behavior:%
behavoir:behavior
behavoirs:behaviors
behavour:behavior
@@ -3129,7 +3129,7 @@ foreing:foreign
foreward:forward
forfiet:forfeit
forground:foreground
forhead:forehead
forhead:forehead:*
foriegn:foreign
Formalhaut:Fomalhaut
formallize:formalize
@@ -3181,7 +3181,7 @@ frequentily:frequently
frequncies:frequencies
frequncy:frequency
frist:first
frome:from
frome:from:*
fromed:formed:*
fron:from
froniter:frontier
@@ -50,7 +50,7 @@ class _3D_EXPORT QgsGoochMaterialSettings : public QgsAbstractMaterialSettings
static QgsAbstractMaterialSettings *create() SIP_FACTORY;

/**
* Returns TRUE if the specified \a technique is suppored by the Gooch material.
* Returns TRUE if the specified \a technique is supported by the Gooch material.
*/
static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );

@@ -45,7 +45,7 @@ class _3D_EXPORT QgsPhongMaterialSettings : public QgsAbstractMaterialSettings
QString type() const override;

/**
* Returns TRUE if the specified \a technique is suppored by the Phong material.
* Returns TRUE if the specified \a technique is supported by the Phong material.
*/
static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );

@@ -44,7 +44,7 @@ class _3D_EXPORT QgsPhongTexturedMaterialSettings : public QgsAbstractMaterialSe
QString type() const override;

/**
* Returns TRUE if the specified \a technique is suppored by the Phong material.
* Returns TRUE if the specified \a technique is supported by the Phong material.
*/
static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );

@@ -45,7 +45,7 @@ class _3D_EXPORT QgsSimpleLineMaterialSettings : public QgsAbstractMaterialSetti
QString type() const override;

/**
* Returns TRUE if the specified \a technique is suppored by the material.
* Returns TRUE if the specified \a technique is supported by the material.
*/
static bool supportsTechnique( QgsMaterialSettingsRenderingTechnique technique );

@@ -77,7 +77,7 @@ void Qgs3D::initialize()
instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "gooch" ), QObject::tr( "CAD (Gooch)" ),
QgsGoochMaterialSettings::create, QgsGoochMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconGoochMaterial.svg" ) ) ) );

// because we are usually populating the 3d registry AFTER QgsApplication initialisation, we need to defer creation
// because we are usually populating the 3d registry AFTER QgsApplication initialization, we need to defer creation
// of 3d symbols in the default style until now
QgsStyle::defaultStyle()->handleDeferred3DSymbolCreation();
}
@@ -53,7 +53,7 @@ class _3D_EXPORT Qgs3DExportObject
* \brief Qgs3DExportObject
* Constructs an export object that will be filled with coordinates later
* \param parentName
* The name of the parent (Will be useful to define scene hierarchie)
* The name of the parent (Will be useful to define scene hierarchy)
* \param parent
* The parent QObject (we use this to delete the Qgs3DExportObject instance once the exporter instance is deallocated)
*/
@@ -105,7 +105,7 @@ class _3D_EXPORT Qgs3DExportObject

//! Saves the current object to the output stream while scaling the object and centering it to be visible in exported scene
void saveTo( QTextStream &out, float scale, const QVector3D &center );
//! saves the texture of the object and material informations
//! saves the texture of the object and material information
QString saveMaterial( QTextStream &mtlOut, const QString &folder );

private:
@@ -556,7 +556,7 @@ Qgs3DExportObject *Qgs3DSceneExporter::processGeometryRenderer( Qt3DRender::QGeo
positionData = getAttributeData<float>( positionAttribute, vertexBytes );
}

// For tesselated polygons that don't have index attributes
// For tessellated polygons that don't have index attributes
if ( positionAttribute != nullptr && indexAttribute == nullptr )
{
for ( int i = 0; i < positionData.size() / 3; ++i )
@@ -94,7 +94,7 @@ class _3D_EXPORT QgsLine3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTORS
void setMaterial( QgsAbstractMaterialSettings *material SIP_TRANSFER );

/**
* Exports the geometries contained withing the hierarchy of entity.
* Exports the geometries contained within the hierarchy of entity.
* Returns whether any objects were exported
*/
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override SIP_SKIP;
@@ -116,7 +116,7 @@ class _3D_EXPORT QgsPoint3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCTOR
QMatrix4x4 billboardTransform() const;

/**
* Exports the geometries contained withing the hierarchy of entity.
* Exports the geometries contained within the hierarchy of entity.
* Returns whether any objects were exported
*/
bool exportGeometries( Qgs3DSceneExporter *exporter, Qt3DCore::QEntity *entity, const QString &objectNamePrefix ) const override SIP_SKIP;
@@ -156,7 +156,7 @@ class _3D_EXPORT QgsPolygon3DSymbol : public QgsAbstract3DSymbol SIP_NODEFAULTCT
int renderedFacade() const { return mRenderedFacade; }

/**
* Exports the geometries contained withing the hierarchy of entity.
* Exports the geometries contained within the hierarchy of entity.
* Returns whether any objects were exported
* \since QGIS 3.16
*/
@@ -390,7 +390,7 @@ int QgsDualEdgeTriangulation::addPoint( const QgsPoint &p )
{
toswap = index;
index = mHalfEdge[mHalfEdge[mHalfEdge[index]->getNext()]->getDual()]->getNext();
checkSwapRecursivly( toswap, 0 );
checkSwapRecursively( toswap, 0 );
if ( toswap == cwEdge )
{
break;
@@ -420,9 +420,9 @@ int QgsDualEdgeTriangulation::addPoint( const QgsPoint &p )
mHalfEdge.at( nextnextnumber )->setNext( static_cast<int>( edge6 ) );

//check, if there are swaps necessary
checkSwapRecursivly( number, 0 );
checkSwapRecursivly( nextnumber, 0 );
checkSwapRecursivly( nextnextnumber, 0 );
checkSwapRecursively( number, 0 );
checkSwapRecursively( nextnumber, 0 );
checkSwapRecursively( nextnextnumber, 0 );
}
//the point is exactly on an existing edge (the number of the edge is stored in the variable 'mEdgeWithPoint'---------------
else if ( number == -20 )
@@ -456,10 +456,10 @@ int QgsDualEdgeTriangulation::addPoint( const QgsPoint &p )
mHalfEdge[edgef]->setNext( nedge2 );

//swap edges if necessary
checkSwapRecursivly( edgec, 0 );
checkSwapRecursivly( edged, 0 );
checkSwapRecursivly( edgee, 0 );
checkSwapRecursivly( edgef, 0 );
checkSwapRecursively( edgec, 0 );
checkSwapRecursively( edged, 0 );
checkSwapRecursively( edgee, 0 );
checkSwapRecursively( edgef, 0 );
}

else if ( number == -100 || number == -5 )//this means unknown problems or a numerical error occurred in 'baseEdgeOfTriangle'
@@ -746,7 +746,7 @@ bool QgsDualEdgeTriangulation::calcPoint( double x, double y, QgsPoint &result )
}
}

bool QgsDualEdgeTriangulation::checkSwapRecursivly( unsigned int edge, unsigned int recursiveDeep )
bool QgsDualEdgeTriangulation::checkSwapRecursively( unsigned int edge, unsigned int recursiveDeep )
{
if ( swapPossible( edge ) )
{
@@ -756,7 +756,7 @@ bool QgsDualEdgeTriangulation::checkSwapRecursivly( unsigned int edge, unsigned
QgsPoint *ptd = mPointVector[mHalfEdge[mHalfEdge[mHalfEdge[edge]->getDual()]->getNext()]->getPoint()];
if ( inCircle( *ptd, *pta, *ptb, *ptc ) /*&& recursiveDeep < 100*/ ) //empty circle criterion violated
{
doSwapRecursivly( edge, recursiveDeep );//swap the edge (recursive)
doSwapRecursively( edge, recursiveDeep );//swap the edge (recursive)
return true;
}
}
@@ -796,7 +796,7 @@ void QgsDualEdgeTriangulation::doOnlySwap( unsigned int edge )
mHalfEdge[edge2]->setPoint( mHalfEdge[edge5]->getPoint() );
}

void QgsDualEdgeTriangulation::doSwapRecursivly( unsigned int edge, unsigned int recursiveDeep )
void QgsDualEdgeTriangulation::doSwapRecursively( unsigned int edge, unsigned int recursiveDeep )
{
unsigned int edge1 = edge;
unsigned int edge2 = mHalfEdge[edge]->getDual();
@@ -816,10 +816,10 @@ void QgsDualEdgeTriangulation::doSwapRecursivly( unsigned int edge, unsigned int

if ( recursiveDeep < 100 )
{
checkSwapRecursivly( edge3, recursiveDeep );
checkSwapRecursivly( edge6, recursiveDeep );
checkSwapRecursivly( edge4, recursiveDeep );
checkSwapRecursivly( edge5, recursiveDeep );
checkSwapRecursively( edge3, recursiveDeep );
checkSwapRecursively( edge6, recursiveDeep );
checkSwapRecursively( edge4, recursiveDeep );
checkSwapRecursively( edge5, recursiveDeep );
}
else
{
@@ -1658,7 +1658,7 @@ int QgsDualEdgeTriangulation::insertForcedSegment( int p1, int p2, QgsInterpolat
//optimisation of the new edges
for ( iter = crossedEdges.constBegin(); iter != crossedEdges.constEnd(); ++iter )
{
checkSwapRecursivly( ( *( iter ) ), 0 );
checkSwapRecursively( ( *( iter ) ), 0 );
}

return leftPolygon.first();
@@ -3293,10 +3293,10 @@ int QgsDualEdgeTriangulation::splitHalfEdge( int edge, float position )
mHalfEdge[mHalfEdge[edge3]->getNext()]->setNext( edge6 );

//test four times recursively for swapping
checkSwapRecursivly( mHalfEdge[edge5]->getNext(), 0 );
checkSwapRecursivly( mHalfEdge[edge2]->getNext(), 0 );
checkSwapRecursivly( mHalfEdge[dualedge]->getNext(), 0 );
checkSwapRecursivly( mHalfEdge[edge3]->getNext(), 0 );
checkSwapRecursively( mHalfEdge[edge5]->getNext(), 0 );
checkSwapRecursively( mHalfEdge[edge2]->getNext(), 0 );
checkSwapRecursively( mHalfEdge[dualedge]->getNext(), 0 );
checkSwapRecursively( mHalfEdge[edge3]->getNext(), 0 );

addPoint( QgsPoint( p->x(), p->y(), 0 ) );//dirty hack to enforce update of decorators

@@ -136,11 +136,11 @@ class ANALYSIS_EXPORT QgsDualEdgeTriangulation: public QgsTriangulation
*/
int baseEdgeOfTriangle( const QgsPoint &point );
//! Checks, if 'edge' has to be swapped because of the empty circle criterion. If so, doSwap(...) is called.
bool checkSwapRecursivly( unsigned int edge, unsigned int recursiveDeep );
bool checkSwapRecursively( unsigned int edge, unsigned int recursiveDeep );
//! Return true if edge need to be swapped after Delaunay criteria control
bool isEdgeNeedSwap( unsigned int edge );
//! Swaps 'edge' and test recursively for other swaps (delaunay criterion)
void doSwapRecursivly( unsigned int edge, unsigned int recursiveDeep );
void doSwapRecursively( unsigned int edge, unsigned int recursiveDeep );
//! Swaps 'edge' and does no recursiv testing
void doOnlySwap( unsigned int edge );
//! Number of an edge which does not point to the virtual point. It continuously updated for a fast search
@@ -39,7 +39,7 @@ QString QgsNetworkAnalysisAlgorithmBase::groupId() const

QgsProcessingAlgorithm::Flags QgsNetworkAnalysisAlgorithmBase::flags() const
{
// TODO -- remove the dependancy on the project from these algorithms, it shouldn't be required
// TODO -- remove the dependency on the project from these algorithms, it shouldn't be required
return QgsProcessingAlgorithm::flags() | FlagRequiresProject;
}

@@ -84,7 +84,7 @@ class CORE_EXPORT QgsAbstract3DSymbol
void setDataDefinedProperties( const QgsPropertyCollection &collection ) { mDataDefinedProperties = collection; }

/**
* Exports the geometries contained withing the hierarchy of entity.
* Exports the geometries contained within the hierarchy of entity.
* Returns whether any objects were exported
* If this function is not overloaded we don't try to export anything
*/
@@ -97,7 +97,7 @@ class CORE_EXPORT QgsAnnotationItem
/**
* Renders the item to the specified render \a context.
*
* The \a feedback argument can be used to detect render cancelations during expensive
* The \a feedback argument can be used to detect render cancellations during expensive
* render operations.
*/
virtual void render( QgsRenderContext &context, QgsFeedback *feedback ) = 0;
@@ -146,7 +146,7 @@ class CORE_EXPORT QgsMeshCalcNode
static QgsMeshCalcNode *parseMeshCalcString( const QString &str, QString &parserErrorMsg );

/**
* Returns whether the calculation wil leads to a non temporal dataset group result
* Returns whether the calculation will leads to a non temporal dataset group result
* \returns true if the result will be non temporal
*/
bool isNonTemporal() const;
@@ -704,7 +704,7 @@ class CORE_EXPORT QgsMeshMemoryDataset: public QgsMeshDataset
bool isActive( int faceIndex ) const override;
int valuesCount() const override;

//! Calulates the minimum and the maximum of this group
//! Calculates the minimum and the maximum of this group
void calculateMinMax();

QVector<QgsMeshDatasetValue> values;
@@ -966,7 +966,7 @@ class CORE_EXPORT QgsMeshDatasetGroupTreeItem
/**
* Set parameters of the item in accordance with the persistent dataset group with \a uri
*
* \param uri uri of the persistant dataset group
* \param uri uri of the persistent dataset group
*
* \since QGIS 3.16
*/
@@ -35,7 +35,7 @@ class QgsSymbol;
*
* An abstract base class for icon generators for a QgsStyleModel.
*
* This base class allows for creation of specialised icon generators for
* This base class allows for creation of specialized icon generators for
* entities in a style database, and allows for deferred icon generation.
*
* \note Not available in Python bindings
@@ -50,7 +50,7 @@ class GUI_EXPORT QgsNewVectorTableDialog : public QDialog, private Ui_QgsNewVect

/**
* QgsNewVectorTableDialog constructor
* \param connection DB connection, ownership is NOT transfered
* \param connection DB connection, ownership is NOT transferred
* \param parent optional parent
*/
QgsNewVectorTableDialog( QgsAbstractDatabaseProviderConnection *conn, QWidget *parent SIP_TRANSFERTHIS = nullptr );

0 comments on commit d1bc82c

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