refs #640: correct width for non-georeferenced profile

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

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index 8d55ce79def2d30e95395ec4ad2490f3ddb5fab7..83dd008aca4a7b9efbeca9d4c1180072be28c747 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DeleteOp.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
@@ -22,17 +18,21 @@
 
 #include "HYDROGUI_DeleteOp.h"
 
+#include "HYDROGUI_DeleteDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Object.h>
+#include <HYDROData_Document.h>
 
 #include <LightApp_Application.h>
 
 #include <SUIT_Desktop.h>
 #include <SUIT_MessageBox.h>
 
+#include <QSet>
+
 HYDROGUI_DeleteOp::HYDROGUI_DeleteOp( HYDROGUI_Module* theModule )
 : HYDROGUI_Operation( theModule )
 {
@@ -81,7 +81,6 @@ void HYDROGUI_DeleteOp::startOperation()
   }
 
   anObjNames.removeDuplicates();
-  anObjNames.sort();
 
   // check the back-references
   QMap<QString,HYDROData_SequenceOfObjects> aBackObjects =
@@ -114,16 +113,32 @@ void HYDROGUI_DeleteOp::startOperation()
     return;
   }
 
-  QString aNamesList = anObjNames.join( "\n" );
-  int anAnswer = SUIT_MessageBox::question( module()->getApp()->desktop(),
-                                            tr( "DELETE_OBJECTS" ),
-                                            tr( "CONFIRM_DELETION" ).arg( aNamesList ),
-                                            QMessageBox::Yes | QMessageBox::No,
-                                            QMessageBox::No );
-  if( anAnswer == QMessageBox::No )
+  QString aWarningMsg;
+
+  HYDROGUI_DeleteDlg aDeleteDlg( module()->getApp()->desktop() );
+  aDeleteDlg.setObjectsToRemove( anObjNames );
+  if ( aDeleteDlg.exec() != HYDROGUI_DeleteDlg::Accepted )
   {
     abort();
     return;
+  } else {
+    QStringList aTableNames = 
+      HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_STRICKLER_TABLE, false );
+    aTableNames += anObjNames;
+    if ( aTableNames.toSet().size() == anObjNames.size() ) {
+      aWarningMsg = tr("DELETE_LAST_TABLE_WRN");
+    }
+  }
+
+  if ( !aWarningMsg.isEmpty() ) {
+    int anAnswer = SUIT_MessageBox::warning( module()->getApp()->desktop(),
+                                             tr("WARNING"), aWarningMsg,
+                                              QMessageBox::Yes | QMessageBox::No,
+                                              QMessageBox::No );
+    if ( anAnswer != QMessageBox::Yes ) {
+      abort();
+      return;
+    }
   }
 
   startDocOperation();
@@ -131,8 +146,11 @@ void HYDROGUI_DeleteOp::startOperation()
   for( Standard_Integer anIndex = 1, aLength = aSeq.Length(); anIndex <= aLength; anIndex++ )
   {
     Handle(HYDROData_Entity) anObject = aSeq.Value( anIndex );
-    if ( !anObject.IsNull() && !anObject->IsRemoved() )
+
+    if ( !anObject.IsNull() && !anObject->IsRemoved() ) {
       anObject->Remove();
+      module()->setObjectRemoved( anObject );
+    }
   }
 
   commitDocOperation();