Skip to content
Permalink
Browse files

Make travis even happier

  • Loading branch information
m-kuhn committed Dec 22, 2018
1 parent cb766d7 commit b87798cd8fabb6bd3a065d789b15b9ab3b5246de
@@ -51,7 +51,7 @@ This represents an error reported by a geometry check.
ValueType valueType = ValueOther );
%Docstring
Create a new geometry check error with the parent ``check`` and for the
``layerFeature`` pair at the \errorLocation. Optionally the vertex can be
``layerFeature`` pair at the ``errorLocation``. Optionally the vertex can be
specified via ``vixd`` and a ``value`` with its ``value`` Type for
additional information.
%End
@@ -157,7 +157,7 @@ If this returns true, it can be used to update existing errors after re-checking

virtual void update( const QgsGeometryCheckError *other );
%Docstring
Update this error with the information from \other.
Update this error with the information from ``other``.
Will be used to update existing errors whenever they are re-checked.
%End

@@ -38,7 +38,7 @@ Creates a new single geometry check error.

virtual void update( const QgsSingleGeometryCheckError *other );
%Docstring
Update this error with the information from \other.
Update this error with the information from ``other``.
Will be used to update existing errors whenever they are re-checked.
%End

@@ -59,7 +59,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckError

/**
* Create a new geometry check error with the parent \a check and for the
* \a layerFeature pair at the \errorLocation. Optionally the vertex can be
* \a layerFeature pair at the \a errorLocation. Optionally the vertex can be
* specified via \a vixd and a \a value with its \a value Type for
* additional information.
*/
@@ -169,7 +169,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
virtual bool closeMatch( QgsGeometryCheckError * /*other*/ ) const;

/**
* Update this error with the information from \other.
* Update this error with the information from \a other.
* Will be used to update existing errors whenever they are re-checked.
*/
virtual void update( const QgsGeometryCheckError *other );
@@ -221,7 +221,6 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils

/**
* Returns the number of points in a polyline, accounting for duplicate start and end point if the polyline is closed
* \param polyLine The polyline
* \returns The number of distinct points of the polyline
*/
static inline int polyLineSize( const QgsAbstractGeometry *geom, int iPart, int iRing, bool *isClosed = nullptr )
@@ -256,6 +256,7 @@ QgsGeometryCheck::Flags QgsGeometryGapCheck::flags() const
return factoryFlags();
}

///@cond private
QString QgsGeometryGapCheck::factoryDescription()
{
return tr( "Gap" );
@@ -285,3 +286,4 @@ QgsGeometryCheck::CheckType QgsGeometryGapCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}
///@endcond private
@@ -210,6 +210,7 @@ QList<QgsWkbTypes::GeometryType> QgsGeometryMissingVertexCheck::factoryCompatibl
return {QgsWkbTypes::PolygonGeometry};
}

///@cond private
bool QgsGeometryMissingVertexCheck::factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP
{
return factoryCompatibleGeometryTypes().contains( layer->geometryType() );
@@ -234,3 +235,4 @@ QgsGeometryCheck::CheckType QgsGeometryMissingVertexCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}
///@endcond private
@@ -227,6 +227,12 @@ QString QgsGeometryOverlapCheck::factoryDescription()
return tr( "Overlap" );
}

///@cond private
QgsGeometryCheck::CheckType QgsGeometryOverlapCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}

QString QgsGeometryOverlapCheck::factoryId()
{
return QStringLiteral( "QgsGeometryOverlapCheck" );
@@ -247,6 +253,7 @@ bool QgsGeometryOverlapCheck::factoryIsCompatible( QgsVectorLayer *layer ) SIP_S
return factoryCompatibleGeometryTypes().contains( layer->geometryType() );
}

///@endcond private
QgsGeometryOverlapCheckError::QgsGeometryOverlapCheckError( const QgsGeometryCheck *check, const QgsGeometryCheckerUtils::LayerFeature &layerFeature, const QgsGeometry &geometry, const QgsPointXY &errorLocation, const QVariant &value, const QgsGeometryCheckerUtils::LayerFeature &overlappedFeature )
: QgsGeometryCheckError( check, layerFeature.layer()->id(), layerFeature.feature().id(), geometry, errorLocation, QgsVertexId(), value, ValueArea )
, mOverlappedFeature( OverlappedFeature( overlappedFeature.layer(), overlappedFeature.feature().id() ) )
@@ -258,8 +265,3 @@ QString QgsGeometryOverlapCheckError::description() const
{
return QCoreApplication::translate( "QgsGeometryTypeCheckError", "Overlap with %1 at feature %2" ).arg( mOverlappedFeature.layerName(), QString::number( mOverlappedFeature.featureId() ) );
}

QgsGeometryCheck::CheckType QgsGeometryOverlapCheck::factoryCheckType()
{
return QgsGeometryCheck::LayerCheck;
}
@@ -333,6 +333,7 @@ QList<QgsSingleGeometryCheckError *> QgsGeometrySelfIntersectionCheck::processGe
return errors;
}

///@cond private
QList<QgsWkbTypes::GeometryType> QgsGeometrySelfIntersectionCheck::factoryCompatibleGeometryTypes()
{
return {QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry};
@@ -362,3 +363,4 @@ QgsGeometryCheck::CheckType QgsGeometrySelfIntersectionCheck::factoryCheckType()
{
return QgsGeometryCheck::FeatureNodeCheck;
}
///@endcond private
@@ -53,7 +53,7 @@ class ANALYSIS_EXPORT QgsSingleGeometryCheckError
virtual ~QgsSingleGeometryCheckError() = default;

/**
* Update this error with the information from \other.
* Update this error with the information from \a other.
* Will be used to update existing errors whenever they are re-checked.
*/
virtual void update( const QgsSingleGeometryCheckError *other );

0 comments on commit b87798c

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