refs #727, #736: fix for the first bug and for the second part (Bug2) of the last...

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

diff --git a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
index 83dd008aca4a7b9efbeca9d4c1180072be28c747..8425cb1d8e1181f7b6c4e1d0a97a51e5545414c5 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_DeleteOp.cxx
@@ -17,10 +17,11 @@
 //
 
 #include "HYDROGUI_DeleteOp.h"
-
+#include "HYDROGUI_DataModel.h"
 #include "HYDROGUI_DeleteDlg.h"
 #include "HYDROGUI_Module.h"
 #include "HYDROGUI_Tool.h"
+#include "HYDROGUI_Tool2.h"
 #include "HYDROGUI_UpdateFlags.h"
 
 #include <HYDROData_Object.h>
@@ -84,7 +85,7 @@ void HYDROGUI_DeleteOp::startOperation()
 
   // check the back-references
   QMap<QString,HYDROData_SequenceOfObjects> aBackObjects =
-    HYDROGUI_Tool::GetObjectsBackReferences( module(), anObjNames );
+    HYDROGUI_Tool::GetObjectsBackReferences( doc(), anObjNames );
 
   QMap<QString,HYDROData_SequenceOfObjects>::const_iterator anIt = aBackObjects.begin(),
                                                             aLast = aBackObjects.end();
@@ -117,16 +118,21 @@ void HYDROGUI_DeleteOp::startOperation()
 
   HYDROGUI_DeleteDlg aDeleteDlg( module()->getApp()->desktop() );
   aDeleteDlg.setObjectsToRemove( anObjNames );
+  bool isLastStricklerRemoved = false;
   if ( aDeleteDlg.exec() != HYDROGUI_DeleteDlg::Accepted )
   {
     abort();
     return;
-  } else {
+  }
+  else
+  {
     QStringList aTableNames = 
       HYDROGUI_Tool::FindExistingObjectsNames( doc(), KIND_STRICKLER_TABLE, false );
     aTableNames += anObjNames;
-    if ( aTableNames.toSet().size() == anObjNames.size() ) {
+    if ( aTableNames.toSet().size() == anObjNames.size() )
+    {
       aWarningMsg = tr("DELETE_LAST_TABLE_WRN");
+      isLastStricklerRemoved = true;
     }
   }
 
@@ -153,8 +159,16 @@ void HYDROGUI_DeleteOp::startOperation()
     }
   }
 
+  if( isLastStricklerRemoved )
+  {
+    HYDROGUI_DataModel* aModel = dynamic_cast<HYDROGUI_DataModel*>( module()->dataModel() );
+    aModel->createDefaultStricklerTable( doc(), 0 );
+  }
+
   commitDocOperation();
 
   module()->update( UF_Model | UF_Viewer | UF_OCCViewer | UF_VTKViewer );
   commit();
+
+  module()->enableLCMActions();
 }