@@ -32,7 +32,7 @@ QgsMapToolCircle3Tangents::QgsMapToolCircle3Tangents( QgsMapToolCapture *parentT
32
32
33
33
void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent ( QgsMapMouseEvent *e )
34
34
{
35
- QgsPoint mapPoint = pointFromPointXY ( e->mapPoint () );
35
+ QgsPoint mapPoint = fromPointXY ( e->mapPoint () );
36
36
EdgesOnlyFilter filter;
37
37
QgsPointLocator::Match match = mCanvas ->snappingUtils ()->snapToMap ( mapPoint, &filter );
38
38
@@ -43,17 +43,17 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
43
43
if ( match.isValid () && ( mPoints .size () <= 2 * 2 ) )
44
44
{
45
45
match.edgePoints ( p1, p2 );
46
- mPoints .append ( pointFromPointXY ( p1 ) );
47
- mPoints .append ( pointFromPointXY ( p2 ) );
46
+ mPoints .append ( fromPointXY ( p1 ) );
47
+ mPoints .append ( fromPointXY ( p2 ) );
48
48
}
49
49
}
50
50
else if ( e->button () == Qt::RightButton )
51
51
{
52
52
if ( match.isValid () && ( mPoints .size () == 4 ) )
53
53
{
54
54
match.edgePoints ( p1, p2 );
55
- mPoints .append ( pointFromPointXY ( p1 ) );
56
- mPoints .append ( pointFromPointXY ( p2 ) );
55
+ mPoints .append ( fromPointXY ( p1 ) );
56
+ mPoints .append ( fromPointXY ( p2 ) );
57
57
mCircle = QgsCircle ().from3Tangents ( mPoints .at ( 0 ), mPoints .at ( 1 ), mPoints .at ( 2 ), mPoints .at ( 3 ), mPoints .at ( 4 ), mPoints .at ( 5 ) );
58
58
if ( mCircle .isEmpty () )
59
59
{
@@ -73,7 +73,7 @@ void QgsMapToolCircle3Tangents::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
73
73
74
74
void QgsMapToolCircle3Tangents::cadCanvasMoveEvent ( QgsMapMouseEvent *e )
75
75
{
76
- QgsPoint mapPoint = pointFromPointXY ( e->mapPoint () );
76
+ QgsPoint mapPoint = fromPointXY ( e->mapPoint () );
77
77
EdgesOnlyFilter filter;
78
78
QgsPointLocator::Match match = mCanvas ->snappingUtils ()->snapToMap ( mapPoint, &filter );
79
79
@@ -94,8 +94,8 @@ void QgsMapToolCircle3Tangents::cadCanvasMoveEvent( QgsMapMouseEvent *e )
94
94
match.edgePoints ( p1, p2 );
95
95
std::unique_ptr<QgsLineString> line ( new QgsLineString () );
96
96
97
- line->addVertex ( pointFromPointXY ( p1 ) );
98
- line->addVertex ( pointFromPointXY ( p2 ) );
97
+ line->addVertex ( fromPointXY ( p1 ) );
98
+ line->addVertex ( fromPointXY ( p2 ) );
99
99
100
100
mTempRubberBand ->setGeometry ( line.release () );
101
101
mTempRubberBand ->show ();
0 commit comments