Merge branch 'Dev_2.1.0' of salome:modules/shaper into Dev_2.1.0

[modules/shaper.git] / src / PartSet / PartSet_Module.cpp

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 1f0598bb4a50a5d0f101c174f1ebb67509e874a0..93a81075085ae3b0df0e3d953225b9656e54b8ed 100755 (executable)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -8,7 +8,6 @@
 #include "PartSet_WidgetPoint2dDistance.h"
 #include "PartSet_WidgetPoint2DFlyout.h"
 #include "PartSet_WidgetShapeSelector.h"
-#include "PartSet_WidgetPoint2dAngle.h"
 #include "PartSet_WidgetMultiSelector.h"
 #include "PartSet_WidgetEditor.h"
 #include "PartSet_WidgetFileSelector.h"
@@ -322,10 +321,10 @@ bool PartSet_Module::canRedo() const
 bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const
 {
   bool aValid = true;
-  if (theActionId == "DELETE_CMD" || theActionId == "MOVE_CMD") {
+  if (theActionId == "MOVE_CMD") {
     FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
     if (aFeature) {
-      // part features are removed in the PartSet module only.
+      // part features can not be moved in the history.
       if (aFeature->getKind() == PartSetPlugin_Part::ID())
         aValid = false;
     }
@@ -477,14 +476,7 @@ void PartSet_Module::onOperationActivatedByPreselection()
 {
   if (!mySketchReentrantMgr->canBeCommittedByPreselection())
     return;
-
-  ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
-  if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) {
-    // Set final definitions if they are necessary
-    //propertyPanelDefined(aOperation);
-    /// Commit sketcher operations automatically
-    anOperation->commit();
-  }
+  mySketchMgr->operationActivatedByPreselection();
 }
 
 ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
@@ -519,11 +511,6 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th
                                                         aWorkshop, theWidgetApi, theParentId);
     aDistanceWgt->setSketch(mySketchMgr->activeSketch());
     aWgt = aDistanceWgt;
-  } else if(theType == "point2dangle") {
-    PartSet_WidgetPoint2dAngle* anAngleWgt = new PartSet_WidgetPoint2dAngle(theParent,
-                                                           aWorkshop, theWidgetApi, theParentId);
-    anAngleWgt->setSketch(mySketchMgr->activeSketch());
-    aWgt = anAngleWgt;
   } else if (theType == "sketch_shape_selector") {
     PartSet_WidgetShapeSelector* aShapeSelectorWgt =
       new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi, theParentId);
@@ -564,6 +551,8 @@ ModuleBase_ModelWidget* PartSet_Module::activeWidget() const
 
 bool PartSet_Module::deleteObjects()
 {
+  bool isProcessed = false;
+
   XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
   XGUI_Workshop* aWorkshop = aConnector->workshop();
   XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
@@ -574,6 +563,7 @@ bool PartSet_Module::deleteObjects()
   bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation),
        isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation);
   if (isSketchOp || isNestedOp) {
+    isProcessed = true;
     // 2. find selected presentations
     // selected objects should be collected before the current operation abort because
     // the abort leads to selection lost on constraint objects. It can be corrected after #386 issue
@@ -622,41 +612,7 @@ bool PartSet_Module::deleteObjects()
     // 5. stop operation
     anOpMgr->commitOperation();
   }
-  else {
-    bool isPartRemoved = false;
-    // Delete part with help of PartSet plugin
-    // TODO: the deleted objects has to be processed by multiselection
-    QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects();
-    if (aObjects.size() == 1) {
-      ObjectPtr aObj = aObjects.first();
-      FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
-      if (aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID())) {
-        // Remove feature should be created in the document of the part results
-        ResultPtr aPartResult = aFeature->firstResult();
-        if (aPartResult.get()) {
-          std::shared_ptr<ModelAPI_ResultPart> aPart =
-                       std::dynamic_pointer_cast<ModelAPI_ResultPart>(aPartResult);
-          DocumentPtr aPartDoc = aPart->partDoc();
-          if (aPartDoc.get()) {
-            ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction
-                                              (PartSetPlugin_Remove::ID().c_str(), this);
-            if (!anOpMgr->canStartOperation(anOpAction->id()))
-              return true; // the objects are processed but can not be deleted
-
-            anOpMgr->startOperation(anOpAction);
-
-            FeaturePtr aFeature = aPartDoc->addFeature(PartSetPlugin_Remove::ID());
-            aFeature->execute();
-
-            anOpMgr->commitOperation();
-            isPartRemoved = true;
-          }
-        }
-      }
-    }
-    return isPartRemoved;
-  }
-  return true;
+  return isProcessed;
 }
 
 void PartSet_Module::onFeatureTriggered()
@@ -682,9 +638,11 @@ void PartSet_Module::onFeatureTriggered()
 
 void PartSet_Module::launchOperation(const QString& theCmdId)
 {
+  if (myWorkshop->currentOperation() && 
+      myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID())
+    myHasConstraintShown = mySketchMgr->isConstraintsShown();
   if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) {
     // Show constraints if a constraint was anOperation
-    myHasConstraintShown = mySketchMgr->isConstraintsShown();
     mySketchMgr->onShowConstraintsToggle(true);
   }
   ModuleBase_IModule::launchOperation(theCmdId);