Skip to content

Commit 7a0c0d8

Browse files
author
jef
committedNov 28, 2009
another semi-automatic indentation update
git-svn-id: http://svn.osgeo.org/qgis/trunk@12276 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 1712e42 commit 7a0c0d8

File tree

61 files changed

+1472
-1468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1472
-1468
lines changed
 

‎src/plugins/grass/modules-common/chstroke renamed to ‎scripts/chstroke.sh

File renamed without changes.

‎src/analysis/interpolation/DualEdgeTriangulation.cc

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ DualEdgeTriangulation::~DualEdgeTriangulation()
2828
//remove all the points
2929
if ( mPointVector.count() > 0 )
3030
{
31-
for ( int i = 0; i < mPointVector.count();i++ )
31+
for ( int i = 0; i < mPointVector.count(); i++ )
3232
{
3333
delete mPointVector[i];
3434
}
@@ -37,7 +37,7 @@ DualEdgeTriangulation::~DualEdgeTriangulation()
3737
//remove all the HalfEdge
3838
if ( mHalfEdge.count() > 0 )
3939
{
40-
for ( int i = 0; i < mHalfEdge.count();i++ )
40+
for ( int i = 0; i < mHalfEdge.count(); i++ )
4141
{
4242
delete mHalfEdge[i];
4343
}
@@ -48,7 +48,7 @@ void DualEdgeTriangulation::performConsistencyTest()
4848
{
4949
QgsDebugMsg( "performing consistency test" );
5050

51-
for ( int i = 0;i < mHalfEdge.count();i++ )
51+
for ( int i = 0; i < mHalfEdge.count(); i++ )
5252
{
5353
int a = mHalfEdge[mHalfEdge[i]->getDual()]->getDual();
5454
int b = mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getNext();
@@ -74,7 +74,7 @@ void DualEdgeTriangulation::addLine( Line3D* line, bool breakline )
7474
unsigned int i;
7575
line->goToBegin();
7676

77-
for ( i = 0;i < line->getSize();i++ )
77+
for ( i = 0; i < line->getSize(); i++ )
7878
{
7979
line->goToNext();
8080
actpoint = mDecorator->addPoint( line->getPoint() );
@@ -91,7 +91,7 @@ void DualEdgeTriangulation::addLine( Line3D* line, bool breakline )
9191
return;
9292
}
9393

94-
for ( ;i < line->getSize();i++ )
94+
for ( ; i < line->getSize(); i++ )
9595
{
9696
line->goToNext();
9797
currentpoint = mDecorator->addPoint( line->getPoint() );
@@ -407,7 +407,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
407407
if ( mPointVector.count() < 4 || point == -1 )//at the beginning, mEdgeInside is not defined yet
408408
{
409409
//first find pointingedge(an edge pointing to p1)
410-
for ( int i = 0;i < mHalfEdge.count();i++ )
410+
for ( int i = 0; i < mHalfEdge.count(); i++ )
411411
{
412412
if ( mHalfEdge[i]->getPoint() == point )//we found it
413413
{
@@ -427,7 +427,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
427427

428428
//use the secure and slow method
429429
//qWarning( "******************warning, using the slow method in baseEdgeOfPoint****************************************" );
430-
for ( int i = 0;i < mHalfEdge.count();i++ )
430+
for ( int i = 0; i < mHalfEdge.count(); i++ )
431431
{
432432
if ( mHalfEdge[i]->getPoint() == point && mHalfEdge[mHalfEdge[i]->getNext()]->getPoint() != -1 )//we found it
433433
{
@@ -441,7 +441,7 @@ int DualEdgeTriangulation::baseEdgeOfPoint( int point )
441441

442442
if ( frompoint == -1 || topoint == -1 )//this would cause a crash. Therefore we use the slow method in this case
443443
{
444-
for ( int i = 0;i < mHalfEdge.count();i++ )
444+
for ( int i = 0; i < mHalfEdge.count(); i++ )
445445
{
446446
if ( mHalfEdge[i]->getPoint() == point && mHalfEdge[mHalfEdge[i]->getNext()]->getPoint() != -1 )//we found it
447447
{
@@ -752,7 +752,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
752752
bool* control = new bool[mHalfEdge.count()];//controllarray that no edge is painted twice
753753
bool* control2 = new bool[mHalfEdge.count()];//controllarray for the flat triangles
754754

755-
for ( unsigned int i = 0;i <= mHalfEdge.count() - 1;i++ )
755+
for ( unsigned int i = 0; i <= mHalfEdge.count() - 1; i++ )
756756
{
757757
control[i] = false;
758758
control2[i] = false;
@@ -761,7 +761,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
761761
if ((( xupright - xlowleft ) / width ) > (( yupright - ylowleft ) / height ) )
762762
{
763763
double lowerborder = -( height * ( xupright - xlowleft ) / width - yupright );//real world coordinates of the lower widget border. This is useful to know because of the HalfEdge bounding box test
764-
for ( unsigned int i = 0;i < mHalfEdge.count() - 1;i++ )
764+
for ( unsigned int i = 0; i < mHalfEdge.count() - 1; i++ )
765765
{
766766
if ( mHalfEdge[i]->getPoint() == -1 || mHalfEdge[mHalfEdge[i]->getDual()]->getPoint() == -1 )
767767
{continue;}
@@ -824,7 +824,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
824824
else
825825
{
826826
double rightborder = width * ( yupright - ylowleft ) / height + xlowleft;//real world coordinates of the right widget border. This is useful to know because of the HalfEdge bounding box test
827-
for ( unsigned int i = 0;i < mHalfEdge.count() - 1;i++ )
827+
for ( unsigned int i = 0; i < mHalfEdge.count() - 1; i++ )
828828
{
829829
if ( mHalfEdge[i]->getPoint() == -1 || mHalfEdge[mHalfEdge[i]->getDual()]->getPoint() == -1 )
830830
{continue;}
@@ -1453,7 +1453,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
14531453

14541454
//set the flags 'forced' and 'break' to false for every edge and dualedge of 'crossEdges'
14551455
QList<int>::const_iterator iter;
1456-
for ( iter = crossedEdges.constBegin();iter != crossedEdges.constEnd();++iter )
1456+
for ( iter = crossedEdges.constBegin(); iter != crossedEdges.constEnd(); ++iter )
14571457
{
14581458
mHalfEdge[( *( iter ) )]->setForced( false );
14591459
mHalfEdge[( *( iter ) )]->setBreak( false );
@@ -1507,7 +1507,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
15071507
//finish the polygon on the right side
15081508
QList<int>::const_iterator rightiter;
15091509
int actpointr = p1;
1510-
for ( rightiter = crossedEdges.constBegin();rightiter != crossedEdges.constEnd();++rightiter )
1510+
for ( rightiter = crossedEdges.constBegin(); rightiter != crossedEdges.constEnd(); ++rightiter )
15111511
{
15121512
int newpoint = mHalfEdge[mHalfEdge[mHalfEdge[( *rightiter )]->getNext()]->getNext()]->getPoint();
15131513
if ( newpoint != actpointr )
@@ -1527,7 +1527,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
15271527
//set the necessary nexts of leftPolygon(exept the first)
15281528
int actedgel = leftPolygon[1];
15291529
leftiter = leftPolygon.constBegin(); leftiter += 2;
1530-
for ( ;leftiter != leftPolygon.constEnd();++leftiter )
1530+
for ( ; leftiter != leftPolygon.constEnd(); ++leftiter )
15311531
{
15321532
mHalfEdge[actedgel]->setNext(( *leftiter ) );
15331533
actedgel = ( *leftiter );
@@ -1536,7 +1536,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
15361536
//set all the necessary nexts of rightPolygon
15371537
int actedger = rightPolygon[1];
15381538
rightiter = rightPolygon.constBegin(); rightiter += 2;
1539-
for ( ;rightiter != rightPolygon.constEnd();++rightiter )
1539+
for ( ; rightiter != rightPolygon.constEnd(); ++rightiter )
15401540
{
15411541
mHalfEdge[actedger]->setNext(( *rightiter ) );
15421542
actedger = ( *( rightiter ) );
@@ -1555,7 +1555,7 @@ int DualEdgeTriangulation::insertForcedSegment( int p1, int p2, bool breakline )
15551555
triangulatePolygon( &rightPolygon, &freelist, dualfirstedge );
15561556

15571557
//optimisation of the new edges
1558-
for ( iter = crossedEdges.begin();iter != crossedEdges.end();++iter )
1558+
for ( iter = crossedEdges.begin(); iter != crossedEdges.end(); ++iter )
15591559
{
15601560
checkSwap(( *( iter ) ) );
15611561
}
@@ -1598,13 +1598,13 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
15981598
bool swaped = false;//flag which allows to exit the loop
15991599
bool* control = new bool[mHalfEdge.count()];//controlarray
16001600

1601-
for ( int i = 0;i <= mHalfEdge.count() - 1;i++ )
1601+
for ( int i = 0; i <= mHalfEdge.count() - 1; i++ )
16021602
{
16031603
control[i] = false;
16041604
}
16051605

16061606

1607-
for ( int i = 0;i <= mHalfEdge.count() - 1;i++ )
1607+
for ( int i = 0; i <= mHalfEdge.count() - 1; i++ )
16081608
{
16091609
if ( control[i] == true )//edge has already been examined
16101610
{
@@ -1696,7 +1696,7 @@ void DualEdgeTriangulation::ruppertRefinement()
16961696
stop = true;
16971697
int nhalfedges = mHalfEdge.count();
16981698

1699-
for ( int i = 0;i < nhalfedges - 1;i++ )
1699+
for ( int i = 0; i < nhalfedges - 1; i++ )
17001700
{
17011701
int next = mHalfEdge[i]->getNext();
17021702
int nextnext = mHalfEdge[next]->getNext();
@@ -1721,7 +1721,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17211721
//examine the triangulation for angles below the minimum and insert the edges into angle_edge and edge_angle, except the small angle is between forced segments or convex hull edges
17221722
double angle;//angle between edge i and the consecutive edge
17231723
int p1, p2, p3;//numbers of the triangle points
1724-
for ( int i = 0;i < mHalfEdge.count() - 1;i++ )
1724+
for ( int i = 0; i < mHalfEdge.count() - 1; i++ )
17251725
{
17261726
p1 = mHalfEdge[mHalfEdge[i]->getDual()]->getPoint();
17271727
p2 = mHalfEdge[i]->getPoint();
@@ -1753,7 +1753,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17531753
}
17541754

17551755
//debugging: print out all the angles below the minimum for a test
1756-
for ( std::multimap<double, int>::const_iterator it = angle_edge.begin();it != angle_edge.end();++it )
1756+
for ( std::multimap<double, int>::const_iterator it = angle_edge.begin(); it != angle_edge.end(); ++it )
17571757
{
17581758
QgsDebugMsg( QString( "angle: %1" ).arg( it->first ) );
17591759
}
@@ -1812,7 +1812,7 @@ void DualEdgeTriangulation::ruppertRefinement()
18121812

18131813
#if 0 //slow version
18141814
int numhalfedges = mHalfEdge.count();//begin slow version
1815-
for ( int i = 0;i < numhalfedges;i++ )
1815+
for ( int i = 0; i < numhalfedges; i++ )
18161816
{
18171817
if ( mHalfEdge[i]->getForced() || edgeOnConvexHull( i ) )
18181818
{
@@ -2022,7 +2022,7 @@ void DualEdgeTriangulation::ruppertRefinement()
20222022
evaluateInfluenceRegion( &circumcenter, mHalfEdge[baseedge]->getNext(), &influenceedges );
20232023
evaluateInfluenceRegion( &circumcenter, mHalfEdge[mHalfEdge[baseedge]->getNext()]->getNext(), &influenceedges );
20242024

2025-
for ( std::set<int>::iterator it = influenceedges.begin();it != influenceedges.end();++it )
2025+
for ( std::set<int>::iterator it = influenceedges.begin(); it != influenceedges.end(); ++it )
20262026
{
20272027
if (( mHalfEdge[*it]->getForced() == true || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
20282028
{
@@ -2221,7 +2221,7 @@ void DualEdgeTriangulation::ruppertRefinement()
22212221
.arg( circumcenter.getX() ).arg( circumcenter.getY() ) );
22222222
//test, if the point is present in the triangulation
22232223
bool flag = false;
2224-
for ( int i = 0;i < mPointVector.count();i++ )
2224+
for ( int i = 0; i < mPointVector.count(); i++ )
22252225
{
22262226
if ( mPointVector[i]->getX() == circumcenter.getX() && mPointVector[i]->getY() == circumcenter.getY() )
22272227
{
@@ -2413,7 +2413,7 @@ void DualEdgeTriangulation::ruppertRefinement()
24132413

24142414
#if 0
24152415
//debugging: print out all edge of dontexamine
2416-
for ( std::set<int>::iterator it = dontexamine.begin();it != dontexamine.end();++it )
2416+
for ( std::set<int>::iterator it = dontexamine.begin(); it != dontexamine.end(); ++it )
24172417
{
24182418
QgsDebugMsg( QString( "edge nr. %1 is in dontexamine" ).arg( *it ) );
24192419
}
@@ -2499,15 +2499,15 @@ void DualEdgeTriangulation::triangulatePolygon( QList<int>* poly, QList<int>* fr
24992499
mHalfEdge[mainedge]->setNext( insertb );
25002500

25012501
QList<int> polya;
2502-
for ( iterator = ( ++( poly->constBegin() ) );( *iterator ) != nextdistedge;++iterator )
2502+
for ( iterator = ( ++( poly->constBegin() ) ); ( *iterator ) != nextdistedge; ++iterator )
25032503
{
25042504
polya.append(( *iterator ) );
25052505
}
25062506
polya.prepend( inserta );
25072507

25082508
#if 0
25092509
//print out all the elements of polya for a test
2510-
for ( iterator = polya.begin();iterator != polya.end();++iterator )
2510+
for ( iterator = polya.begin(); iterator != polya.end(); ++iterator )
25112511
{
25122512
QgsDebugMsg( *iterator );
25132513
}
@@ -2568,7 +2568,7 @@ void DualEdgeTriangulation::triangulatePolygon( QList<int>* poly, QList<int>* fr
25682568
QList<int> polya;
25692569
QList<int> polyb;
25702570

2571-
for ( iterator = ++( poly->constBegin() );( *iterator ) != nextdistedge;++iterator )
2571+
for ( iterator = ++( poly->constBegin() ); ( *iterator ) != nextdistedge; ++iterator )
25722572
{
25732573
polya.append(( *iterator ) );
25742574
}
@@ -2725,7 +2725,7 @@ bool DualEdgeTriangulation::readFromTAFF( QString filename )
27252725
edgebar->move( 500, 500 );
27262726
edgebar->show();
27272727

2728-
for ( int i = 0;i < numberofhalfedges / 2;i++ )
2728+
for ( int i = 0; i < numberofhalfedges / 2; i++ )
27292729
{
27302730
if ( i % 1000 == 0 )
27312731
{
@@ -2806,7 +2806,7 @@ bool DualEdgeTriangulation::readFromTAFF( QString filename )
28062806
delete edgebar;
28072807

28082808
//set mEdgeInside to a reasonable value
2809-
for ( int i = 0;i < numberofhalfedges;i++ )
2809+
for ( int i = 0; i < numberofhalfedges; i++ )
28102810
{
28112811
int a, b, c, d;
28122812
a = mHalfEdge[i]->getPoint();
@@ -2848,7 +2848,7 @@ bool DualEdgeTriangulation::readFromTAFF( QString filename )
28482848

28492849

28502850
double x, y, z;
2851-
for ( int i = 0;i < numberofpoints;i++ )
2851+
for ( int i = 0; i < numberofpoints; i++ )
28522852
{
28532853
if ( i % 1000 == 0 )
28542854
{
@@ -2919,12 +2919,12 @@ bool DualEdgeTriangulation::saveToTAFF( QString filename ) const
29192919
outstream << "DATA ";
29202920

29212921
bool* cont = new bool[mHalfEdge.count()];
2922-
for ( unsigned int i = 0;i <= mHalfEdge.count() - 1;i++ )
2922+
for ( unsigned int i = 0; i <= mHalfEdge.count() - 1; i++ )
29232923
{
29242924
cont[i] = false;
29252925
}
29262926

2927-
for ( unsigned int i = 0;i < mHalfEdge.count();i++ )
2927+
for ( unsigned int i = 0; i < mHalfEdge.count(); i++ )
29282928
{
29292929
if ( cont[i] == true )
29302930
{
@@ -2948,7 +2948,7 @@ bool DualEdgeTriangulation::saveToTAFF( QString filename ) const
29482948
outstream << "PATT 3" << std::endl << std::flush;
29492949
outstream << "DATA ";
29502950

2951-
for ( int i = 0;i < this->getNumberOfPoints();i++ )
2951+
for ( int i = 0; i < this->getNumberOfPoints(); i++ )
29522952
{
29532953
Point3D* p = mPointVector[i];
29542954
outstream << p->getX() << " " << p->getY() << " " << p->getZ() << " ";

0 commit comments

Comments
 (0)
Please sign in to comment.