PR: quadtree

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
index 9dacc3704211c9bdc78da61a3a7561ddc5a1b2bb..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();
-      QString aFileName = myEditedObject->GetFilePath();
+      QString aFileName = HYDROGUI_Tool::ToQString( myEditedObject->GetFilePath() );
       bool anIsAltitudesInverted = myEditedObject->IsAltitudesInverted();
 
       aPanel->setObjectName( aName );
@@ -150,11 +150,11 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
   if ( aBathymetryObj.IsNull() )
     return false;
 
-  QString anOldFileName = aBathymetryObj->GetFilePath();
+  QString anOldFileName = HYDROGUI_Tool::ToQString( aBathymetryObj->GetFilePath() );
   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;
@@ -207,7 +207,7 @@ void HYDROGUI_ImportBathymetryOp::onFileSelected()
     return;
 
   QString anObjectName = aPanel->getObjectName().simplified();
-  if ( anObjectName.isEmpty() )
+  //if ( anObjectName.isEmpty() )
   {
     anObjectName = aPanel->getFileName();
     if ( !anObjectName.isEmpty() ) {