refs #550: fix crash when myObject is NULL

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

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index da2cd3739a300c4b2c0dc1001bc9544ca57c5c91..8a85237954bf2078226d85a6eef5001eac94f329 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,6 +18,7 @@
 
 #include "HYDROGUI_DeleteOp.h"
 
+#include "HYDROGUI_DeleteDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
 #include "HYDROGUI_UpdateFlags.h"
@@ -81,27 +78,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;