[QGIS Commit] r15123 - trunk/qgis/src/plugins/roadgraph
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Thu Feb 3 04:25:33 EST 2011
Author: jef
Date: 2011-02-03 01:25:33 -0800 (Thu, 03 Feb 2011)
New Revision: 15123
Modified:
trunk/qgis/src/plugins/roadgraph/graphbuilder.cpp
trunk/qgis/src/plugins/roadgraph/graphbuilder.h
trunk/qgis/src/plugins/roadgraph/graphdirector.h
trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.cpp
trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.h
trunk/qgis/src/plugins/roadgraph/roadgraphplugin.cpp
trunk/qgis/src/plugins/roadgraph/shortestpathwidget.cpp
trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.cpp
trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.h
Log:
update indentation of roadgraph plugin
Modified: trunk/qgis/src/plugins/roadgraph/graphbuilder.cpp
===================================================================
--- trunk/qgis/src/plugins/roadgraph/graphbuilder.cpp 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/graphbuilder.cpp 2011-02-03 09:25:33 UTC (rev 15123)
@@ -19,7 +19,7 @@
// Qgis includes
RgGraphBuilder::RgGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
- mCrs( crs )
+ mCrs( crs )
{
}
Modified: trunk/qgis/src/plugins/roadgraph/graphbuilder.h
===================================================================
--- trunk/qgis/src/plugins/roadgraph/graphbuilder.h 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/graphbuilder.h 2011-02-03 09:25:33 UTC (rev 15123)
@@ -37,12 +37,12 @@
//! Destructor
virtual ~RgGraphBuilder();
-
+
/**
* get destinaltion Crs
*/
QgsCoordinateReferenceSystem& destinationCrs();
-
+
/**
* add vertex
*/
Modified: trunk/qgis/src/plugins/roadgraph/graphdirector.h
===================================================================
--- trunk/qgis/src/plugins/roadgraph/graphdirector.h 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/graphdirector.h 2011-02-03 09:25:33 UTC (rev 15123)
@@ -23,7 +23,7 @@
//forward declarations
class RgGraphBuilder;
-/**
+/**
* \class RgGraphDirector
* \brief Determine making the graph
*/
@@ -44,8 +44,8 @@
*
* @note if tiedPoints[i]==QgsPoint(0.0,0.0) then tied failed.
*/
- virtual void makeGraph( RgGraphBuilder *builder,
- const QVector< QgsPoint >& additionalPoints,
+ virtual void makeGraph( RgGraphBuilder *builder,
+ const QVector< QgsPoint >& additionalPoints,
QVector< QgsPoint>& tiedPoints ) const = 0;
/**
Modified: trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.cpp
===================================================================
--- trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.cpp 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.cpp 2011-02-03 09:25:33 UTC (rev 15123)
@@ -61,21 +61,21 @@
return QString( "Vector line" );
}
-void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVector< QgsPoint >& additionalPoints,
+void RgLineVectorLayerDirector::makeGraph( RgGraphBuilder *builder, const QVector< QgsPoint >& additionalPoints,
QVector< QgsPoint >& tiedPoint ) const
{
QgsVectorLayer *vl = myLayer();
if ( vl == NULL )
return;
-
+
QgsCoordinateTransform ct( vl->crs(), builder->destinationCrs() );
-
+
QgsDistanceArea da;
da.setSourceCrs( builder->destinationCrs().srsid() );
da.setProjectionsEnabled( true );
- tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint(0.0, 0.0) );
+ tiedPoint = QVector< QgsPoint >( additionalPoints.size(), QgsPoint( 0.0, 0.0 ) );
TiePointInfo tmpInfo;
tmpInfo.mLength = infinity();
@@ -97,12 +97,12 @@
pt2 = ct.transform( *pointIt );
if ( !isFirstPoint )
{
- int i=0;
+ int i = 0;
for ( i = 0; i != additionalPoints.size(); ++i )
{
TiePointInfo info;
info.mLength = additionalPoints[ i ].sqrDistToSegment( pt1.x(), pt1.y(), pt2.x(), pt2.y(), info.mTiedPoint );
-
+
if ( pointLengthMap[ i ].mLength > info.mLength )
{
info.mFirstPoint = pt1;
@@ -182,17 +182,17 @@
for ( pointIt = pl.begin(); pointIt != pl.end(); ++pointIt )
{
pt2 = ct.transform( *pointIt );
-
+
std::map< double, QgsPoint > pointsOnArc;
pointsOnArc[ 0.0 ] = pt1;
- pointsOnArc[ pt1.sqrDist( pt2 ) ] = pt2;
+ pointsOnArc[ pt1.sqrDist( pt2 )] = pt2;
- for( pointLengthIt = pointLengthMap.begin(); pointLengthIt != pointLengthMap.end(); ++pointLengthIt )
+ for ( pointLengthIt = pointLengthMap.begin(); pointLengthIt != pointLengthMap.end(); ++pointLengthIt )
{
if ( pointLengthIt->mFirstPoint == pt1 && pointLengthIt->mLastPoint == pt2 )
{
QgsPoint tiedPoint = pointLengthIt->mTiedPoint;
- pointsOnArc[ pt1.sqrDist( tiedPoint ) ] = tiedPoint;
+ pointsOnArc[ pt1.sqrDist( tiedPoint )] = tiedPoint;
}
}
@@ -207,13 +207,13 @@
pt2 = pointsIt->second;
if ( !isFirstPoint )
{
- double cost = da.measureLine( pt1, pt2 );
+ double cost = da.measureLine( pt1, pt2 );
if ( directionType == 1 ||
directionType == 3 )
{
builder->addArc( pt1, pt2, cost, speed*su.multipler() );
}
- if ( directionType == 2 ||
+ if ( directionType == 2 ||
directionType == 3 )
{
builder->addArc( pt2, pt1, cost, speed*su.multipler() );
@@ -221,7 +221,7 @@
}
pt1 = pt2;
isFirstPoint = false;
- }
+ }
} // if ( !isFirstPoint )
pt1 = pt2;
isFirstPoint = false;
Modified: trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.h
===================================================================
--- trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.h 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/linevectorlayerdirector.h 2011-02-03 09:25:33 UTC (rev 15123)
@@ -56,10 +56,10 @@
/**
* MANDATORY DIRECTOR PROPERTY DECLARATION
*/
- void makeGraph( RgGraphBuilder *builder,
+ void makeGraph( RgGraphBuilder *builder,
const QVector< QgsPoint >& additionalPoints,
QVector< QgsPoint>& tiedPoints ) const;
-
+
QString name() const;
private:
Modified: trunk/qgis/src/plugins/roadgraph/roadgraphplugin.cpp
===================================================================
--- trunk/qgis/src/plugins/roadgraph/roadgraphplugin.cpp 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/roadgraphplugin.cpp 2011-02-03 09:25:33 UTC (rev 15123)
@@ -296,7 +296,7 @@
if ( graphDirector == NULL )
return;
- RgSimpleGraphBuilder builder ( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs() );
+ RgSimpleGraphBuilder builder( mQGisIface->mapCanvas()->mapRenderer()->destinationSrs() );
QVector< QgsPoint > null;
graphDirector->makeGraph( &builder , null, null );
AdjacencyMatrix m = builder.adjacencyMatrix();
Modified: trunk/qgis/src/plugins/roadgraph/shortestpathwidget.cpp
===================================================================
--- trunk/qgis/src/plugins/roadgraph/shortestpathwidget.cpp 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/shortestpathwidget.cpp 2011-02-03 09:25:33 UTC (rev 15123)
@@ -233,9 +233,9 @@
}
QVector< QgsPoint > points;
QVector< QgsPoint > tiedPoint;
-
+
points.push_back( mFrontPoint );
- points.push_back( mBackPoint );
+ points.push_back( mBackPoint );
director->makeGraph( &builder, points, tiedPoint );
p1 = tiedPoint[ 0 ];
@@ -244,12 +244,12 @@
delete director;
}
- if ( p1 == QgsPoint(0.0, 0.0) )
+ if ( p1 == QgsPoint( 0.0, 0.0 ) )
{
QMessageBox::critical( this, tr( "Tie point failed" ), tr( "Start point doesn't tie to the road!" ) );
return false;
}
- if ( p1 == QgsPoint(0.0, 0.0) )
+ if ( p1 == QgsPoint( 0.0, 0.0 ) )
{
QMessageBox::critical( this, tr( "Tie point failed" ), tr( "Stop point doesn't tie to the road!" ) );
return false;
Modified: trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.cpp
===================================================================
--- trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.cpp 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.cpp 2011-02-03 09:25:33 UTC (rev 15123)
@@ -20,7 +20,7 @@
// Qgis includes
RgSimpleGraphBuilder::RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs ) :
- RgGraphBuilder( crs )
+ RgGraphBuilder( crs )
{
}
Modified: trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.h
===================================================================
--- trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.h 2011-02-03 09:17:05 UTC (rev 15122)
+++ trunk/qgis/src/plugins/roadgraph/simplegraphbuilder.h 2011-02-03 09:25:33 UTC (rev 15123)
@@ -38,13 +38,13 @@
* default constructor
*/
RgSimpleGraphBuilder( const QgsCoordinateReferenceSystem& crs );
-
+
/**
* MANDATORY BUILDER PROPERTY DECLARATION
*/
void addVertex( const QgsPoint& pt );
void addArc( const QgsPoint& pt1, const QgsPoint& pt2, double cost, double speed );
-
+
/**
* return Adjacecncy matrix;
*/
More information about the QGIS-commit
mailing list