Skip to content

Commit 952cae5

Browse files
author
jef
committedApr 25, 2010
some cleanups:
- macros TRUE/FALSE to keywords true/false - replace boolean comparison (x==true => x / x==false => !x) - return(x); => return x; git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@13380 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9d835b3 commit 952cae5

File tree

68 files changed

+341
-399
lines changed

Some content is hidden

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

68 files changed

+341
-399
lines changed
 

‎src/analysis/interpolation/DualEdgeTriangulation.cc

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
767767
{continue;}
768768

769769
//check, if the edge belongs to a flat triangle, remove this later
770-
if ( control2[i] == false )
770+
if ( !control2[i] )
771771
{
772772
double p1, p2, p3;
773773
if ( mHalfEdge[i]->getPoint() != -1 && mHalfEdge[mHalfEdge[i]->getNext()]->getPoint() != -1 && mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getPoint() != -1 )
@@ -792,7 +792,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
792792
control2[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()] = true;
793793
}//end of the section, which has to be removed later
794794

795-
if ( control[i] == true )//check, if edge has already been drawn
795+
if ( control[i] )//check, if edge has already been drawn
796796
{continue;}
797797

798798
//draw the edge;
@@ -830,7 +830,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
830830
{continue;}
831831

832832
//check, if the edge belongs to a flat triangle, remove this section later
833-
if ( control2[i] == false )
833+
if ( !control2[i] )
834834
{
835835
double p1, p2, p3;
836836
if ( mHalfEdge[i]->getPoint() != -1 && mHalfEdge[mHalfEdge[i]->getNext()]->getPoint() != -1 && mHalfEdge[mHalfEdge[mHalfEdge[i]->getNext()]->getNext()]->getPoint() != -1 )
@@ -856,7 +856,7 @@ void DualEdgeTriangulation::draw( QPainter* p, double xlowleft, double ylowleft,
856856
}//end of the section, which has to be removed later
857857

858858

859-
if ( control[i] == true )//check, if edge has already been drawn
859+
if ( control[i] )//check, if edge has already been drawn
860860
{continue;}
861861

862862
//draw the edge
@@ -944,7 +944,7 @@ QList<int>* DualEdgeTriangulation::getSurroundingTriangles( int pointno )
944944
vlist->append( mHalfEdge[nextedge]->getPoint() );//add the number of the endpoint of the second edge to the value list
945945
nextnextedge = mHalfEdge[nextedge]->getNext();
946946
vlist->append( mHalfEdge[nextnextedge]->getPoint() );//add the number of endpoint of the third edge to the value list
947-
if ( mHalfEdge[nextnextedge]->getBreak() == true )//add, whether the third edge is a breakline or not
947+
if ( mHalfEdge[nextnextedge]->getBreak() )//add, whether the third edge is a breakline or not
948948
{
949949
vlist->append( -10 );
950950
}
@@ -1606,7 +1606,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
16061606

16071607
for ( int i = 0; i <= mHalfEdge.count() - 1; i++ )
16081608
{
1609-
if ( control[i] == true )//edge has already been examined
1609+
if ( control[i] )//edge has already been examined
16101610
{
16111611
continue;
16121612
}
@@ -1666,7 +1666,7 @@ void DualEdgeTriangulation::eliminateHorizontalTriangles()
16661666
continue;
16671667
}
16681668
}
1669-
if ( swaped == false )
1669+
if ( !swaped )
16701670
{
16711671
delete[] control;
16721672
break;
@@ -1691,7 +1691,7 @@ void DualEdgeTriangulation::ruppertRefinement()
16911691
//first, go through all the forced edges and subdivide if they are encroached by a point
16921692
bool stop = false;//flag to ensure that the for-loop is repeated until no half edge is split any more
16931693

1694-
while ( stop == false )
1694+
while ( !stop )
16951695
{
16961696
stop = true;
16971697
int nhalfedges = mHalfEdge.count();
@@ -1736,7 +1736,7 @@ void DualEdgeTriangulation::ruppertRefinement()
17361736
bool twoforcededges;//flag to decide, if edges should be added to the maps. Do not add them if true
17371737

17381738

1739-
if (( mHalfEdge[i]->getForced() == true || edgeOnConvexHull( i ) ) && ( mHalfEdge[mHalfEdge[i]->getNext()]->getForced() == true || edgeOnConvexHull( mHalfEdge[i]->getNext() ) ) )
1739+
if (( mHalfEdge[i]->getForced() || edgeOnConvexHull( i ) ) && ( mHalfEdge[mHalfEdge[i]->getNext()]->getForced() || edgeOnConvexHull( mHalfEdge[i]->getNext() ) ) )
17401740
{
17411741
twoforcededges = true;
17421742
}
@@ -1853,7 +1853,7 @@ void DualEdgeTriangulation::ruppertRefinement()
18531853
//don't put the edges on the maps if two segments are forced or on a hull
18541854
bool twoforcededges1, twoforcededges2, twoforcededges3;//flag to indicate, if angle1, angle2 and angle3 are between forced edges or hull edges
18551855

1856-
if (( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) )
1856+
if (( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) )
18571857
{
18581858
twoforcededges1 = true;
18591859
}
@@ -1862,7 +1862,7 @@ void DualEdgeTriangulation::ruppertRefinement()
18621862
twoforcededges1 = false;
18631863
}
18641864

1865-
if (( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) )
1865+
if (( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) )
18661866
{
18671867
twoforcededges2 = true;
18681868
}
@@ -1871,7 +1871,7 @@ void DualEdgeTriangulation::ruppertRefinement()
18711871
twoforcededges2 = false;
18721872
}
18731873

1874-
if (( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) )
1874+
if (( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) )
18751875
{
18761876
twoforcededges3 = true;
18771877
}
@@ -2024,7 +2024,7 @@ void DualEdgeTriangulation::ruppertRefinement()
20242024

20252025
for ( std::set<int>::iterator it = influenceedges.begin(); it != influenceedges.end(); ++it )
20262026
{
2027-
if (( mHalfEdge[*it]->getForced() == true || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
2027+
if (( mHalfEdge[*it]->getForced() || edgeOnConvexHull( *it ) ) && MathUtils::inDiametral( mPointVector[mHalfEdge[*it]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[*it]->getDual()]->getPoint()], &circumcenter ) )
20282028
{
20292029
//split segment
20302030
QgsDebugMsg( "segment split" );
@@ -2063,7 +2063,7 @@ void DualEdgeTriangulation::ruppertRefinement()
20632063

20642064

20652065

2066-
if (( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) )
2066+
if (( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) )
20672067
{
20682068
twoforcededges1 = true;
20692069
}
@@ -2072,7 +2072,7 @@ void DualEdgeTriangulation::ruppertRefinement()
20722072
twoforcededges1 = false;
20732073
}
20742074

2075-
if (( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) )
2075+
if (( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) )
20762076
{
20772077
twoforcededges2 = true;
20782078
}
@@ -2081,7 +2081,7 @@ void DualEdgeTriangulation::ruppertRefinement()
20812081
twoforcededges2 = false;
20822082
}
20832083

2084-
if (( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) )
2084+
if (( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) )
20852085
{
20862086
twoforcededges3 = true;
20872087
}
@@ -2197,7 +2197,7 @@ void DualEdgeTriangulation::ruppertRefinement()
21972197
} //end fast method
21982198

21992199

2200-
if ( encroached == true )
2200+
if ( encroached )
22012201
{
22022202
continue;
22032203
}
@@ -2228,7 +2228,7 @@ void DualEdgeTriangulation::ruppertRefinement()
22282228
flag = true;
22292229
}
22302230
}
2231-
if ( flag == false )
2231+
if ( !flag )
22322232
{
22332233
QgsDebugMsg( "point is not present in the triangulation" );
22342234
}
@@ -2279,7 +2279,7 @@ void DualEdgeTriangulation::ruppertRefinement()
22792279
//todo: put all three edges on the dontexamine list if two edges are forced or convex hull edges
22802280
bool twoforcededges1, twoforcededges2, twoforcededges3;
22812281

2282-
if (( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) )
2282+
if (( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) && ( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) )
22832283
{
22842284
twoforcededges1 = true;
22852285
}
@@ -2288,7 +2288,7 @@ void DualEdgeTriangulation::ruppertRefinement()
22882288
twoforcededges1 = false;
22892289
}
22902290

2291-
if (( mHalfEdge[ed2]->getForced() == true || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) )
2291+
if (( mHalfEdge[ed2]->getForced() || edgeOnConvexHull( ed2 ) ) && ( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) )
22922292
{
22932293
twoforcededges2 = true;
22942294
}
@@ -2297,7 +2297,7 @@ void DualEdgeTriangulation::ruppertRefinement()
22972297
twoforcededges2 = false;
22982298
}
22992299

2300-
if (( mHalfEdge[ed3]->getForced() == true || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() == true || edgeOnConvexHull( ed1 ) ) )
2300+
if (( mHalfEdge[ed3]->getForced() || edgeOnConvexHull( ed3 ) ) && ( mHalfEdge[ed1]->getForced() || edgeOnConvexHull( ed1 ) ) )
23012301
{
23022302
twoforcededges3 = true;
23032303
}
@@ -2424,7 +2424,7 @@ void DualEdgeTriangulation::ruppertRefinement()
24242424
bool DualEdgeTriangulation::swapPossible( unsigned int edge )
24252425
{
24262426
//test, if edge belongs to a forced edge
2427-
if ( mHalfEdge[edge]->getForced() == true )
2427+
if ( mHalfEdge[edge]->getForced() )
24282428
{
24292429
return false;
24302430
}
@@ -2926,7 +2926,7 @@ bool DualEdgeTriangulation::saveToTAFF( QString filename ) const
29262926

29272927
for ( unsigned int i = 0; i < mHalfEdge.count(); i++ )
29282928
{
2929-
if ( cont[i] == true )
2929+
if ( cont[i] )
29302930
{
29312931
continue;
29322932
}
@@ -3276,7 +3276,7 @@ void DualEdgeTriangulation::evaluateInfluenceRegion( Point3D* point, int edge, s
32763276
return;
32773277
}
32783278

3279-
if ( mHalfEdge[edge]->getForced() == false && !edgeOnConvexHull( edge ) )
3279+
if ( !mHalfEdge[edge]->getForced() && !edgeOnConvexHull( edge ) )
32803280
{
32813281
//test, if point is in the circle through both endpoints of edge and the endpoint of edge->dual->next->point
32823282
if ( MathUtils::inCircle( point, mPointVector[mHalfEdge[mHalfEdge[edge]->getDual()]->getPoint()], mPointVector[mHalfEdge[edge]->getPoint()], mPointVector[mHalfEdge[mHalfEdge[edge]->getNext()]->getPoint()] ) )

‎src/analysis/interpolation/MathUtils.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ double MathUtils::calcBernsteinPoly( int n, int i, double t )
102102
return 0;
103103
}
104104

105-
return( lower( n, i )*power( t, i )*power(( 1 - t ), ( n - i ) ) );
105+
return lower( n, i )*power( t, i )*power(( 1 - t ), ( n - i ) );
106106
}
107107

108108
double MathUtils::cFDerBernsteinPoly( int n, int i, double t )
@@ -265,7 +265,7 @@ bool MathUtils::inCircle( Point3D* testp, Point3D* p1, Point3D* p2, Point3D* p3
265265
aValue = aValue - (( bx * bx + by * by ) * triArea( p1, p3, testp ) );
266266
aValue = aValue + (( cx * cx + cy * cy ) * triArea( p1, p2, testp ) );
267267
aValue = aValue - (( px * px + py * py ) * triArea( p1, p2, p3 ) );
268-
//return(aValue>0.0);
268+
//return aValue>0.0;
269269
if ( aValue > tolerance )
270270
{
271271
return true;
@@ -277,7 +277,7 @@ bool MathUtils::inCircle( Point3D* testp, Point3D* p1, Point3D* p2, Point3D* p3
277277
else//point is approximately on the circle
278278
{
279279
//cout << "aValue " << aValue << endl << flush;
280-
//return(aValue>0.0);
280+
//return aValue>0.0;
281281
return false;
282282
}
283283
}
@@ -324,7 +324,7 @@ double MathUtils::leftOf( Point3D* thepoint, Point3D* p1, Point3D* p2 )
324324
double f3 = thepoint->getY() - p1->getY();
325325
double f4 = p2->getX() - p1->getX();
326326
return f1*f2 - f3*f4;
327-
//return(thepoint->getX()-p1->getX())*(p2->getY()-p1->getY())-(thepoint->getY()-p1->getY())*(p2->getX()-p1->getX());//calculating the vectorproduct
327+
//return thepoint->getX()-p1->getX())*(p2->getY()-p1->getY())-(thepoint->getY()-p1->getY())*(p2->getX()-p1->getX();//calculating the vectorproduct
328328
}
329329
else
330330
{

0 commit comments

Comments
 (0)