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
Operation of ordering with empty implementation added to project.
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_ImportBathymetryOp.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
index ad2cc3dfea2b4b712c650f138b47dce8f0471a2d..60ae9a44e734a48dcf163936b55d69b888d50318 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
+++ b/
src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
@@
-66,7
+66,7
@@
void HYDROGUI_ImportBathymetryOp::startOperation()
if( !myEditedObject.IsNull() )
{
QString aName = myEditedObject->GetName();
if( !myEditedObject.IsNull() )
{
QString aName = myEditedObject->GetName();
- QString aFileName =
myEditedObject->GetFilePath(
);
+ QString aFileName =
HYDROGUI_Tool::ToQString( myEditedObject->GetFilePath()
);
bool anIsAltitudesInverted = myEditedObject->IsAltitudesInverted();
aPanel->setObjectName( aName );
bool anIsAltitudesInverted = myEditedObject->IsAltitudesInverted();
aPanel->setObjectName( aName );
@@
-150,11
+150,11
@@
bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
if ( aBathymetryObj.IsNull() )
return false;
if ( aBathymetryObj.IsNull() )
return false;
- QString anOldFileName =
aBathymetryObj->GetFilePath(
);
+ QString anOldFileName =
HYDROGUI_Tool::ToQString( aBathymetryObj->GetFilePath()
);
if ( aFileName != anOldFileName )
{
aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes, false );
if ( aFileName != anOldFileName )
{
aBathymetryObj->SetAltitudesInverted( anIsInvertAltitudes, false );
- if ( !aBathymetryObj->ImportFromFile(
aFileName
) )
+ if ( !aBathymetryObj->ImportFromFile(
HYDROGUI_Tool::ToAsciiString( aFileName )
) )
{
theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
return false;
{
theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileName );
return false;