X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FXGUI%2FXGUI_Workshop.cpp;h=cb56c38795c4e51f8a1c29093dfa6b31a54ee0f2;hb=220bd2b37119be1c65abf88a88792445cb9d99f8;hp=57928b4b84341d8a55ad7e8ea92d33531e8884bd;hpb=d31b2834853f65576fceedcb8dd2ee8fd94d65a0;p=modules%2Fshaper.git

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index 57928b4b8..cb56c3879 100755
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1305,6 +1305,21 @@ void XGUI_Workshop::cleanHistory()
 
     QString aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?")
                    .arg(anUnusedNames));
+    /*QString aText;
+    if (anUnusedNames.isEmpty()) {
+      aMessageBox.setStandardButtons(QMessageBox::Ok);
+      aMessageBox.setDefaultButton(QMessageBox::Ok);
+
+      aText = QString(tr("All features are relevant, there is nothing to be deleted"));
+    }
+    else {
+      aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
+      aMessageBox.setDefaultButton(QMessageBox::No);
+
+      aText = QString(tr("Unused features are the following: %1.\nThese features will be deleted.\nWould you like to continue?")
+        .arg(anUnusedNames));
+    }*/
+
     aMessageBox.setText(aText);
     if (aMessageBox.exec() == QMessageBox::No)
       return;
@@ -1322,6 +1337,26 @@ void XGUI_Workshop::cleanHistory()
       operationMgr()->abortOperation(operationMgr()->currentOperation());
     }
   }
+  else {
+    QString anActionId = "CLEAN_HISTORY_CMD";
+    QString aDescription = contextMenuMgr()->action(anActionId)->text();
+
+    QMessageBox aMessageBox(desktop());
+    aMessageBox.setWindowTitle(aDescription);
+    aMessageBox.setIcon(QMessageBox::Warning);
+    aMessageBox.setStandardButtons(QMessageBox::No | QMessageBox::Yes);
+    aMessageBox.setDefaultButton(QMessageBox::No);
+
+    QString aText;
+    aMessageBox.setStandardButtons(QMessageBox::Ok);
+    aMessageBox.setDefaultButton(QMessageBox::Ok);
+
+    aText = QString(tr("All features are relevant, there is nothing to be deleted"));
+    aMessageBox.setText(aText);
+
+    if (aMessageBox.exec() == QMessageBox::No)
+      return;
+  }
 }
 
 //**************************************************************
@@ -1401,6 +1436,11 @@ bool XGUI_Workshop::isDeleteFeatureWithReferences(const QObjectPtrList& theList,
   QStringList aPartFeatureNames;
   foreach (ObjectPtr aObj, theList) {
     FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+    // invalid feature data means that the feature is already removed in model,
+    // we needn't process it. E.g. delete of feature from create operation. The operation abort
+    // will delete the operation
+    if (!aFeature->data()->isValid())
+      continue;
     ResultPtr aFirstResult = aFeature->firstResult();
     std::string aResultGroupName = aFirstResult->groupName();
     if (aResultGroupName == ModelAPI_ResultPart::group())
@@ -1938,8 +1978,14 @@ void XGUI_Workshop::synchronizeGroupInViewer(const DocumentPtr& theDoc,
   int aSize = theDoc->size(theGroup);
   for (int i = 0; i < aSize; i++) {
     aObj = theDoc->object(theGroup, i);
-    if (aObj->isDisplayed())
+    if (aObj->isDisplayed()) {
+      // Hide the presentation with an empty shape. But isDisplayed state of the object should not
+      // be changed to the object becomes visible when the shape becomes not empty
+      ResultPtr aRes = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
+      if (aRes.get() && (!aRes->shape().get() || aRes->shape()->isNull()))
+        continue;
       myDisplayer->display(aObj, false);
+    }
   }
   if (theUpdateViewer)
     myDisplayer->updateViewer();