X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_MenuMgr.cpp;h=1664be7692736498a7cd55c83dd4d6c7c301c247;hb=aea15db62bec148b6bfd5db468c682b1695c3449;hp=fa44262816150bdec9a85d277a80f584874b9d3e;hpb=d5c0128fc1e984053a2c50e1937a6c8998d76d1e;p=modules%2Fshaper.git

diff --git a/src/PartSet/PartSet_MenuMgr.cpp b/src/PartSet/PartSet_MenuMgr.cpp
index fa4426281..1664be769 100644
--- a/src/PartSet/PartSet_MenuMgr.cpp
+++ b/src/PartSet/PartSet_MenuMgr.cpp
@@ -9,6 +9,8 @@
 #include "PartSet_SketcherMgr.h"
 #include "PartSet_Tools.h"
 
+#include <PartSetPlugin_Part.h>
+
 #include <GeomAPI_Pnt2d.h>
 #include <GeomDataAPI_Point2D.h>
 
@@ -28,6 +30,8 @@
 #include <Events_Loop.h>
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Session.h>
+#include <ModelAPI_ResultPart.h>
+#include <ModelAPI_ResultParameter.h>
 
 #include <QAction>
 #include <QMenu>
@@ -60,11 +64,28 @@ void PartSet_MenuMgr::addAction(const QString& theId, QAction* theAction)
 
 void PartSet_MenuMgr::createActions()
 {
-  QAction* anAction;
+  QAction* aAction;
+
+  aAction = new QAction(tr("Auxiliary"), this);
+  aAction->setCheckable(true);
+  addAction("AUXILIARY_CMD", aAction);
+
+  aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePart(bool)));
+  myActions["ACTIVATE_PART_CMD"] = aAction;
+
+  aAction = new QAction(QIcon(":icons/deactivate.png"), tr("Deactivate"), this);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool)));
+  myActions["DEACTIVATE_PART_CMD"] = aAction;
+
+  // Activate PartSet
+  aAction = new QAction(QIcon(":icons/activate.png"), tr("Activate"), this);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onActivatePartSet(bool)));
+  myActions["ACTIVATE_PARTSET_CMD"] = aAction;
 
-  anAction = new QAction(tr("Auxiliary"), this);
-  anAction->setCheckable(true);
-  addAction("AUXILIARY_CMD", anAction);
+  aAction = new QAction(QIcon(":icons/edit.png"), tr("Edit..."), this);
+  connect(aAction, SIGNAL(triggered(bool)), this, SLOT(onEdit(bool)));
+  myActions["EDIT_CMD"] = aAction;
 }
 
 
@@ -99,10 +120,6 @@ std::shared_ptr<GeomAPI_Pnt2d> getPoint(std::shared_ptr<ModelAPI_Feature>& theFe
     aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
         aFeature->data()->attribute(SketchPlugin_Point::COORD_ID()));
 
-  else if (aFeature &&  aFeature->getKind() == SketchPlugin_Circle::ID())
-    aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-        aFeature->data()->attribute(SketchPlugin_Circle::CENTER_ID()));
-
   else if (anAttr->attr()) {
     aPointAttr = std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->attr());
   }
@@ -121,6 +138,8 @@ void findCoincidences(FeaturePtr theStartCoin, QList<FeaturePtr>& theList, std::
   FeaturePtr aObj = ModelAPI_Feature::feature(aPnt->object());
   if (!theList.contains(aObj)) {
     std::shared_ptr<GeomAPI_Pnt2d> aOrig = getPoint(theStartCoin, theAttr);
+    if (aOrig.get() == NULL)
+      return;
     theList.append(aObj);
     const std::set<AttributePtr>& aRefsList = aObj->data()->refsToMe();
     std::set<AttributePtr>::const_iterator aIt;
@@ -129,7 +148,7 @@ void findCoincidences(FeaturePtr theStartCoin, QList<FeaturePtr>& theList, std::
       FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
       if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { 
         std::shared_ptr<GeomAPI_Pnt2d> aPnt = getPoint(aConstrFeature, theAttr);
-        if (aOrig->isEqual(aPnt)) {
+        if (aPnt.get() && aOrig->isEqual(aPnt)) {
           findCoincidences(aConstrFeature, theList, SketchPlugin_ConstraintCoincidence::ENTITY_A());
           findCoincidences(aConstrFeature, theList, SketchPlugin_ConstraintCoincidence::ENTITY_B());
         }
@@ -139,7 +158,7 @@ void findCoincidences(FeaturePtr theStartCoin, QList<FeaturePtr>& theList, std::
 }
 
 
-bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const
+bool PartSet_MenuMgr::addViewerMenu(QMenu* theMenu, const QMap<QString, QAction*>& theStdActions) const
 {
   ModuleBase_Operation* anOperation = myModule->workshop()->currentOperation();
   if (!PartSet_SketcherMgr::isSketchOperation(anOperation) &&
@@ -149,36 +168,31 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap<QString, QAction
   myCoinsideLines.clear();
   ModuleBase_ISelection* aSelection = myModule->workshop()->selection();
 
-  NCollection_List<TopoDS_Shape> aShapeList;
-  std::list<ObjectPtr> aObjectsList;
-  aSelection->selectedShapes(aShapeList, aObjectsList);
   bool aIsDetach = false;
-
-  // Check that selected shape is not attribute
-  // if at least a one shape is attribute then we can not add auxiliary item
   bool hasAttribute = false;
-  if (aShapeList.Extent() > 0) {
-    NCollection_List<TopoDS_Shape>::Iterator aIt(aShapeList);
-    std::list<ObjectPtr>::const_iterator aItObj;
-    TopoDS_Shape aShape;
-    ObjectPtr aObj;
-    ResultPtr aResult;
-    for (aItObj = aObjectsList.cbegin(); aIt.More(); aIt.Next(), aItObj++) {
-      aShape = aIt.Value(); 
-      aObj = (*aItObj);
-      aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aObj);
-      if (aResult.get() != NULL) {
-        if (!aShape.IsEqual(aResult->shape()->impl<TopoDS_Shape>())) {
-          hasAttribute = true;
-          break;
-        }
-      }
+  bool hasFeature = false;
+
+  QList<ModuleBase_ViewerPrs> aPrsList = aSelection->getSelected();
+  TopoDS_Shape aShape;
+  ResultPtr aResult;
+  FeaturePtr aFeature;
+  foreach(ModuleBase_ViewerPrs aPrs, aPrsList) {
+    aResult = std::dynamic_pointer_cast<ModelAPI_Result>(aPrs.object());
+    if (aResult.get() != NULL) {
+      aShape = aPrs.shape();
+      if (aShape.IsEqual(aResult->shape()->impl<TopoDS_Shape>()))
+        hasFeature = true;
+      else
+        hasAttribute = true;
+    } else {
+      aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aPrs.object());
+      hasFeature = (aFeature.get() != NULL);
     }
   }
 
-  if (aShapeList.Extent() == 1) {
-    TopoDS_Shape aShape = aShapeList.First();
-    if (aShape.ShapeType() == TopAbs_VERTEX) {
+  if (aPrsList.size() == 1) {
+    TopoDS_Shape aShape = aPrsList.first().shape();
+    if ((!aShape.IsNull()) && aShape.ShapeType() == TopAbs_VERTEX) {
       // Find 2d coordinates
       FeaturePtr aSketchFea = myModule->sketchMgr()->activeSketch();
       if (aSketchFea->getKind() == SketchPlugin_Sketch::ID()) {
@@ -187,7 +201,7 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap<QString, QAction
         std::shared_ptr<GeomAPI_Pnt2d> aSelPnt = PartSet_Tools::convertTo2D(aSketchFea, aPnt3d);
 
         // Find coincident in these coordinates
-        ObjectPtr aObj = aObjectsList.front();
+        ObjectPtr aObj = aPrsList.first().object();
         FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
         const std::set<AttributePtr>& aRefsList = aFeature->data()->refsToMe();
         std::set<AttributePtr>::const_iterator aIt;
@@ -196,11 +210,18 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap<QString, QAction
           std::shared_ptr<ModelAPI_Attribute> aAttr = (*aIt);
           FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
           if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { 
-            std::shared_ptr<GeomAPI_Pnt2d> a2dPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A());
-            if (aSelPnt->isEqual(a2dPnt)) { 
+            std::shared_ptr<GeomAPI_Pnt2d> a2dPnt = 
+              getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A());
+            if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { 
               aCoincident = aConstrFeature;
               break;
-            } 
+            } else {
+              a2dPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_B());
+              if (a2dPnt.get() && aSelPnt->isEqual(a2dPnt)) { 
+                aCoincident = aConstrFeature;
+                break;
+              }
+            }
           }
         }
         // If we have coincidence then add Detach menu
@@ -226,18 +247,8 @@ bool PartSet_MenuMgr::addViewerItems(QMenu* theMenu, const QMap<QString, QAction
       }
     }
   }
-  QObjectPtrList aObjects = aSelection->selectedPresentations();
-  if ((!aIsDetach) && (aObjects.size() > 0)) {
-    bool hasFeature = false;
-    FeaturePtr aFeature;
-    foreach (ObjectPtr aObject, aObjects) {
-      aFeature = ModelAPI_Feature::feature(aObject);
-      if (aFeature.get() != NULL) {
-        hasFeature = true;
-      }
-    }
-    if (hasFeature && (!hasAttribute))
-        theMenu->addAction(theStdActions["DELETE_CMD"]);
+  if ((!aIsDetach) && hasFeature) {
+    theMenu->addAction(theStdActions["DELETE_CMD"]);
   }
   if (hasAttribute)
     return true;
@@ -284,6 +295,9 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction)
   int aId = theAction->data().toInt();
   FeaturePtr aLine = myCoinsideLines.at(aId);
   std::shared_ptr<GeomAPI_Pnt2d> aOrig = getPoint(mySelectedFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A());
+  if (aOrig.get() == NULL)
+    aOrig = getPoint(mySelectedFeature, SketchPlugin_ConstraintCoincidence::ENTITY_B());
+  
   gp_Pnt aOr = aOrig->impl<gp_Pnt>();
   const std::set<AttributePtr>& aRefsList = aLine->data()->refsToMe();
 
@@ -295,6 +309,10 @@ void PartSet_MenuMgr::onLineDetach(QAction* theAction)
     FeaturePtr aConstrFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aAttr->owner());
     if (aConstrFeature->getKind() == SketchPlugin_ConstraintCoincidence::ID()) { 
       std::shared_ptr<GeomAPI_Pnt2d> aPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_A());
+      if (aPnt.get() == NULL)
+        aPnt = getPoint(aConstrFeature, SketchPlugin_ConstraintCoincidence::ENTITY_B());
+      if (aPnt.get() == NULL)
+        return;
       gp_Pnt aP = aPnt->impl<gp_Pnt>();
       if (aOrig->isEqual(aPnt)) {
         aToDelFeatures.append(aConstrFeature);
@@ -391,7 +409,11 @@ void PartSet_MenuMgr::setAuxiliary(const bool isChecked)
   }
   if (isUseTransaction) {
     aMgr->finishOperation();
+    XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(myModule->workshop());
+    XGUI_Workshop* aWorkshop = aConnector->workshop();
+    aWorkshop->updateCommandStatus();
   }
+
   Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED));
   myModule->sketchMgr()->restoreSelection();
 }
@@ -445,3 +467,41 @@ bool PartSet_MenuMgr::canSetAuxiliary(bool& theValue) const
   theValue = anObjects.size() && !isNotAuxiliaryFound;
   return anEnabled;
 }
+
+void PartSet_MenuMgr::onActivatePart(bool)
+{
+  QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects();
+  if (aObjects.size() > 0) {
+    ObjectPtr aObj = aObjects.first();
+    ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+    if (!aPart.get()) {
+      FeaturePtr aPartFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+      if (aPartFeature.get() && (aPartFeature->getKind() == PartSetPlugin_Part::ID())) {
+        aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aPartFeature->firstResult());
+      }
+    }
+    if (aPart.get())
+      aPart->activate();
+  }
+}
+
+void PartSet_MenuMgr::onActivatePartSet(bool)
+{
+  SessionPtr aMgr = ModelAPI_Session::get();
+  aMgr->setActiveDocument(aMgr->moduleDocument());
+}
+
+void PartSet_MenuMgr::onEdit(bool)
+{
+  QObjectPtrList aObjects = myModule->workshop()->selection()->selectedObjects();
+  FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObjects.first());
+  if (aFeature == NULL) {
+    ResultParameterPtr aParam = 
+      std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aObjects.first());
+    if (aParam.get() != NULL) {
+      aFeature = ModelAPI_Feature::feature(aParam);
+    }
+  }
+  if (aFeature.get() != NULL)
+    myModule->editFeature(aFeature);
+}