Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
index 02ea51ac293063d1dff35c8ef40ae345dfa2bcc9..71fd99e0d585874f4ab140e74c04f882ca237831 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImportBathymetryOp.cxx
@@ -61,6 +61,7 @@ void HYDROGUI_ImportBathymetryOp::startOperation()
     return;
 
   aPanel->reset();
+  aPanel->SetEditMode(myIsEdit);
 
   if( myIsEdit )
   {
@@ -75,7 +76,7 @@ void HYDROGUI_ImportBathymetryOp::startOperation()
       aPanel->setFuseIntoOneOptionChecked( true );
 
       aPanel->setObjectName( aName );
-      aPanel->setFileNames( aFileNames ); 
+      aPanel->addFileNames( aFileNames ); 
       aPanel->setInvertAltitudes( anIsAltitudesInverted );
       aPanel->setFuseIntoOneOptionEnabled( false );
     }
@@ -147,7 +148,7 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
 
   if (!inexistWarn.isNull())
     SUIT_MessageBox::warning( module()->getApp()->desktop(), 
-    tr( "BATHEMETRY_IMPORT_WARNING" ), "Can't read the next files:" + inexistWarn );
+    tr( "BATHYMETRY_IMPORT_WARNING" ), "Can't read the next files:" + inexistWarn );
 
   aFileNames = DummyFileList;
 
@@ -163,11 +164,11 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
     if (myEditedObject.IsNull())
       return false;
     QStringList anOldFileNames = myEditedObject->GetFilePaths(); 
-    bool anIsInvertAltitudes = aPanel->isInvertAltitudes();
-    myEditedObject->SetAltitudesInverted( anIsInvertAltitudes, false );
+    //bool anIsInvertAltitudes = aPanel->isInvertAltitudes();
+    //myEditedObject->SetAltitudesInverted( anIsInvertAltitudes, false );
     if ( aFileNames.toSet() != anOldFileNames.toSet() )
     {
-      myEditedObject->SetAltitudesInverted( anIsInvertAltitudes, false );
+      myEditedObject->SetAltitudesInverted( anIsInvertAltitudes, true );
       if ( !myEditedObject->ImportFromFiles( aFileNames ) )
       {
         theErrorMsg = tr( "BAD_IMPORTED_BATHYMETRY_FILE" ).arg( aFileNames.join("\n") );
@@ -175,16 +176,9 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
       }
     }
     else if ( anIsInvertAltitudes != myEditedObject->IsAltitudesInverted() )
-      myEditedObject->SetAltitudesInverted( anIsInvertAltitudes );
+      myEditedObject->SetAltitudesInverted( anIsInvertAltitudes, true );
 
-    QString aNewObjName;
-    if (CheckNameExistingBathy(anObjectName, aNewObjName))
-    {
-      myEditedObject->SetName( aNewObjName );
-      replacemWarn += "\n'" + anObjectName + "' => '" + aNewObjName + "'";
-    }
-    else
-      myEditedObject->SetName( anObjectName );
+    myEditedObject->SetName( anObjectName );
     myEditedObject->Update();
   }
   else
@@ -256,12 +250,12 @@ bool HYDROGUI_ImportBathymetryOp::processApply( int& theUpdateFlags,
 
   if (!UnreadFilesWarn.isNull())
     SUIT_MessageBox::warning( module()->getApp()->desktop(), 
-    tr( "BATHEMETRY_IMPORT_WARNING" ), "The next files cannot be imported:" + UnreadFilesWarn );
+    tr( "BATHYMETRY_IMPORT_WARNING" ), "The next files cannot be imported:" + UnreadFilesWarn );
 
 
   if (!replacemWarn.isNull())
     SUIT_MessageBox::warning( module()->getApp()->desktop(), 
-    tr( "BATHEMETRY_IMPORT_WARNING" ), "The next objects names are already exist in the document; so the new objects was renamed:" + replacemWarn );
+    tr( "BATHYMETRY_IMPORT_WARNING" ), "The next objects names are already exist in the document; so the new objects was renamed:" + replacemWarn );
 
   // Activate VTK viewer and show the bathymetry
   SUIT_ViewManager* aVTKMgr = 0;
@@ -292,25 +286,7 @@ void HYDROGUI_ImportBathymetryOp::onFileSelected()
   if ( !aPanel )
     return;
 
-  QStringList aFileNames = aPanel->getFileNames();
-  if ( !aPanel->isFuseIntoOneOptionEnabled() )
-    aPanel->setFuseIntoOneOptionEnabled( !myIsEdit && aFileNames.count() > 1 );
-
-  QString anObjectName = aPanel->getObjectName().simplified();
-  if ( anObjectName.isEmpty() )
-  {
-    if (aFileNames.count() == 1)
-    {
-      anObjectName = aFileNames[0];
-      if ( !anObjectName.isEmpty() )
-        anObjectName = QFileInfo( anObjectName ).baseName();
-    }
-
-    if ( anObjectName.isEmpty() ) {
-      anObjectName = HYDROGUI_Tool::GenerateObjectName( module(), tr( "DEFAULT_BATHYMETRY_NAME" ) );
-    }
-    aPanel->setObjectName( anObjectName );
-  }
+  aPanel->UpdateCheckBoxStates();
 }
 
 bool HYDROGUI_ImportBathymetryOp::CheckNameExistingBathy(const QString& InpName, QString& OutputName)