refs #430: incorrect coordinates in dump polyline

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_GeoreferencementDlg.cxx

diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
index 35be05cd0187f33c40e768357d133f30320d7001..082505cbab9c0883f84c6ab00767830cde82f100 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
+++ b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
@@ -24,7 +24,7 @@
 
 #include "HYDROGUI_Tool.h"
 
-#include <GEOMUtils.hxx>
+#include <CurveCreator_Utils.h>
 
 #include <OCCViewer_ViewWindow.h>
 #include <OCCViewer_ViewManager.h>
@@ -228,10 +228,10 @@ void HYDROGUI_GeoreferencementDlg::setData( const ProfilesGeoDataList& theData )
     // Get georeferencement data for the current profile
     QString aXg, anYg, aXd, anYd;
     if ( !aGeoData.isEmpty ) {
-      aXg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xg );
-      anYg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yg );
-      aXd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xd );
-      anYd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yd );
+      aXg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xg, false );
+      anYg = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yg, false );
+      aXd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Xd, false );
+      anYd = HYDROGUI_Tool::GetCoordinateString( aGeoData.Yd, false );
     }
     
     // Insert row with the data
@@ -309,15 +309,15 @@ void HYDROGUI_GeoreferencementDlg::onMousePress(
 
   // Get the selected point coordinates
   OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
-  gp_Pnt aPnt = GEOMUtils::ConvertClickToPoint( theEvent->x(), theEvent->y(), 
-                                                aViewPort->getView() );
+  gp_Pnt aPnt = CurveCreator_Utils::ConvertClickToPoint( theEvent->x(), theEvent->y(), 
+                                                         aViewPort->getView() );
 
   // Set the coordinates to the corresponding cells of the table
   int aColumnX = aColumn < 3 ? 1 : 3;
   int aColumnY = aColumnX + 1;
   
-  QString aXStr = HYDROGUI_Tool::GetCoordinateString( aPnt.X() );
-  QString anYStr = HYDROGUI_Tool::GetCoordinateString( aPnt.Y() );
+  QString aXStr = HYDROGUI_Tool::GetCoordinateString( aPnt.X(), false );
+  QString anYStr = HYDROGUI_Tool::GetCoordinateString( aPnt.Y(), false );
   myTable->item( aRow, aColumnX )->setText( aXStr );
   myTable->item( aRow, aColumnY )->setText( anYStr );
 }