Skip to content

Commit b421a53

Browse files
alexbruyalexbruy
committedNov 21, 2016
rename QgsLineVectorLayerDirector to QgsVectorLayerDirector
·
ltr-3_40final-3_0_0
1 parent d657c77 commit b421a53

File tree

10 files changed

+50
-50
lines changed

10 files changed

+50
-50
lines changed
 

‎python/analysis/analysis.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,5 @@
6060
%Include network/qgsgraphbuilderinterface.sip
6161
%Include network/qgsgraphbuilder.sip
6262
%Include network/qgsgraphdirector.sip
63-
%Include network/qgslinevectorlayerdirector.sip
63+
%Include network/qgsvectorlayerdirector.sip
6464
%Include network/qgsgraphanalyzer.sip

‎python/analysis/network/qgsgraphdirector.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%ModuleHeaderCode
2-
#include <qgslinevectorlayerdirector.h>
2+
#include <qgsvectorlayerdirector.h>
33
%End
44

55
/**
@@ -14,8 +14,8 @@ class QgsGraphDirector : QObject
1414
%End
1515

1616
%ConvertToSubClassCode
17-
if ( dynamic_cast< QgsLineVectorLayerDirector* > ( sipCpp ) != NULL )
18-
sipType = sipType_QgsLineVectorLayerDirector;
17+
if ( dynamic_cast< QgsVectorLayerDirector* > ( sipCpp ) != NULL )
18+
sipType = sipType_QgsVectorLayerDirector;
1919
else
2020
sipType = NULL;
2121
%End

‎python/analysis/network/qgslinevectorlayerdirector.sip renamed to ‎python/analysis/network/qgsvectorlayerdirector.sip

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* \ingroup analysis
3-
* \class QgsLineVectorLayerDirector
3+
* \class QgsVectorLayerDirector
44
* \brief Determine making the graph from vector line layer
55
*/
6-
class QgsLineVectorLayerDirector : QgsGraphDirector
6+
class QgsVectorLayerDirector : QgsGraphDirector
77
{
88
%TypeHeaderCode
9-
#include <qgslinevectorlayerdirector.h>
9+
#include <qgsvectorlayerdirector.h>
1010
%End
1111

1212
public:
@@ -32,16 +32,16 @@ class QgsLineVectorLayerDirector : QgsGraphDirector
3232
* @param defaultDirection default road direction. Will be used if corresponding
3333
* attribute value is not set or does not equal to the given values
3434
*/
35-
QgsLineVectorLayerDirector( QgsVectorLayer* myLayer,
36-
int directionFieldId,
37-
const QString& directDirectionValue,
38-
const QString& reverseDirectionValue,
39-
const QString& bothDirectionValue,
40-
const Direction defaultDirection
41-
);
35+
QgsVectorLayerDirector( QgsVectorLayer* myLayer,
36+
int directionFieldId,
37+
const QString& directDirectionValue,
38+
const QString& reverseDirectionValue,
39+
const QString& bothDirectionValue,
40+
const Direction defaultDirection
41+
);
4242

4343
//! Destructor
44-
virtual ~QgsLineVectorLayerDirector();
44+
virtual ~QgsVectorLayerDirector();
4545

4646
/*
4747
* MANDATORY DIRECTOR PROPERTY DECLARATION

‎src/analysis/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ SET(QGIS_ANALYSIS_SRCS
5151
network/qgsgraphbuilder.cpp
5252
network/qgsnetworkspeedstrategy.cpp
5353
network/qgsnetworkdistancestrategy.cpp
54-
network/qgslinevectorlayerdirector.cpp
54+
network/qgsvectorlayerdirector.cpp
5555
network/qgsgraphanalyzer.cpp
5656
)
5757

@@ -61,7 +61,7 @@ SET(QGIS_ANALYSIS_MOC_HDRS
6161
vector/qgsgeometrysnapper.h
6262

6363
network/qgsgraphdirector.h
64-
network/qgslinevectorlayerdirector.h
64+
network/qgsvectorlayerdirector.h
6565
)
6666

6767
INCLUDE_DIRECTORIES(SYSTEM ${SPATIALITE_INCLUDE_DIR})
@@ -150,7 +150,7 @@ SET(QGIS_ANALYSIS_HDRS
150150
network/qgsnetworkspeedstrategy.h
151151
network/qgsnetworkdistancestrategy.h
152152
network/qgsgraphdirector.h
153-
network/qgslinevectorlayerdirector.h
153+
network/qgsvectorlayerdirector.h
154154
network/qgsgraphanalyzer.h
155155
)
156156

‎src/analysis/network/qgslinevectorlayerdirector.cpp renamed to ‎src/analysis/network/qgsvectorlayerdirector.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* \brief implementation of QgsLineVectorLayerDirector
1919
*/
2020

21-
#include "qgslinevectorlayerdirector.h"
21+
#include "qgsvectorlayerdirector.h"
2222
#include "qgsgraphbuilderinterface.h"
2323

2424
#include "qgsfeatureiterator.h"
@@ -102,7 +102,7 @@ bool TiePointInfoCompare( const TiePointInfo& a, const TiePointInfo& b )
102102
return a.mFirstPoint.x() == b.mFirstPoint.x() ? a.mFirstPoint.y() < b.mFirstPoint.y() : a.mFirstPoint.x() < b.mFirstPoint.x();
103103
}
104104

105-
QgsLineVectorLayerDirector::QgsLineVectorLayerDirector( QgsVectorLayer *myLayer,
105+
QgsVectorLayerDirector::QgsVectorLayerDirector( QgsVectorLayer *myLayer,
106106
int directionFieldId,
107107
const QString& directDirectionValue,
108108
const QString& reverseDirectionValue,
@@ -118,17 +118,17 @@ QgsLineVectorLayerDirector::QgsLineVectorLayerDirector( QgsVectorLayer *myLayer,
118118
mBothDirectionValue = bothDirectionValue;
119119
}
120120

121-
QgsLineVectorLayerDirector::~QgsLineVectorLayerDirector()
121+
QgsVectorLayerDirector::~QgsVectorLayerDirector()
122122
{
123123

124124
}
125125

126-
QString QgsLineVectorLayerDirector::name() const
126+
QString QgsVectorLayerDirector::name() const
127127
{
128128
return QStringLiteral( "Vector line" );
129129
}
130130

131-
void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, const QVector< QgsPoint >& additionalPoints,
131+
void QgsVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, const QVector< QgsPoint >& additionalPoints,
132132
QVector< QgsPoint >& snappedPoints ) const
133133
{
134134
QgsVectorLayer *vl = mVectorLayer;

‎src/analysis/network/qgslinevectorlayerdirector.h renamed to ‎src/analysis/network/qgsvectorlayerdirector.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/***************************************************************************
2-
qgslinevectorlayerdirector.h
2+
qgsvectorlayerdirector.h
33
--------------------------------------
44
Date : 2010-10-20
55
Copyright : (C) 2010 by Yakushev Sergey
@@ -13,8 +13,8 @@
1313
* *
1414
***************************************************************************/
1515

16-
#ifndef QGSLINEVECTORLAYERDIRECTOR_H
17-
#define QGSLINEVECTORLAYERDIRECTOR_H
16+
#ifndef QGSVECTORLAYERDIRECTOR_H
17+
#define QGSVECTORLAYERDIRECTOR_H
1818

1919
#include "qgsgraphdirector.h"
2020

@@ -23,10 +23,10 @@ class QgsVectorLayer;
2323

2424
/**
2525
* \ingroup analysis
26-
* \class QgsLineVectorLayerDirector
26+
* \class QgsVectorLayerDirector
2727
* \brief Determine making the graph from vector line layer
2828
*/
29-
class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
29+
class ANALYSIS_EXPORT QgsVectorLayerDirector : public QgsGraphDirector
3030
{
3131
Q_OBJECT
3232

@@ -55,7 +55,7 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
5555
* @param defaultDirection default road direction. Will be used if corresponding
5656
* attribute value is not set or does not equal to the given values
5757
*/
58-
QgsLineVectorLayerDirector( QgsVectorLayer* myLayer,
58+
QgsVectorLayerDirector( QgsVectorLayer* myLayer,
5959
int directionFieldId,
6060
const QString& directDirectionValue,
6161
const QString& reverseDirectionValue,
@@ -64,7 +64,7 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
6464
);
6565

6666
//! Destructor
67-
virtual ~QgsLineVectorLayerDirector();
67+
virtual ~QgsVectorLayerDirector();
6868

6969
/*
7070
* MANDATORY DIRECTOR PROPERTY DECLARATION
@@ -84,4 +84,4 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
8484
Direction mDefaultDirection;
8585
};
8686

87-
#endif // QGSLINEVECTORLAYERDIRECTOR_H
87+
#endif // QGSVECTORLAYERDIRECTOR_H

‎src/plugins/roadgraph/linevectorlayersettings.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
//standard includes
3030

3131
RgLineVectorLayerSettings::RgLineVectorLayerSettings()
32-
: mDefaultDirection( QgsLineVectorLayerDirector::Direction::DirectionBoth )
32+
: mDefaultDirection( QgsVectorLayerDirector::Direction::DirectionBoth )
3333
, mDefaultSpeed( 40 )
3434
{
3535
}
@@ -58,7 +58,7 @@ bool RgLineVectorLayerSettings::test()
5858

5959
void RgLineVectorLayerSettings::read( const QgsProject *project )
6060
{
61-
mDefaultDirection = static_cast<QgsLineVectorLayerDirector::Direction>( project->readNumEntry( QStringLiteral( "roadgraphplugin" ), QStringLiteral( "/defaultDirection" ) ) );
61+
mDefaultDirection = static_cast<QgsVectorLayerDirector::Direction>( project->readNumEntry( QStringLiteral( "roadgraphplugin" ), QStringLiteral( "/defaultDirection" ) ) );
6262
mDirection = project->readEntry( QStringLiteral( "roadgraphplugin" ), QStringLiteral( "/directionField" ) );
6363
mFirstPointToLastPointDirectionVal =
6464
project->readEntry( QStringLiteral( "roadgraphplugin" ), QStringLiteral( "/FirstPointToLastPointDirectionVal" ) );
@@ -105,15 +105,15 @@ void RgLineVectorLayerSettings::setFromGui( QWidget *myGui )
105105

106106
if ( w->mcbDirectionDefault->currentIndex() == 0 )
107107
{
108-
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionBoth;
108+
mDefaultDirection = QgsVectorLayerDirector::Direction::DirectionBoth;
109109
}
110110
else if ( w->mcbDirectionDefault->currentIndex() == 1 )
111111
{
112-
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionForward;
112+
mDefaultDirection = QgsVectorLayerDirector::Direction::DirectionForward;
113113
}
114114
else if ( w->mcbDirectionDefault->currentIndex() == 2 )
115115
{
116-
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionBackward;
116+
mDefaultDirection = QgsVectorLayerDirector::Direction::DirectionBackward;
117117
}
118118

119119
mSpeed = w->mcbSpeed->currentText();

‎src/plugins/roadgraph/linevectorlayersettings.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
// QT includes
1818
#include <qstring.h>
1919

20-
#include <qgslinevectorlayerdirector.h>
20+
#include <qgsvectorlayerdirector.h>
2121

2222
// Qgis includes
2323

@@ -95,7 +95,7 @@ class RgLineVectorLayerSettings: public RgSettings
9595
/**
9696
* contained Default direction
9797
*/
98-
QgsLineVectorLayerDirector::Direction mDefaultDirection;
98+
QgsVectorLayerDirector::Direction mDefaultDirection;
9999

100100
/**
101101
* contained speed filed name

‎src/plugins/roadgraph/linevectorlayerwidget.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,13 +143,13 @@ RgLineVectorLayerSettingsWidget::RgLineVectorLayerSettingsWidget( RgLineVectorLa
143143

144144
switch ( s->mDefaultDirection )
145145
{
146-
case QgsLineVectorLayerDirector::Direction::DirectionBoth:
146+
case QgsVectorLayerDirector::Direction::DirectionBoth:
147147
mcbDirectionDefault->setCurrentIndex( 0 );
148148
break;
149-
case QgsLineVectorLayerDirector::Direction::DirectionForward:
149+
case QgsVectorLayerDirector::Direction::DirectionForward:
150150
mcbDirectionDefault->setCurrentIndex( 1 );
151151
break;
152-
case QgsLineVectorLayerDirector::Direction::DirectionBackward:
152+
case QgsVectorLayerDirector::Direction::DirectionBackward:
153153
mcbDirectionDefault->setCurrentIndex( 2 );
154154
break;
155155
}

‎src/plugins/roadgraph/roadgraphplugin.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <qgsvectorlayer.h>
2727
#include <qgsvectordataprovider.h>
2828

29-
#include <qgslinevectorlayerdirector.h>
29+
#include <qgsvectorlayerdirector.h>
3030
#include <qgsgraphbuilder.h>
3131
#include <qgsgraph.h>
3232
#include <qgsnetworkdistancestrategy.h>
@@ -210,14 +210,14 @@ const QgsGraphDirector* RoadGraphPlugin::director() const
210210
{
211211
SpeedUnit speedUnit = SpeedUnit::byName( mSettings->mSpeedUnitName );
212212

213-
QgsLineVectorLayerDirector * director =
214-
new QgsLineVectorLayerDirector( layer,
215-
layer->fields().lookupField( mSettings->mDirection ),
216-
mSettings->mFirstPointToLastPointDirectionVal,
217-
mSettings->mLastPointToFirstPointDirectionVal,
218-
mSettings->mBothDirectionVal,
219-
mSettings->mDefaultDirection
220-
);
213+
QgsVectorLayerDirector * director =
214+
new QgsVectorLayerDirector( layer,
215+
layer->fields().lookupField( mSettings->mDirection ),
216+
mSettings->mFirstPointToLastPointDirectionVal,
217+
mSettings->mLastPointToFirstPointDirectionVal,
218+
mSettings->mBothDirectionVal,
219+
mSettings->mDefaultDirection
220+
);
221221
director->addStrategy( new QgsNetworkDistanceStrategy() );
222222
director->addStrategy( new QgsNetworkSpeedStrategy( layer->fields().lookupField( mSettings->mSpeed ),
223223
mSettings->mDefaultSpeed, speedUnit.multipler() ) );

0 commit comments

Comments
 (0)
Please sign in to comment.