Fix coords widget locale issues (plus other unreported)

elpaso · elpaso · commit 10df998628a3 · 2023-04-04T13:09:03.000+02:00
1. fix #52446 2. fix unreported coords not swapped when needed before centering the canvas 3. fix unreported coords not transformed when needed before centering the canvas
diff --git a/src/app/qgsstatusbarcoordinateswidget.cpp b/src/app/qgsstatusbarcoordinateswidget.cpp
@@ -60,9 +60,7 @@ QgsStatusBarCoordinatesWidget::QgsStatusBarCoordinatesWidget( QWidget *parent )
   mLineEdit->setAlignment( Qt::AlignCenter );
   connect( mLineEdit, &QLineEdit::returnPressed, this, &QgsStatusBarCoordinatesWidget::validateCoordinates );
 
-  const QRegularExpression coordValidator( "[+-]?\\d+\\.?\\d*\\s*,\\s*[+-]?\\d+\\.?\\d*" );
-  mCoordsEditValidator = new QRegularExpressionValidator( coordValidator, this );
-  mLineEdit->setToolTip( tr( "Current map coordinate (longitude,latitude or east,north)" ) );
+  mLineEdit->setToolTip( tr( "Current map coordinate (longitude latitude or east north)" ) );
 
   //toggle to switch between mouse pos and extents display in status bar widget
   mToggleExtentsViewButton = new QToolButton( this );
@@ -173,6 +171,7 @@ void QgsStatusBarCoordinatesWidget::validateCoordinates()
   QString coordText = mLineEdit->text();
   const thread_local QRegularExpression sMultipleWhitespaceRx( QStringLiteral( " {2,}" ) );
   coordText.replace( sMultipleWhitespaceRx, QStringLiteral( " " ) );
+  coordText.remove( QStringLiteral( "°" ) );
 
   QStringList parts = coordText.split( ',' );
   if ( parts.size() == 2 )
@@ -191,6 +190,17 @@ void QgsStatusBarCoordinatesWidget::validateCoordinates()
     }
   }
 
+  // Use locale
+  if ( !xOk || !yOk )
+  {
+    parts = coordText.split( ' ' );
+    if ( parts.size() == 2 )
+    {
+      first = QLocale().toDouble( parts.at( 0 ), &xOk );
+      second = QLocale().toDouble( parts.at( 1 ),  &yOk );
+    }
+  }
+
   if ( !xOk || !yOk )
     return;
 
@@ -202,13 +212,32 @@ void QgsStatusBarCoordinatesWidget::validateCoordinates()
   {
     case Qgis::CoordinateOrder::Default:
     case Qgis::CoordinateOrder::XY:
-      mMapCanvas->setCenter( QgsPointXY( first, second ) );
       break;
     case Qgis::CoordinateOrder::YX:
-      mMapCanvas->setCenter( QgsPointXY( second, first ) );
+      std::swap( first, second );
       break;
   }
 
+  QgsPointXY centerPoint { first, second };
+
+  const QgsCoordinateReferenceSystem displayCrs = QgsProject::instance()->displaySettings()->coordinateCrs();
+  const QgsCoordinateReferenceSystem canvasCrs = mMapCanvas->mapSettings().destinationCrs();
+  if ( displayCrs.isValid() && canvasCrs.isValid() &&  displayCrs != canvasCrs )
+  {
+    const QgsCoordinateTransform ct { displayCrs, canvasCrs, QgsProject::instance()->transformContext() };
+    try
+    {
+
+      centerPoint = ct.transform( centerPoint );
+    }
+    catch ( const QgsCsException & )
+    {
+      return;
+    }
+  }
+
+  mMapCanvas->setCenter( centerPoint );
+
   mMapCanvas->refresh();
 }
 
diff --git a/src/app/qgsstatusbarcoordinateswidget.h b/src/app/qgsstatusbarcoordinateswidget.h
@@ -78,7 +78,6 @@ class APP_EXPORT QgsStatusBarCoordinatesWidget : public QWidget
     //! Widget that will live on the statusbar to display "Coordinate / Extent"
     QLabel *mLabel = nullptr;
 
-    QValidator *mCoordsEditValidator = nullptr;
     QTimer *mDizzyTimer = nullptr;
     QgsMapCanvas *mMapCanvas = nullptr;
     int mTwoCharSize = 0;
