X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_GeoreferencementDlg.cxx;h=45b8d55a95deb8035cb2a2aa69358c9dbf8a092d;hb=a53349567d67f4df0ef737798a25c24d9dc8f08e;hp=7bb035f06bf3e14b3a461239f8b7386c395859a2;hpb=8c36538920c44b66924b596a8d2c8a10bab9b7e5;p=modules%2Fhydro.git diff --git a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx index 7bb035f0..45b8d55a 100644 --- a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx +++ b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx @@ -1,12 +1,8 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE -// -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -// +// Copyright (C) 2014-2015 EDF-R&D // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -24,7 +20,7 @@ #include "HYDROGUI_Tool.h" -#include +#include #include #include @@ -228,10 +224,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 @@ -316,8 +312,8 @@ void HYDROGUI_GeoreferencementDlg::onMousePress( 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 ); }