Skip to content

Commit 6645348

Browse files
author
jef
committedFeb 3, 2011
update indentation of roadgraph plugin
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@15123 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent d3854f6 commit 6645348

9 files changed

+29
-29
lines changed
 

‎src/plugins/roadgraph/graphbuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
// Qgis includes
2020

2121
RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
22-
mCrs( crs )
22+
mCrs( crs )
2323
{
2424

2525
}

‎src/plugins/roadgraph/graphbuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ class RgGraphBuilder
3737

3838
//! Destructor
3939
virtual ~RgGraphBuilder();
40-
40+
4141
/**
4242
* get destinaltion Crs
4343
*/
4444
QgsCoordinateReferenceSystem& destinationCrs();
45-
45+
4646
/**
4747
* add vertex
4848
*/

‎src/plugins/roadgraph/graphdirector.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//forward declarations
2424
class RgGraphBuilder;
2525

26-
/**
26+
/**
2727
* \class RgGraphDirector
2828
* \brief Determine making the graph
2929
*/
@@ -44,8 +44,8 @@ class RgGraphDirector
4444
*
4545
* @note if tiedPoints[i]==QgsPoint(0.0,0.0) then tied failed.
4646
*/
47-
virtual void makeGraph( RgGraphBuilder *builder,
48-
const QVector< QgsPoint >& additionalPoints,
47+
virtual void makeGraph( RgGraphBuilder *builder,
48+
const QVector< QgsPoint >& additionalPoints,
4949
QVector< QgsPoint>& tiedPoints ) const = 0;
5050

5151
/**

‎src/plugins/roadgraph/linevectorlayerdirector.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -61,21 +61,21 @@ QString RgLineVectorLayerDirector::name() const
6161
return QString( "Vector line" );
6262
}
6363

64-
void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVector< QgsPoint >& additionalPoints,
64+
void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVector< QgsPoint >& additionalPoints,
6565
QVector< QgsPoint >& tiedPoint ) const
6666
{
6767
QgsVectorLayer *vl = myLayer();
6868

6969
if ( vl == NULL )
7070
return;
71-
71+
7272
QgsCoordinateTransform ct( vl->crs(), builder->destinationCrs() );
73-
73+
7474
QgsDistanceArea da;
7575
da.setSourceCrs( builder->destinationCrs().srsid() );
7676
da.setProjectionsEnabled( true );
7777

78-
tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint(0.0, 0.0) );
78+
tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint( 0.0, 0.0 ) );
7979
TiePointInfo tmpInfo;
8080
tmpInfo.mLength = infinity();
8181

@@ -97,12 +97,12 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
9797
pt2 = ct.transform( *pointIt );
9898
if ( !isFirstPoint )
9999
{
100-
int i=0;
100+
int i = 0;
101101
for ( i = 0; i != additionalPoints.size(); ++i )
102102
{
103103
TiePointInfo info;
104104
info.mLength = additionalPoints[ i ].sqrDistToSegment( pt1.x(), pt1.y(), pt2.x(), pt2.y(), info.mTiedPoint );
105-
105+
106106
if ( pointLengthMap[ i ].mLength > info.mLength )
107107
{
108108
info.mFirstPoint = pt1;
@@ -182,17 +182,17 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
182182
for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )
183183
{
184184
pt2 = ct.transform( *pointIt );
185-
185+
186186
std::map< double, QgsPoint > pointsOnArc;
187187
pointsOnArc[ 0.0 ] = pt1;
188-
pointsOnArc[ pt1.sqrDist( pt2 ) ] = pt2;
188+
pointsOnArc[ pt1.sqrDist( pt2 )] = pt2;
189189

190-
for( pointLengthIt = pointLengthMap.begin(); pointLengthIt != pointLengthMap.end(); ++pointLengthIt )
190+
for ( pointLengthIt = pointLengthMap.begin(); pointLengthIt != pointLengthMap.end(); ++pointLengthIt )
191191
{
192192
if ( pointLengthIt->mFirstPoint == pt1 && pointLengthIt->mLastPoint == pt2 )
193193
{
194194
QgsPoint tiedPoint = pointLengthIt->mTiedPoint;
195-
pointsOnArc[ pt1.sqrDist( tiedPoint ) ] = tiedPoint;
195+
pointsOnArc[ pt1.sqrDist( tiedPoint )] = tiedPoint;
196196
}
197197
}
198198

@@ -207,21 +207,21 @@ void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVecto
207207
pt2 = pointsIt->second;
208208
if ( !isFirstPoint )
209209
{
210-
double cost = da.measureLine( pt1, pt2 );
210+
double cost = da.measureLine( pt1, pt2 );
211211
if ( directionType == 1 ||
212212
directionType == 3 )
213213
{
214214
builder->addArc( pt1, pt2, cost, speed*su.multipler() );
215215
}
216-
if ( directionType == 2 ||
216+
if ( directionType == 2 ||
217217
directionType == 3 )
218218
{
219219
builder->addArc( pt2, pt1, cost, speed*su.multipler() );
220220
}
221221
}
222222
pt1 = pt2;
223223
isFirstPoint = false;
224-
}
224+
}
225225
} // if ( !isFirstPoint )
226226
pt1 = pt2;
227227
isFirstPoint = false;

‎src/plugins/roadgraph/linevectorlayerdirector.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ class RgLineVectorLayerDirector : public RgGraphDirector
5656
/**
5757
* MANDATORY DIRECTOR PROPERTY DECLARATION
5858
*/
59-
void makeGraph( RgGraphBuilder *builder,
59+
void makeGraph( RgGraphBuilder *builder,
6060
const QVector< QgsPoint >& additionalPoints,
6161
QVector< QgsPoint>& tiedPoints ) const;
62-
62+
6363
QString name() const;
6464

6565
private:

‎src/plugins/roadgraph/roadgraphplugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void RoadGraphPlugin::render( QPainter *painter )
296296
if ( graphDirector == NULL )
297297
return;
298298

299-
RgSimpleGraphBuilder builder ( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs() );
299+
RgSimpleGraphBuilder builder( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs() );
300300
QVector< QgsPoint > null;
301301
graphDirector->makeGraph( &builder , null, null );
302302
AdjacencyMatrix m = builder.adjacencyMatrix();

‎src/plugins/roadgraph/shortestpathwidget.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -233,9 +233,9 @@ bool RgShortestPathWidget::getPath( AdjacencyMatrix& matrix, QgsPoint& p1, QgsPo
233233
}
234234
QVector< QgsPoint > points;
235235
QVector< QgsPoint > tiedPoint;
236-
236+
237237
points.push_back( mFrontPoint );
238-
points.push_back( mBackPoint );
238+
points.push_back( mBackPoint );
239239

240240
director->makeGraph( &builder, points, tiedPoint );
241241
p1 = tiedPoint[ 0 ];
@@ -244,12 +244,12 @@ bool RgShortestPathWidget::getPath( AdjacencyMatrix& matrix, QgsPoint& p1, QgsPo
244244
delete director;
245245
}
246246

247-
if ( p1 == QgsPoint(0.0, 0.0) )
247+
if ( p1 == QgsPoint( 0.0, 0.0 ) )
248248
{
249249
QMessageBox::critical( this, tr( "Tie point failed" ), tr( "Start point doesn't tie to the road!" ) );
250250
return false;
251251
}
252-
if ( p1 == QgsPoint(0.0, 0.0) )
252+
if ( p1 == QgsPoint( 0.0, 0.0 ) )
253253
{
254254
QMessageBox::critical( this, tr( "Tie point failed" ), tr( "Stop point doesn't tie to the road!" ) );
255255
return false;

‎src/plugins/roadgraph/simplegraphbuilder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
// Qgis includes
2121

2222
RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
23-
RgGraphBuilder( crs )
23+
RgGraphBuilder( crs )
2424
{
2525
}
2626

‎src/plugins/roadgraph/simplegraphbuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ class RgSimpleGraphBuilder : public RgGraphBuilder
3838
* default constructor
3939
*/
4040
RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs );
41-
41+
4242
/**
4343
* MANDATORY BUILDER PROPERTY DECLARATION
4444
*/
4545
void addVertex( const QgsPoint& pt );
4646
void addArc( const QgsPoint& pt1, const QgsPoint& pt2, double cost, double speed );
47-
47+
4848
/**
4949
* return Adjacecncy matrix;
5050
*/

0 commit comments

Comments
 (0)