X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=b9c7e78c8151f7461fe2d508e4a4d1132de46d82;hb=06e7f5859095193fc7f498bd89a7d28009794f53;hp=63e88207e7b4ea6f170fb8fc4972a07468ef67bd;hpb=bb4ab20a1f03f936d4d8511eb9e9733ee965bb72;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp
index 63e88207e..b9c7e78c8 100644
--- a/src/PartSet/PartSet_MenuMgr.cpp
+++ b/src/PartSet/PartSet_MenuMgr.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -46,6 +46,8 @@
 #include <XGUI_DataModel.h>
 #include <XGUI_OperationMgr.h>
 #include <XGUI_ObjectsBrowser.h>
+#include <XGUI_Tools.h>
+#include <XGUI_ViewerProxy.h>
 
 #include <Events_Loop.h>
 #include <ModelAPI_Events.h>
@@ -56,6 +58,7 @@
 #include <QAction>
 #include <QMenu>
 #include <QEvent>
+#include <QApplication>
 
 #include <TopoDS.hxx>
 #include <BRep_Tool.hxx>
@@ -104,6 +107,10 @@ void PartSet_MenuMgr::createActions()
   aAction = ModuleBase_Tools::createAction(QIcon(":icons/edit.png"), tr("Edit..."), aParent,
                          this, SLOT(onEdit(bool)));
   myActions["EDIT_CMD"] = aAction;
+
+  aAction = ModuleBase_Tools::createAction(QIcon(":icons/activate.png"), tr("Load all parts"),
+    aParent, this, SLOT(onActivateAllParts()));
+  myActions["ACTIVATE_ALL_PARTS_CMD"] = aAction;
 }
 
 
@@ -167,8 +174,8 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap<QString, QAction*>& theStdActions
 
         // Find coincident in these coordinates
         ObjectPtr aObj = aPrsList.first()->object();
-        FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
-        FeaturePtr aCoincident = PartSet_Tools::findFirstCoincidence(aFeature, aSelPnt);
+        FeaturePtr aCoincident =
+            PartSet_Tools::findFirstCoincidence(ModelAPI_Feature::feature(aObj), aSelPnt);
         // If we have coincidence then add Detach menu
         if (aCoincident.get() != NULL) {
           QList<FeaturePtr> aCoins;
@@ -186,8 +193,8 @@ bool PartSet_MenuMgr::addViewerMenu(const QMap<QString, QAction*>& theStdActions
             theMenuActions[anIndex++] = aSubMenu->menuAction();
             QAction* aAction;
             int i = 0;
-            foreach (FeaturePtr aCoins, myCoinsideLines) {
-              QString anItemText = aCoins->data()->name().c_str();
+            foreach (FeaturePtr aCoinsL, myCoinsideLines) {
+              QString anItemText = QString::fromStdWString(aCoinsL->data()->name());
 #ifdef _DEBUG
               if (anIsAttributes[i])
                 anItemText += " [attribute]";
@@ -279,7 +286,6 @@ void addRefCoincidentFeatures(const std::set<AttributePtr>& theRefList,
       std::shared_ptr<GeomAPI_Pnt2d> aPnt = PartSet_Tools::getCoincedencePoint(aConstrFeature);
       if (aPnt.get() == NULL)
         return;
-      gp_Pnt aP = aPnt->impl<gp_Pnt>();
       if (theRefPnt->isEqual(aPnt) && (!theOutList.contains(aConstrFeature))) {
         theOutList.append(aConstrFeature);
       }
@@ -311,11 +317,9 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction)
   if (aToDelFeatures.size() > 0) {
     XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myModule->workshop());
     XGUI_Workshop* aWorkshop = aConnector->workshop();
-    ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation();
 
-    ModuleBase_Operation* anOpAction =
-      new ModuleBase_Operation(tr("Detach %1").arg(aLine->data()->name().c_str()), myModule);
-    bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation);
+    ModuleBase_Operation* anOpAction = new ModuleBase_Operation(tr("Detach %1").arg(
+        QString::fromStdWString(aLine->data()->name())), myModule);
     XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
     // the active nested sketch operation should be aborted unconditionally
     // the Delete action should be additionally granted for the Sketch operation
@@ -378,7 +382,6 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked)
   XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
   if (isUseTransaction) {
     anOpAction = new ModuleBase_Operation(anAction->text(), myModule);
-    bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation);
 
     bool isCommitted;
     if (!anOpMgr->canStartOperation(anOpAction->id(), isCommitted))
@@ -493,15 +496,52 @@ void PartSet_MenuMgr::onActivatePart(bool)
 void PartSet_MenuMgr::activatePart(ResultPartPtr thePart) const
 {
   bool isFirstLoad = !thePart->partDoc().get();
+  ModuleBase_Tools::blockUpdateViewer(true);
   thePart->activate();
   if (isFirstLoad) {
     XGUI_Workshop* aWorkshop = myModule->getWorkshop();
     XGUI_ObjectsBrowser* aObjBrowser = aWorkshop->objectBrowser();
+    ModuleBase_Tools::setDisplaying(thePart);
+    Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY));
+    aObjBrowser->onSelectionChanged();
     DocumentPtr aDoc = thePart->partDoc();
     std::list<bool> aStates;
     aDoc->restoreNodesState(aStates);
     aObjBrowser->setStateForDoc(aDoc, aStates);
   }
+  ModuleBase_Tools::blockUpdateViewer(false);
+}
+
+void PartSet_MenuMgr::onActivateAllParts()
+{
+  SessionPtr aMgr = ModelAPI_Session::get();
+  if (aMgr->isOperation())
+    return;
+
+  DocumentPtr aDoc = aMgr->moduleDocument();
+  int aNbParts = aDoc->size(ModelAPI_ResultPart::group());
+  QList<ResultPartPtr> aPartsToLoad;
+  for (int i = 0; i < aNbParts; i++) {
+    ObjectPtr aObj = aDoc->object(ModelAPI_ResultPart::group(), i);
+    ResultPartPtr aPartRes = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+    if (!aPartRes->partDoc().get())
+      aPartsToLoad.append(aPartRes);
+  }
+  if (!aPartsToLoad.isEmpty()) {
+    QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
+    aMgr->startOperation("All Parts loading");
+    foreach(ResultPartPtr aPartRes, aPartsToLoad) {
+      aPartRes->loadPart();
+    }
+    aMgr->finishOperation();
+
+    XGUI_Workshop* aWorkshop = myModule->getWorkshop();
+    XGUI_ObjectsBrowser* aObjBrowser = aWorkshop->objectBrowser();
+    aObjBrowser->update();
+    aWorkshop->viewer()->update();
+    aWorkshop->updateCommandStatus();
+    QApplication::restoreOverrideCursor();
+  }
 }
 
 void PartSet_MenuMgr::onActivatePartSet(bool)