Skip to content

Commit 1e8f819

Browse files
m-kuhnm-kuhn
committedJan 21, 2019
Rename files because there are two densify algs
·
ltr-3_40final-3_6_0
1 parent 9452667 commit 1e8f819

File tree

4 files changed

+21
-21
lines changed

4 files changed

+21
-21
lines changed
 

‎src/analysis/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SET(QGIS_ANALYSIS_SRCS
3232
processing/qgsalgorithmclip.cpp
3333
processing/qgsalgorithmconvexhull.cpp
3434
processing/qgsalgorithmdbscanclustering.cpp
35-
processing/qgsalgorithmdensifygeometries.cpp
35+
processing/qgsalgorithmdensifygeometriesbyinterval.cpp
3636
processing/qgsalgorithmdifference.cpp
3737
processing/qgsalgorithmdissolve.cpp
3838
processing/qgsalgorithmdrape.cpp

‎src/analysis/processing/qgsalgorithmdensifygeometries.cpp renamed to ‎src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,70 +16,70 @@
1616
***************************************************************************/
1717

1818

19-
#include "qgsalgorithmdensifygeometries.h"
19+
#include "qgsalgorithmdensifygeometriesbyinterval.h"
2020

21-
QString QgsDensifyGeometriesAlgorithm::name() const
21+
QString QgsDensifyGeometriesByIntervalAlgorithm::name() const
2222
{
2323
return QStringLiteral( "densifygeometriesgivenaninterval" );
2424
}
2525

26-
QString QgsDensifyGeometriesAlgorithm::displayName() const
26+
QString QgsDensifyGeometriesByIntervalAlgorithm::displayName() const
2727
{
2828
return QObject::tr( "Densify by interval" );
2929
}
3030

31-
QStringList QgsDensifyGeometriesAlgorithm::tags() const
31+
QStringList QgsDensifyGeometriesByIntervalAlgorithm::tags() const
3232
{
3333
return QObject::tr( "add,vertex,vertices,points,nodes" ).split( ',' );
3434
}
3535

36-
QString QgsDensifyGeometriesAlgorithm::group() const
36+
QString QgsDensifyGeometriesByIntervalAlgorithm::group() const
3737
{
3838
return QObject::tr( "Vector geometry" );
3939
}
4040

41-
QString QgsDensifyGeometriesAlgorithm::groupId() const
41+
QString QgsDensifyGeometriesByIntervalAlgorithm::groupId() const
4242
{
4343
return QStringLiteral( "vectorgeometry" );
4444
}
4545

46-
QString QgsDensifyGeometriesAlgorithm::shortHelpString() const
46+
QString QgsDensifyGeometriesByIntervalAlgorithm::shortHelpString() const
4747
{
4848
return QObject::tr( "Geometries are densified by adding additional vertices on "
4949
"edges that have a maximum distance of the interval parameter "
5050
"in map units." );
5151
}
5252

53-
QString QgsDensifyGeometriesAlgorithm::shortDescription() const
53+
QString QgsDensifyGeometriesByIntervalAlgorithm::shortDescription() const
5454
{
5555
return QObject::tr( "Creates a densified version of geometries." );
5656
}
5757

58-
QgsDensifyGeometriesAlgorithm *QgsDensifyGeometriesAlgorithm::createInstance() const
58+
QgsDensifyGeometriesByIntervalAlgorithm *QgsDensifyGeometriesByIntervalAlgorithm::createInstance() const
5959
{
60-
return new QgsDensifyGeometriesAlgorithm;
60+
return new QgsDensifyGeometriesByIntervalAlgorithm;
6161

6262
}
6363

64-
QList<int> QgsDensifyGeometriesAlgorithm::inputLayerTypes() const
64+
QList<int> QgsDensifyGeometriesByIntervalAlgorithm::inputLayerTypes() const
6565
{
6666
return QList<int>() << QgsProcessing::TypeVectorLine << QgsProcessing::TypeVectorPolygon;
6767
}
6868

69-
void QgsDensifyGeometriesAlgorithm::initParameters( const QVariantMap &configuration )
69+
void QgsDensifyGeometriesByIntervalAlgorithm::initParameters( const QVariantMap &configuration )
7070
{
7171
Q_UNUSED( configuration )
7272
addParameter( new QgsProcessingParameterDistance( QStringLiteral( "INTERVAL" ),
7373
QObject::tr( "Interval between vertices to add" ),
7474
1, QStringLiteral( "INPUT" ), false, 0, 10000000 ) );
7575
}
7676

77-
QString QgsDensifyGeometriesAlgorithm::outputName() const
77+
QString QgsDensifyGeometriesByIntervalAlgorithm::outputName() const
7878
{
7979
return QObject::tr( "Densified" );
8080
}
8181

82-
QgsFeatureList QgsDensifyGeometriesAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
82+
QgsFeatureList QgsDensifyGeometriesByIntervalAlgorithm::processFeature( const QgsFeature &feature, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
8383
{
8484
Q_UNUSED( context );
8585
Q_UNUSED( feedback );
@@ -90,7 +90,7 @@ QgsFeatureList QgsDensifyGeometriesAlgorithm::processFeature( const QgsFeature &
9090
return QgsFeatureList() << modifiedFeature;
9191
}
9292

93-
bool QgsDensifyGeometriesAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
93+
bool QgsDensifyGeometriesByIntervalAlgorithm::prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback )
9494
{
9595
Q_UNUSED( feedback );
9696
mInterval = parameterAsDouble( parameters, QStringLiteral( "INTERVAL" ), context );

‎src/analysis/processing/qgsalgorithmdensifygeometries.h renamed to ‎src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
///@cond PRIVATE
2727

2828

29-
class QgsDensifyGeometriesAlgorithm : public QgsProcessingFeatureBasedAlgorithm
29+
class QgsDensifyGeometriesByIntervalAlgorithm : public QgsProcessingFeatureBasedAlgorithm
3030
{
3131
public:
3232

33-
QgsDensifyGeometriesAlgorithm() = default;
33+
QgsDensifyGeometriesByIntervalAlgorithm() = default;
3434
QString name() const override;
3535
QString displayName() const override;
3636
QStringList tags() const override;
3737
QString group() const override;
3838
QString groupId() const override;
3939
QString shortHelpString() const override;
4040
QString shortDescription() const override;
41-
QgsDensifyGeometriesAlgorithm *createInstance() const override SIP_FACTORY;
41+
QgsDensifyGeometriesByIntervalAlgorithm *createInstance() const override SIP_FACTORY;
4242
QList<int> inputLayerTypes() const override;
4343

4444
protected:

‎src/analysis/processing/qgsnativealgorithms.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "qgsalgorithmclip.h"
2828
#include "qgsalgorithmconvexhull.h"
2929
#include "qgsalgorithmdbscanclustering.h"
30-
#include "qgsalgorithmdensifygeometries.h"
30+
#include "qgsalgorithmdensifygeometriesbyinterval.h"
3131
#include "qgsalgorithmdifference.h"
3232
#include "qgsalgorithmdissolve.h"
3333
#include "qgsalgorithmdrape.h"
@@ -247,7 +247,7 @@ void QgsNativeAlgorithms::loadAlgorithms()
247247
addAlgorithm( new QgsWedgeBuffersAlgorithm() );
248248
addAlgorithm( new QgsZonalHistogramAlgorithm() );
249249
addAlgorithm( new QgsPolygonsToLinesAlgorithm() );
250-
addAlgorithm( new QgsDensifyGeometriesAlgorithm() );
250+
addAlgorithm( new QgsDensifyGeometriesByIntervalAlgorithm() );
251251
}
252252

253253

0 commit comments

Comments
 (0)
Please sign in to comment.