X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FHYDROGUI%2FHYDROGUI_DeleteOp.cxx;h=83dd008aca4a7b9efbeca9d4c1180072be28c747;hb=b4004b045ed278612105d2665bfcfffd854ab1fc;hp=389502293dcd840f2d42a3556aeb88548578c1eb;hpb=474c2cd65280d793f1c81ca528bc92e1cff988e6;p=modules%2Fhydro.git

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index 38950229..83dd008a 100644
--- a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -28,12 +24,15 @@
 #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 )
 {
@@ -114,12 +113,32 @@ void HYDROGUI_DeleteOp::startOperation()
     return;
   }
 
+  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();
@@ -127,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();