Skip to content

Commit 1a1370f

Browse files
jef-njef-n
committedOct 5, 2012
indentation update (and minor cleanuppps ;))
1 parent e0d4784 commit 1a1370f

File tree

3 files changed

+51
-68
lines changed

3 files changed

+51
-68
lines changed
 

‎src/app/qgssnappingdialog.cpp

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -114,20 +114,18 @@ void QgsSnappingDialog::reload()
114114
}
115115

116116
setTopologicalEditingState();
117-
setIntersectionSnapppingState();
117+
setIntersectionSnappingState();
118118
}
119119

120120
void QgsSnappingDialog::on_cbxEnableTopologicalEditingCheckBox_stateChanged( int state )
121121
{
122-
int topologicalEditingEnabled = ( state == Qt::Checked ) ? 1 : 0;
123-
QgsProject::instance()->writeEntry( "Digitizing", "/TopologicalEditing", topologicalEditingEnabled );
122+
QgsProject::instance()->writeEntry( "Digitizing", "/TopologicalEditing", state == Qt::Checked );
124123
setTopologicalEditingState();
125124
}
126125

127126
void QgsSnappingDialog::on_cbxEnableIntersectionSnappingCheckBox_stateChanged( int state )
128127
{
129-
int intersectionSnappingEnabled = ( state == Qt::Checked ) ? 1 : 0;
130-
QgsProject::instance()->writeEntry( "Digitizing", "/IntersectionSnapping", intersectionSnappingEnabled );
128+
QgsProject::instance()->writeEntry( "Digitizing", "/IntersectionSnapping", state == Qt::Checked );
131129
}
132130

133131
void QgsSnappingDialog::closeEvent( QCloseEvent* event )
@@ -197,7 +195,7 @@ void QgsSnappingDialog::apply()
197195
void QgsSnappingDialog::show()
198196
{
199197
setTopologicalEditingState();
200-
setIntersectionSnapppingState();
198+
setIntersectionSnappingState();
201199
if ( mDock )
202200
mDock->setVisible( true );
203201
else
@@ -329,7 +327,7 @@ void QgsSnappingDialog::addLayer( QgsMapLayer * theMapLayer )
329327
}
330328

331329
setTopologicalEditingState();
332-
setIntersectionSnapppingState();
330+
setIntersectionSnappingState();
333331
}
334332
}
335333

@@ -357,29 +355,15 @@ void QgsSnappingDialog::setTopologicalEditingState()
357355
// read the digitizing settings
358356
int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
359357
cbxEnableTopologicalEditingCheckBox->blockSignals( true );
360-
if ( topologicalEditing != 0 )
361-
{
362-
cbxEnableTopologicalEditingCheckBox->setCheckState( Qt::Checked );
363-
}
364-
else
365-
{
366-
cbxEnableTopologicalEditingCheckBox->setCheckState( Qt::Unchecked );
367-
}
358+
cbxEnableTopologicalEditingCheckBox->setChecked( topologicalEditing );
368359
cbxEnableTopologicalEditingCheckBox->blockSignals( false );
369360
}
370361

371-
void QgsSnappingDialog::setIntersectionSnapppingState()
362+
void QgsSnappingDialog::setIntersectionSnappingState()
372363
{
373364
// read the digitizing settings
374365
int intersectionSnapping = QgsProject::instance()->readNumEntry( "Digitizing", "/IntersectionSnapping", 0 );
375366
cbxEnableIntersectionSnappingCheckBox->blockSignals( true );
376-
if ( intersectionSnapping != 0 )
377-
{
378-
cbxEnableIntersectionSnappingCheckBox->setCheckState( Qt::Checked );
379-
}
380-
else
381-
{
382-
cbxEnableIntersectionSnappingCheckBox->setCheckState( Qt::Unchecked );
383-
}
367+
cbxEnableIntersectionSnappingCheckBox->setChecked( intersectionSnapping );
384368
cbxEnableIntersectionSnappingCheckBox->blockSignals( false );
385369
}

‎src/app/qgssnappingdialog.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialogBase
8989
void setTopologicalEditingState();
9090

9191
/**Set checkbox value based on project setting*/
92-
void setIntersectionSnapppingState();
92+
void setIntersectionSnappingState();
9393
};
9494

9595
#endif

‎src/gui/qgsmapcanvassnapper.cpp

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -136,29 +136,29 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QPoint& p, QList<QgsSnapp
136136
int topologicalEditing = QgsProject::instance()->readNumEntry( "Digitizing", "/TopologicalEditing", 0 );
137137

138138
//snapping on intersection on?
139-
int intersectionSnapping = QgsProject::instance()->readNumEntry( "Digitizing", "/IntersectionSnapping", 0 );
139+
int intersectionSnapping = QgsProject::instance()->readNumEntry( "Digitizing", "/IntersectionSnapping", 0 );
140140

141141
if ( topologicalEditing == 0 )
142142
{
143-
if ( intersectionSnapping == 0 )
144-
{
145-
mSnapper->setSnapMode( QgsSnapper::SnapWithOneResult );
146-
}
147-
else
148-
{
149-
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsWithinTolerances );
150-
}
143+
if ( intersectionSnapping == 0 )
144+
{
145+
mSnapper->setSnapMode( QgsSnapper::SnapWithOneResult );
146+
}
147+
else
148+
{
149+
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsWithinTolerances );
150+
}
151151
}
152152
else
153153
{
154-
if ( intersectionSnapping == 0 )
155-
{
156-
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsForSamePosition );
157-
}
158-
else
159-
{
160-
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsWithinTolerances );
161-
}
154+
if ( intersectionSnapping == 0 )
155+
{
156+
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsForSamePosition );
157+
}
158+
else
159+
{
160+
mSnapper->setSnapMode( QgsSnapper::SnapWithResultsWithinTolerances );
161+
}
162162
}
163163

164164

@@ -279,60 +279,59 @@ int QgsMapCanvasSnapper::snapToBackgroundLayers( const QPoint& p, QList<QgsSnapp
279279
return 4;
280280
}
281281

282-
if( intersectionSnapping == 1 )
282+
if ( intersectionSnapping == 1 )
283283
{
284284
QList<QgsSnappingResult>::const_iterator it = results.constBegin();
285285
QList<QgsSnappingResult> segments;
286286
QList<QgsSnappingResult> points;
287287
for ( ; it != results.constEnd(); ++it )
288288
{
289-
if(it->snappedVertexNr==-1)
289+
if ( it->snappedVertexNr == -1 )
290290
{
291-
QgsDebugMsg("segment");
292-
segments.push_back(*it);
291+
QgsDebugMsg( "segment" );
292+
segments.push_back( *it );
293293
}
294294
else
295295
{
296-
QgsDebugMsg("no segment");
297-
points.push_back(*it);
296+
QgsDebugMsg( "no segment" );
297+
points.push_back( *it );
298298
}
299299
}
300300

301-
if(segments.length() >=2 )
301+
if ( segments.length() >= 2 )
302302
{
303303

304-
QgsGeometry* intersectionPoint;
305304
QList<QgsSnappingResult> myResults;
306305

307306
QList<QgsSnappingResult>::const_iterator oSegIt = segments.constBegin();
308307
QList<QgsSnappingResult>::iterator iSegIt;
309-
for( ; oSegIt != segments.constEnd(); ++oSegIt)
308+
for ( ; oSegIt != segments.constEnd(); ++oSegIt )
310309
{
311-
QgsDebugMsg( QString::number(oSegIt->beforeVertexNr) );
310+
QgsDebugMsg( QString::number( oSegIt->beforeVertexNr ) );
311+
312+
QVector<QgsPoint> vertexPoints;
313+
vertexPoints.append( oSegIt->beforeVertex );
314+
vertexPoints.append( oSegIt->afterVertex );
315+
QgsGeometry* lineA = QgsGeometry::fromPolyline( vertexPoints );
312316

317+
for ( iSegIt = segments.begin(); iSegIt != segments.end(); ++iSegIt )
318+
{
313319
QVector<QgsPoint> vertexPoints;
314-
vertexPoints.append( oSegIt->beforeVertex );
315-
vertexPoints.append( oSegIt->afterVertex );
316-
QgsGeometry* lineA = QgsGeometry::fromPolyline( vertexPoints );
320+
vertexPoints.append( iSegIt->beforeVertex );
321+
vertexPoints.append( iSegIt->afterVertex );
322+
QgsGeometry* lineB = QgsGeometry::fromPolyline( vertexPoints );
317323

318-
for( iSegIt = segments.begin(); iSegIt != segments.end(); ++iSegIt)
324+
QgsGeometry* intersectionPoint = lineA->intersection( lineB );
325+
if ( intersectionPoint->type() == QGis::Point )
319326
{
320-
QVector<QgsPoint> vertexPoints;
321-
vertexPoints.append( iSegIt->beforeVertex );
322-
vertexPoints.append( iSegIt->afterVertex );
323-
QgsGeometry* lineB = QgsGeometry::fromPolyline( vertexPoints );
324-
325-
intersectionPoint = lineA->intersection(lineB);
326-
if( intersectionPoint->type() == QGis::Point)
327-
{
328-
iSegIt->snappedVertex = intersectionPoint->asPoint();
329-
myResults.append(*iSegIt);
330-
}
327+
iSegIt->snappedVertex = intersectionPoint->asPoint();
328+
myResults.append( *iSegIt );
331329
}
330+
}
332331

333332
}
334333

335-
if( myResults.length() > 0 )
334+
if ( myResults.length() > 0 )
336335
{
337336
results.clear();
338337
results = myResults;

0 commit comments

Comments
 (0)
Please sign in to comment.