@@ -123,9 +123,9 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
123
123
if ( mPointVector .count () == 1 )// insert the first point into the triangulation
124
124
{
125
125
unsigned int zedge = insertEdge ( -10 , -10 , -1 , false , false );// edge pointing from p to the virtual point
126
- unsigned int fedge = insertEdge ( ( int )zedge, ( int )zedge , 0 , false , false ); // edge pointing from the virtual point to p
127
- ( mHalfEdge .at ( zedge ) )->setDual ( ( int )fedge );
128
- ( mHalfEdge .at ( zedge ) )->setNext ( ( int )fedge );
126
+ unsigned int fedge = insertEdge ( static_cast < int >( zedge ), static_cast < int >( zedge ) , 0 , false , false ); // edge pointing from the virtual point to p
127
+ ( mHalfEdge .at ( zedge ) )->setDual ( static_cast < int >( fedge ) );
128
+ ( mHalfEdge .at ( zedge ) )->setNext ( static_cast < int >( fedge ) );
129
129
130
130
}
131
131
@@ -142,15 +142,15 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
142
142
}
143
143
144
144
unsigned int sedge = insertEdge ( -10 , -10 , 1 , false , false );// edge pointing from point 0 to point 1
145
- unsigned int tedge = insertEdge ( ( int )sedge , 0 , 0 , false , false ); // edge pointing from point 1 to point 0
145
+ unsigned int tedge = insertEdge ( static_cast < int >( sedge ) , 0 , 0 , false , false ); // edge pointing from point 1 to point 0
146
146
unsigned int foedge = insertEdge ( -10 , 4 , 1 , false , false );// edge pointing from the virtual point to point 1
147
- unsigned int fiedge = insertEdge ( ( int )foedge , 1 , -1 , false , false ); // edge pointing from point 2 to the virtual point
148
- mHalfEdge .at ( sedge )->setDual ( ( int )tedge );
149
- mHalfEdge .at ( sedge )->setNext ( ( int )fiedge );
150
- mHalfEdge .at ( foedge )->setDual ( ( int )fiedge );
151
- mHalfEdge .at ( foedge )->setNext ( ( int )tedge );
152
- mHalfEdge .at ( 0 )->setNext ( ( int )foedge );
153
- mHalfEdge .at ( 1 )->setNext ( ( int )sedge );
147
+ unsigned int fiedge = insertEdge ( static_cast < int >( foedge ) , 1 , -1 , false , false ); // edge pointing from point 2 to the virtual point
148
+ mHalfEdge .at ( sedge )->setDual ( static_cast < int >( tedge ) );
149
+ mHalfEdge .at ( sedge )->setNext ( static_cast < int >( fiedge ) );
150
+ mHalfEdge .at ( foedge )->setDual ( static_cast < int >( fiedge ) );
151
+ mHalfEdge .at ( foedge )->setNext ( static_cast < int >( tedge ) );
152
+ mHalfEdge .at ( 0 )->setNext ( static_cast < int >( foedge ) );
153
+ mHalfEdge .at ( 1 )->setNext ( static_cast < int >( sedge ) );
154
154
155
155
mEdgeInside = 3 ;
156
156
}
@@ -163,38 +163,38 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
163
163
{
164
164
// insert six new edges
165
165
unsigned int edgea = insertEdge ( -10 , -10 , 2 , false , false );// edge pointing from point1 to point2
166
- unsigned int edgeb = insertEdge ( ( int )edgea , 5 , 1 , false , false ); // edge pointing from point2 to point1
167
- unsigned int edgec = insertEdge ( -10 , ( int )edgeb , 2 , false , false );// edge pointing from the virtual point to p2
166
+ unsigned int edgeb = insertEdge ( static_cast < int >( edgea ) , 5 , 1 , false , false ); // edge pointing from point2 to point1
167
+ unsigned int edgec = insertEdge ( -10 , static_cast < int >( edgeb ) , 2 , false , false ); // edge pointing from the virtual point to p2
168
168
unsigned int edged = insertEdge ( -10 , 2 , 0 , false , false );// edge pointing from point2 to point0
169
- unsigned int edgee = insertEdge ( ( int )edged , -10 , 2 , false , false ); // edge pointing from point0 to point2
170
- unsigned int edgef = insertEdge ( ( int )edgec , 1 , -1 , false , false ); // edge pointing from point2 to the virtual point
171
- mHalfEdge .at ( edgea )->setDual ( ( int )edgeb );
172
- mHalfEdge .at ( edgea )->setNext ( ( int )edged );
173
- mHalfEdge .at ( edgec )->setDual ( ( int )edgef );
174
- mHalfEdge .at ( edged )->setDual ( ( int )edgee );
175
- mHalfEdge .at ( edgee )->setNext ( ( int )edgef );
176
- mHalfEdge .at ( 5 )->setNext ( ( int )edgec );
177
- mHalfEdge .at ( 1 )->setNext ( ( int )edgee );
178
- mHalfEdge .at ( 2 )->setNext ( ( int )edgea );
169
+ unsigned int edgee = insertEdge ( static_cast < int >( edged ) , -10 , 2 , false , false ); // edge pointing from point0 to point2
170
+ unsigned int edgef = insertEdge ( static_cast < int >( edgec ) , 1 , -1 , false , false ); // edge pointing from point2 to the virtual point
171
+ mHalfEdge .at ( edgea )->setDual ( static_cast < int >( edgeb ) );
172
+ mHalfEdge .at ( edgea )->setNext ( static_cast < int >( edged ) );
173
+ mHalfEdge .at ( edgec )->setDual ( static_cast < int >( edgef ) );
174
+ mHalfEdge .at ( edged )->setDual ( static_cast < int >( edgee ) );
175
+ mHalfEdge .at ( edgee )->setNext ( static_cast < int >( edgef ) );
176
+ mHalfEdge .at ( 5 )->setNext ( static_cast < int >( edgec ) );
177
+ mHalfEdge .at ( 1 )->setNext ( static_cast < int >( edgee ) );
178
+ mHalfEdge .at ( 2 )->setNext ( static_cast < int >( edgea ) );
179
179
}
180
180
181
181
else if ( number > leftOfTresh )// p is on the right side
182
182
{
183
183
// insert six new edges
184
184
unsigned int edgea = insertEdge ( -10 , -10 , 2 , false , false );// edge pointing from p0 to p2
185
- unsigned int edgeb = insertEdge ( ( int )edgea , 0 , 0 , false , false ); // edge pointing from p2 to p0
186
- unsigned int edgec = insertEdge ( -10 , ( int )edgeb , 2 , false , false );// edge pointing from the virtual point to p2
185
+ unsigned int edgeb = insertEdge ( static_cast < int >( edgea ) , 0 , 0 , false , false ); // edge pointing from p2 to p0
186
+ unsigned int edgec = insertEdge ( -10 , static_cast < int >( edgeb ) , 2 , false , false ); // edge pointing from the virtual point to p2
187
187
unsigned int edged = insertEdge ( -10 , 3 , 1 , false , false );// edge pointing from p2 to p1
188
- unsigned int edgee = insertEdge ( ( int )edged , -10 , 2 , false , false ); // edge pointing from p1 to p2
189
- unsigned int edgef = insertEdge ( ( int )edgec , 4 , -1 , false , false ); // edge pointing from p2 to the virtual point
190
- mHalfEdge .at ( edgea )->setDual ( ( int )edgeb );
191
- mHalfEdge .at ( edgea )->setNext ( ( int )edged );
192
- mHalfEdge .at ( edgec )->setDual ( ( int )edgef );
193
- mHalfEdge .at ( edged )->setDual ( ( int )edgee );
194
- mHalfEdge .at ( edgee )->setNext ( ( int )edgef );
195
- mHalfEdge .at ( 0 )->setNext ( ( int )edgec );
196
- mHalfEdge .at ( 4 )->setNext ( ( int )edgee );
197
- mHalfEdge .at ( 3 )->setNext ( ( int )edgea );
188
+ unsigned int edgee = insertEdge ( static_cast < int >( edged ) , -10 , 2 , false , false ); // edge pointing from p1 to p2
189
+ unsigned int edgef = insertEdge ( static_cast < int >( edgec ) , 4 , -1 , false , false ); // edge pointing from p2 to the virtual point
190
+ mHalfEdge .at ( edgea )->setDual ( static_cast < int >( edgeb ) );
191
+ mHalfEdge .at ( edgea )->setNext ( static_cast < int >( edged ) );
192
+ mHalfEdge .at ( edgec )->setDual ( static_cast < int >( edgef ) );
193
+ mHalfEdge .at ( edged )->setDual ( static_cast < int >( edgee ) );
194
+ mHalfEdge .at ( edgee )->setNext ( static_cast < int >( edgef ) );
195
+ mHalfEdge .at ( 0 )->setNext ( static_cast < int >( edgec ) );
196
+ mHalfEdge .at ( 4 )->setNext ( static_cast < int >( edgee ) );
197
+ mHalfEdge .at ( 3 )->setNext ( static_cast < int >( edgea ) );
198
198
}
199
199
200
200
else // p is in a line with p0 and p1
@@ -288,20 +288,20 @@ int DualEdgeTriangulation::addPoint( const QgsPoint &p )
288
288
289
289
// insert 6 new HalfEdges for the connections to the vertices of the triangle
290
290
unsigned int edge1 = insertEdge ( -10 , nextnumber, mHalfEdge [number]->getPoint (), false , false );
291
- unsigned int edge2 = insertEdge ( ( int )edge1 , -10 , mPointVector .count () - 1 , false , false );
291
+ unsigned int edge2 = insertEdge ( static_cast < int >( edge1 ) , -10 , mPointVector .count () - 1 , false , false );
292
292
unsigned int edge3 = insertEdge ( -10 , nextnextnumber, mHalfEdge [nextnumber]->getPoint (), false , false );
293
- unsigned int edge4 = insertEdge ( ( int )edge3, ( int )edge1 , mPointVector .count () - 1 , false , false );
293
+ unsigned int edge4 = insertEdge ( static_cast < int >( edge3 ), static_cast < int >( edge1 ) , mPointVector .count () - 1 , false , false );
294
294
unsigned int edge5 = insertEdge ( -10 , number, mHalfEdge [nextnextnumber]->getPoint (), false , false );
295
- unsigned int edge6 = insertEdge ( ( int )edge5, ( int )edge3 , mPointVector .count () - 1 , false , false );
295
+ unsigned int edge6 = insertEdge ( static_cast < int >( edge5 ), static_cast < int >( edge3 ) , mPointVector .count () - 1 , false , false );
296
296
297
297
298
- mHalfEdge .at ( edge1 )->setDual ( ( int )edge2 );
299
- mHalfEdge .at ( edge2 )->setNext ( ( int )edge5 );
300
- mHalfEdge .at ( edge3 )->setDual ( ( int )edge4 );
301
- mHalfEdge .at ( edge5 )->setDual ( ( int )edge6 );
302
- mHalfEdge .at ( number )->setNext ( ( int )edge2 );
303
- mHalfEdge .at ( nextnumber )->setNext ( ( int )edge4 );
304
- mHalfEdge .at ( nextnextnumber )->setNext ( ( int )edge6 );
298
+ mHalfEdge .at ( edge1 )->setDual ( static_cast < int >( edge2 ) );
299
+ mHalfEdge .at ( edge2 )->setNext ( static_cast < int >( edge5 ) );
300
+ mHalfEdge .at ( edge3 )->setDual ( static_cast < int >( edge4 ) );
301
+ mHalfEdge .at ( edge5 )->setDual ( static_cast < int >( edge6 ) );
302
+ mHalfEdge .at ( number )->setNext ( static_cast < int >( edge2 ) );
303
+ mHalfEdge .at ( nextnumber )->setNext ( static_cast < int >( edge4 ) );
304
+ mHalfEdge .at ( nextnextnumber )->setNext ( static_cast < int >( edge6 ) );
305
305
306
306
// check, if there are swaps necessary
307
307
checkSwap ( number, 0 );
0 commit comments