Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #550: fix crash when myObject is NULL
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_GeoreferencementDlg.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
b/src/HYDROGUI/HYDROGUI_GeoreferencementDlg.cxx
index 35be05cd0187f33c40e768357d133f30320d7001..45b8d55a95deb8035cb2a2aa69358c9dbf8a092d 100644
(file)
--- 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
// 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
//
// 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 "HYDROGUI_Tool.h"
-#include <
GEOM
Utils.hxx>
+#include <
CurveCreator_
Utils.hxx>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewManager.h>
#include <OCCViewer_ViewWindow.h>
#include <OCCViewer_ViewManager.h>
@@
-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 ) {
// 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
}
// Insert row with the data
@@
-309,15
+305,15
@@
void HYDROGUI_GeoreferencementDlg::onMousePress(
// Get the selected point coordinates
OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
// Get the selected point coordinates
OCCViewer_ViewPort3d* aViewPort = anOCCViewWindow->getViewPort();
- gp_Pnt aPnt =
GEOM
Utils::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;
// 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 );
}
myTable->item( aRow, aColumnX )->setText( aXStr );
myTable->item( aRow, aColumnY )->setText( anYStr );
}