Skip to content

Commit d657c77

Browse files
alexbruyalexbruy
committedNov 21, 2016
rename enum and its values
·
ltr-3_40final-3_0_0
1 parent 9dffe64 commit d657c77

File tree

7 files changed

+32
-37
lines changed

7 files changed

+32
-37
lines changed
 

‎python/analysis/network/qgslinevectorlayerdirector.sip

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ class QgsLineVectorLayerDirector : QgsGraphDirector
1616
* from the end point to the start point) and bidirectional or two-way
1717
* (one can move in any direction)
1818
*/
19-
enum RoadDirection
19+
enum Direction
2020
{
21-
RoadDirect, //!< One-way direct
22-
RoadReversed, //!< One-way reversed
23-
RoadBidirectional, //!< Two-way
21+
DirectionForward, //!< One-way direct
22+
DirectionBackward, //!< One-way reversed
23+
DirectionBoth, //!< Two-way
2424
};
2525

2626
/**
@@ -37,7 +37,7 @@ class QgsLineVectorLayerDirector : QgsGraphDirector
3737
const QString& directDirectionValue,
3838
const QString& reverseDirectionValue,
3939
const QString& bothDirectionValue,
40-
const RoadDirection defaultDirection
40+
const Direction defaultDirection
4141
);
4242

4343
//! Destructor

‎src/analysis/network/qgslinevectorlayerdirector.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,12 @@ 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+
QgsLineVectorLayerDirector::QgsLineVectorLayerDirector( QgsVectorLayer *myLayer,
106106
int directionFieldId,
107107
const QString& directDirectionValue,
108108
const QString& reverseDirectionValue,
109109
const QString& bothDirectionValue,
110-
const RoadDirection defaultDirection
110+
const Direction defaultDirection
111111
)
112112
{
113113
mVectorLayer = myLayer;
@@ -284,21 +284,21 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
284284
fit = vl->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( la ) );
285285
while ( fit.nextFeature( feature ) )
286286
{
287-
RoadDirection directionType = mDefaultDirection;
287+
Direction directionType = mDefaultDirection;
288288

289289
// What direction have feature?
290290
QString str = feature.attribute( mDirectionFieldId ).toString();
291291
if ( str == mBothDirectionValue )
292292
{
293-
directionType = RoadDirection::RoadBidirectional;
293+
directionType = Direction::DirectionBoth;
294294
}
295295
else if ( str == mDirectDirectionValue )
296296
{
297-
directionType = RoadDirection::RoadDirect;
297+
directionType = Direction::DirectionForward;
298298
}
299299
else if ( str == mReverseDirectionValue )
300300
{
301-
directionType = RoadDirection::RoadReversed;
301+
directionType = Direction::DirectionBackward;
302302
}
303303

304304
// begin features segments and add arc to the Graph;
@@ -372,13 +372,13 @@ void QgsLineVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, c
372372
prop.push_back(( *it )->cost( distance, feature ) );
373373
}
374374

375-
if ( directionType == RoadDirection::RoadDirect ||
376-
directionType == RoadDirection::RoadBidirectional )
375+
if ( directionType == Direction::DirectionForward ||
376+
directionType == Direction::DirectionBoth )
377377
{
378378
builder->addEdge( pt1idx, pt1, pt2idx, pt2, prop );
379379
}
380-
if ( directionType == RoadDirection::RoadReversed ||
381-
directionType == RoadDirection::RoadBidirectional )
380+
if ( directionType == Direction::DirectionBackward ||
381+
directionType == Direction::DirectionBoth )
382382
{
383383
builder->addEdge( pt2idx, pt2, pt1idx, pt1, prop );
384384
}

‎src/analysis/network/qgslinevectorlayerdirector.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
3838
* from the end point to the start point) and bidirectional or two-way
3939
* (one can move in any direction)
4040
*/
41-
enum RoadDirection
41+
enum Direction
4242
{
43-
RoadDirect, //!< One-way direct
44-
RoadReversed, //!< One-way reversed
45-
RoadBidirectional, //!< Two-way
43+
DirectionForward, //!< One-way direct
44+
DirectionBackward, //!< One-way reversed
45+
DirectionBoth, //!< Two-way
4646
};
4747

4848
/**
@@ -60,7 +60,7 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
6060
const QString& directDirectionValue,
6161
const QString& reverseDirectionValue,
6262
const QString& bothDirectionValue,
63-
const RoadDirection defaultDirection
63+
const Direction defaultDirection
6464
);
6565

6666
//! Destructor
@@ -77,16 +77,11 @@ class ANALYSIS_EXPORT QgsLineVectorLayerDirector : public QgsGraphDirector
7777

7878
private:
7979
QgsVectorLayer *mVectorLayer;
80-
8180
int mDirectionFieldId;
82-
8381
QString mDirectDirectionValue;
84-
8582
QString mReverseDirectionValue;
86-
8783
QString mBothDirectionValue;
88-
89-
RoadDirection mDefaultDirection;
84+
Direction mDefaultDirection;
9085
};
9186

9287
#endif // QGSLINEVECTORLAYERDIRECTOR_H

‎src/analysis/network/qgsnetworkspeedstrategy.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
#include <qgsnetworkstrategy.h>
2020

2121
/** \ingroup analysis
22-
* \class QgsSpeedStrategy
22+
* \class QgsNetworkSpeedStrategy
2323
* \note added in QGIS 3.0
24-
* \brief Strategy for caclucating edge cost based on travel time. Should be
24+
* \brief Strategy for calcucating edge cost based on travel time. Should be
2525
* used for finding fastest path between two points.
2626
*/
2727
class ANALYSIS_EXPORT QgsNetworkSpeedStrategy : public QgsNetworkStrategy

‎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::RoadDirection::RoadBidirectional )
32+
: mDefaultDirection( QgsLineVectorLayerDirector::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::RoadDirection> ( project->readNumEntry( QStringLiteral( "roadgraphplugin" ), QStringLiteral( "/defaultDirection" ) ) );
61+
mDefaultDirection = static_cast<QgsLineVectorLayerDirector::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::RoadDirection::RoadBidirectional;
108+
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionBoth;
109109
}
110110
else if ( w->mcbDirectionDefault->currentIndex() == 1 )
111111
{
112-
mDefaultDirection = QgsLineVectorLayerDirector::RoadDirection::RoadDirect;
112+
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionForward;
113113
}
114114
else if ( w->mcbDirectionDefault->currentIndex() == 2 )
115115
{
116-
mDefaultDirection = QgsLineVectorLayerDirector::RoadDirection::RoadReversed;
116+
mDefaultDirection = QgsLineVectorLayerDirector::Direction::DirectionBackward;
117117
}
118118

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

‎src/plugins/roadgraph/linevectorlayersettings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class RgLineVectorLayerSettings: public RgSettings
9595
/**
9696
* contained Default direction
9797
*/
98-
QgsLineVectorLayerDirector::RoadDirection mDefaultDirection;
98+
QgsLineVectorLayerDirector::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::RoadDirection::RoadBidirectional:
146+
case QgsLineVectorLayerDirector::Direction::DirectionBoth:
147147
mcbDirectionDefault->setCurrentIndex( 0 );
148148
break;
149-
case QgsLineVectorLayerDirector::RoadDirection::RoadDirect:
149+
case QgsLineVectorLayerDirector::Direction::DirectionForward:
150150
mcbDirectionDefault->setCurrentIndex( 1 );
151151
break;
152-
case QgsLineVectorLayerDirector::RoadDirection::RoadReversed:
152+
case QgsLineVectorLayerDirector::Direction::DirectionBackward:
153153
mcbDirectionDefault->setCurrentIndex( 2 );
154154
break;
155155
}

0 commit comments

Comments
 (0)
Please sign in to comment.