X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHYDROGUI%2FHYDROGUI_DeleteOp.cxx;h=51c2243f23f36d683279563fa44d6d2dd6d8d455;hb=81c9f5cdf82909d0aebd2c491c50fa7516cc80b7;hp=f7534146b158ff6574618747c28d9b8718efc00e;hpb=34310fe4f26db0f23c2edfef1678e5b02f578204;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index f7534146..51c2243f 100644
--- a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
@@ -22,6 +22,7 @@
 
 #include "HYDROGUI_DeleteOp.h"
 
+#include "HYDROGUI_DeleteDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_UpdateFlags.h"
@@ -81,27 +82,41 @@ void HYDROGUI_DeleteOp::startOperation()
   }
 
   anObjNames.removeDuplicates();
-  anObjNames.sort();
 
   // check the back-references
   QMap<QString,HYDROData_SequenceOfObjects> aBackObjects =
     HYDROGUI_Tool::GetObjectsBackReferences( module(), anObjNames );
 
+  QMap<QString,HYDROData_SequenceOfObjects>::const_iterator anIt = aBackObjects.begin(),
+                                                            aLast = aBackObjects.end();
+  QStringList aRefList;
+  for ( ; anIt != aLast; anIt++ ) {
+    QStringList aSeqList;
+    HYDROData_SequenceOfObjects::Iterator anIter( anIt.value() );
+    for ( ; anIter.More(); anIter.Next() )
+    {
+      Handle(HYDROData_Entity) anEntity = anIter.Value();
+      if ( anEntity.IsNull() )
+        continue;
+      aSeqList.append( QString( tr( "DELETE_OBJECT_NAME" ) ).arg( anEntity->GetName() ) );
+    }
+    aRefList.append( QString( tr( "DELETE_OBJECT_IS_USED_FOR" ) ).arg( anIt.key() )
+                                                          .arg( aSeqList.join( ", " ) ) );
+  }
+
+  //QString aNamesList = anObjNames.join( "\n" );
   if ( !aBackObjects.isEmpty() )
   {
     SUIT_MessageBox::critical( module()->getApp()->desktop(),
-                               tr( "DELETE_OBJECTS" ), tr( "DELETED_OBJECTS_HAS_BACKREFERENCES" ) );
+                               tr( "DELETE_OBJECTS" ),
+                               tr( "DELETED_OBJECTS_HAS_BACKREFERENCES" ).arg( aRefList.join( "\n" ) ) );
     abort();
     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 )
+  HYDROGUI_DeleteDlg aDeleteDlg( module()->getApp()->desktop() );
+  aDeleteDlg.setObjectsToRemove( anObjNames );
+  if ( aDeleteDlg.exec() != HYDROGUI_DeleteDlg::Accepted )
   {
     abort();
     return;
@@ -118,6 +133,6 @@ void HYDROGUI_DeleteOp::startOperation()
 
   commitDocOperation();
 
-  module()->update( UF_Model | UF_Viewer | UF_OCCViewer );
+  module()->update( UF_Model | UF_Viewer | UF_OCCViewer | UF_VTKViewer );
   commit();
 }