Merge branch 'master' of salome:modules/shaper

[modules/shaper.git] / src / XGUI / XGUI_Workshop.cpp

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index fd0fc2d81e600fad8906d67e2b7291acb33ea1bf..54775a47b62e381c5ba0dd1610d2a45283b4855c 100755 (executable)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -1290,8 +1290,8 @@ void XGUI_Workshop::deleteObjects()
   if (ModuleBase_Tools::isDeleteFeatureWithReferences(anObjects, aDirectRefFeatures, 
       aIndirectRefFeatures, desktop(), doDeleteReferences)) {
     // start operation
-    QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text();
-    aDescription += " " + aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
+    QString aDescription = contextMenuMgr()->action("DELETE_CMD")->text() + " %1";
+    aDescription = aDescription.arg(XGUI_Tools::unionOfObjectNames(anObjects, ", "));
     ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, module());
     operationMgr()->startOperation(anOpAction);
 
@@ -1983,12 +1983,14 @@ void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects)
   FeaturePtr aFeature;
   QObjectPtrList aSelList = theObjects;
   std::list<ResultPtr> aResList;
+  bool aHasHidden = false;
   foreach(ObjectPtr aObj, theObjects) {
     aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
     if (aFeature.get()) {
       aResList = aFeature->results();
       std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aIt;
       for(aIt = aResList.cbegin(); aIt != aResList.cend(); aIt++) {
+        aHasHidden |= (*aIt)->isConcealed();
         aSelList.append(*aIt);
       }
     }
@@ -1999,6 +2001,9 @@ void XGUI_Workshop::highlightResults(const QObjectPtrList& theObjects)
     objectBrowser()->setObjectsSelected(aSelList);
     objectBrowser()->blockSignals(aBlocked);
   }
+  if (aHasHidden) 
+    QMessageBox::information(desktop(), tr("Find results"), 
+                             tr("Not all results can be highlighted"), QMessageBox::Ok);
 }
 
 void XGUI_Workshop::highlightFeature(const QObjectPtrList& theObjects)