Salome HOME
Rename canAbortOperation on branch Dev_1.1.0 as in 3ef4f71fa94dbd4055244bd7715061b0ea...
[modules/shaper.git] / src / PartSet / PartSet_Module.cpp
index b2f838d1a9a7d72038c3b586a9613c81c4cb8865..26da028d4defbeaad4d903e78c3b957ed78b7948 100644 (file)
@@ -1,61 +1,70 @@
-#include <PartSet_Module.h>
-#include <PartSet_OperationSketch.h>
-#include <PartSet_OperationFeatureCreate.h>
-#include <PartSet_OperationFeatureEditMulti.h>
-#include <PartSet_OperationFeatureEdit.h>
-#include <PartSet_Listener.h>
-#include <PartSet_TestOCC.h>
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+
+#include "PartSet_Module.h"
 #include <PartSet_WidgetSketchLabel.h>
 #include <PartSet_Validators.h>
 #include <PartSet_Tools.h>
+#include <PartSet_WidgetPoint2d.h>
+#include <PartSet_WidgetPoint2dDistance.h>
+#include <PartSet_WidgetShapeSelector.h>
+#include <PartSet_SketcherMgr.h>
 
 #include <ModuleBase_Operation.h>
-#include <ModuleBase_OperationDescription.h>
-#include <ModuleBase_WidgetFactory.h>
-#include <ModuleBase_Operation.h>
+#include <ModuleBase_IViewer.h>
+#include <ModuleBase_IViewWindow.h>
+#include <ModuleBase_IPropertyPanel.h>
+#include <ModuleBase_WidgetEditor.h>
+#include <ModuleBase_FilterFactory.h>
+#include <ModuleBase_FilterLinearEdge.h>
+#include <ModuleBase_FilterFace.h>
+#include <ModuleBase_FilterMulti.h>
+#include <ModuleBase_FilterCustom.h>
+#include <ModuleBase_FilterNoConsructionSubShapes.h>
 
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Events.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Data.h>
+#include <ModelAPI_Session.h>
 
 #include <GeomDataAPI_Point2D.h>
 #include <GeomDataAPI_Point.h>
 #include <GeomDataAPI_Dir.h>
 
-#include <XGUI_MainWindow.h>
 #include <XGUI_Displayer.h>
-#include <XGUI_Viewer.h>
 #include <XGUI_Workshop.h>
 #include <XGUI_OperationMgr.h>
-#include <XGUI_ViewPort.h>
-#include <XGUI_ActionsMgr.h>
-#include <XGUI_ViewerProxy.h>
-#include <XGUI_ContextMenuMgr.h>
 #include <XGUI_PropertyPanel.h>
 #include <XGUI_ModuleConnector.h>
 #include <XGUI_Tools.h>
 
-#include <SketchPlugin_Line.h>
+#include <SketchPlugin_Feature.h>
 #include <SketchPlugin_Sketch.h>
+#include <SketchPlugin_Line.h>
+//#include <SketchPlugin_Arc.h>
+//#include <SketchPlugin_Circle.h>
+#include <SketchPlugin_ConstraintLength.h>
+#include <SketchPlugin_ConstraintDistance.h>
+#include <SketchPlugin_ConstraintParallel.h>
+#include <SketchPlugin_ConstraintPerpendicular.h>
+#include <SketchPlugin_ConstraintRadius.h>
+//#include <SketchPlugin_ConstraintRigid.h>
 
-#include <Config_PointerMessage.h>
-#include <Config_ModuleReader.h>
-#include <Config_WidgetReader.h>
 #include <Events_Loop.h>
-//#include <Events_Message.h>
-//#include <Events_Error.h>
-
-#include <GeomAPI_Shape.h>
-#include <GeomAPI_AISObject.h>
-#include <AIS_Shape.hxx>
-#include <AIS_DimensionSelectionMode.hxx>
 
 #include <StdSelect_TypeOfFace.hxx>
+#include <TopoDS_Vertex.hxx>
+#include <TopoDS.hxx>
+#include <TopoDS_Shape.hxx>
+#include <BRep_Tool.hxx>
 
 #include <QObject>
 #include <QMouseEvent>
 #include <QString>
+#include <QTimer>
+#include <QApplication>
+#include <QMessageBox>
+#include <QMainWindow>
 
 #include <GeomAlgoAPI_FaceBuilder.h>
 #include <GeomDataAPI_Dir.h>
@@ -71,39 +80,34 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop*
 }
 
 PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop)
-  : ModuleBase_IModule(theWshop)
+  : ModuleBase_IModule(theWshop), 
+  myRestartingMode(RM_None)
 {
-  //myWorkshop = theWshop;
-  myListener = new PartSet_Listener(this);
-
-  connect(myWorkshop, SIGNAL(operationStarted(ModuleBase_Operation*)), 
-    this, SLOT(onOperationStarted(ModuleBase_Operation*)));
-
-  connect(myWorkshop, SIGNAL(operationStopped(ModuleBase_Operation*)), this,
-          SLOT(onOperationStopped(ModuleBase_Operation*)));
-
-  XGUI_Workshop* aXWshop = xWorkshop();
-  XGUI_ContextMenuMgr* aContextMenuMgr = aXWshop->contextMenuMgr();
-  connect(aContextMenuMgr, SIGNAL(actionTriggered(const QString&, bool)), this,
-          SLOT(onContextMenuCommand(const QString&, bool)));
-
-  connect(myWorkshop->viewer(), SIGNAL(mousePress(QMouseEvent*)), this,
-          SLOT(onMousePressed(QMouseEvent*)));
-  connect(myWorkshop->viewer(), SIGNAL(mouseRelease(QMouseEvent*)), this,
-          SLOT(onMouseReleased(QMouseEvent*)));
-  connect(myWorkshop->viewer(), SIGNAL(mouseMove(QMouseEvent*)), this,
-          SLOT(onMouseMoved(QMouseEvent*)));
-  connect(myWorkshop->viewer(), SIGNAL(keyRelease(QKeyEvent*)), this,
-          SLOT(onKeyRelease(QKeyEvent*)));
-  connect(myWorkshop->viewer(), SIGNAL(mouseDoubleClick(QMouseEvent*)), this,
-          SLOT(onMouseDoubleClick(QMouseEvent*)));
+  //myWorkshop = dynamic_cast<XGUI_Workshop*>(theWshop);
+  mySketchMgr = new PartSet_SketcherMgr(this);
+
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(theWshop);
+  XGUI_Workshop* aWorkshop = aConnector->workshop();
+
+  XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
+  connect(anOpMgr, SIGNAL(keyEnterReleased()), this, SLOT(onEnterReleased()));
+  connect(anOpMgr, SIGNAL(operationActivatedByPreselection()),
+          this, SLOT(onOperationActivatedByPreselection()));
+
+  ModuleBase_IViewer* aViewer = theWshop->viewer();
+  connect(aViewer, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)),
+          this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*)));
+
+  createActions();
 }
 
 PartSet_Module::~PartSet_Module()
 {
+  if (!myDocumentShapeFilter.IsNull())
+    myDocumentShapeFilter.Nullify();
 }
 
-void PartSet_Module::createFeatures()
+void PartSet_Module::registerValidators()
 {
   //Registering of validators
   SessionPtr aMgr = ModelAPI_Session::get();
@@ -113,495 +117,449 @@ void PartSet_Module::createFeatures()
   aFactory->registerValidator("PartSet_PerpendicularValidator", new PartSet_PerpendicularValidator);
   aFactory->registerValidator("PartSet_ParallelValidator", new PartSet_ParallelValidator);
   aFactory->registerValidator("PartSet_RadiusValidator", new PartSet_RadiusValidator);
-
-  Config_ModuleReader aXMLReader = Config_ModuleReader();
-  aXMLReader.readAll();
-  myFeaturesInFiles = aXMLReader.featuresInFiles();
-}
-
-void PartSet_Module::featureCreated(QAction* theFeature)
-{
-  connect(theFeature, SIGNAL(triggered(bool)), this, SLOT(onFeatureTriggered()));
+  aFactory->registerValidator("PartSet_RigidValidator", new PartSet_RigidValidator);
+  aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator);
+  aFactory->registerValidator("PartSet_SketchValidator", new PartSet_SketchValidator);
 }
 
-std::string PartSet_Module::featureFile(const std::string& theFeatureId)
+void PartSet_Module::registerFilters()
 {
-  return myFeaturesInFiles[theFeatureId];
+  //Registering of selection filters
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+  ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters();
+
+  aFactory->registerFilter("EdgeFilter", new ModuleBase_FilterLinearEdge);
+  aFactory->registerFilter("FaceFilter", new ModuleBase_FilterFace);
+  aFactory->registerFilter("MultiFilter", new ModuleBase_FilterMulti);
+  Handle(SelectMgr_Filter) aSelectFilter = new ModuleBase_FilterNoConsructionSubShapes(workshop());
+  aFactory->registerFilter("NoConstructionSubShapesFilter",
+            new ModuleBase_FilterCustom(aSelectFilter));
 }
 
-/*
- *
- */
-void PartSet_Module::onFeatureTriggered()
+void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) 
 {
-  QAction* aCmd = dynamic_cast<QAction*>(sender());
-  //Do nothing on uncheck
-  if (aCmd->isCheckable() && !aCmd->isChecked())
+  if (theOperation->isEditOperation())
     return;
-  launchOperation(aCmd->data().toString());
+  // the selection is cleared after commit the create operation
+  // in order to do not use the same selected objects in the restarted operation
+  // for common behaviour, the selection is cleared even if the operation is not restarted
+  Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext();
+  if (!aContext.IsNull())
+    aContext->ClearSelected();
+
+  /// Restart sketcher operations automatically
+  FeaturePtr aFeature = theOperation->feature();
+  std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+            std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+  if (aSPFeature && (myRestartingMode == RM_LastFeatureUsed ||
+                     myRestartingMode == RM_EmptyFeatureUsed)) {
+    myLastOperationId = theOperation->id();
+    myLastFeature = myRestartingMode == RM_LastFeatureUsed ? theOperation->feature() : FeaturePtr();
+    
+    launchOperation(myLastOperationId);
+  }
+  breakOperationSequence();
 }
 
-
-void PartSet_Module::onOperationStarted(ModuleBase_Operation* theOperation)
+void PartSet_Module::breakOperationSequence()
 {
-  XGUI_Workshop* aXWshp = xWorkshop();
-  XGUI_Displayer* aDisplayer = aXWshp->displayer();
-  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(theOperation);
-  if (aPreviewOp) {
-    XGUI_PropertyPanel* aPropPanel = aXWshp->propertyPanel();
-    connect(aPropPanel, SIGNAL(storedPoint2D(ObjectPtr, const std::string&)), this,
-            SLOT(onStorePoint2D(ObjectPtr, const std::string&)), Qt::UniqueConnection);
-
-    //aDisplayer->deactivateObjectsOutOfContext();
-    PartSet_OperationSketch* aSketchOp = dynamic_cast<PartSet_OperationSketch*>(aPreviewOp);
-    if (aSketchOp) {
-      if (aSketchOp->isEditOperation()) {
-        setSketchingMode(getSketchPlane(aSketchOp->feature()));
-      } else {
-        aDisplayer->openLocalContext();
-        aDisplayer->activateObjectsOutOfContext(QIntList());
-        myPlaneFilter = new StdSelect_FaceFilter(StdSelect_Plane);
-        aDisplayer->addSelectionFilter(myPlaneFilter);
-        QIntList aModes = sketchSelectionModes(aPreviewOp->feature());
-        aDisplayer->setSelectionModes(aModes);
-      } 
-    }
-  }
+  myLastOperationId = "";
+  myLastFeature = FeaturePtr();
+  myRestartingMode = RM_None;
 }
 
-void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation)
+void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation)
 {
-  if (!theOperation)
-    return;
-  XGUI_Workshop* aXWshp = xWorkshop();
-  XGUI_Displayer* aDisplayer = aXWshp->displayer();
-  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(theOperation);
-  if (aPreviewOp) {
-    XGUI_PropertyPanel* aPropPanel = aXWshp->propertyPanel();
-
-    PartSet_OperationSketch* aSketchOp = dynamic_cast<PartSet_OperationSketch*>(aPreviewOp);
-    if (aSketchOp) {
-      aDisplayer->closeLocalContexts();
-    } else {
-      PartSet_OperationFeatureCreate* aCreationOp = 
-        dynamic_cast<PartSet_OperationFeatureCreate*>(aPreviewOp);
-      if (aCreationOp) {
-        // Activate just created object for selection
-        FeaturePtr aFeature = aCreationOp->feature();
-        QIntList aModes = sketchSelectionModes(aFeature);
-        const std::list<ResultPtr>& aResults = aFeature->results();
-        std::list<ResultPtr>::const_iterator anIt, aLast = aResults.end();
-        for (anIt = aResults.begin(); anIt != aLast; anIt++) {
-          aDisplayer->activate(*anIt, aModes);
-        }
-        aDisplayer->activate(aFeature, aModes);
-      }
-    }
-  }// else {
-    // Activate results of current feature for selection
-    //FeaturePtr aFeature = theOperation->feature();
-    //XGUI_Displayer* aDisplayer = aXWshp->displayer();
-    //std::list<ResultPtr> aResults = aFeature->results();
-    //std::list<ResultPtr>::const_iterator aIt;
-    //for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
-    //  aDisplayer->activate(*aIt);
-    //}    
-  //}
+  breakOperationSequence();
 }
 
-void PartSet_Module::onContextMenuCommand(const QString& theId, bool isChecked)
+void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation)
 {
-  QList<ObjectPtr> aFeatures = workshop()->selection()->selectedObjects();
-  if (theId == "EDIT_CMD" && (aFeatures.size() > 0)) {
-    FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(aFeatures.first());
-    if (aFeature)
-      editFeature(aFeature);
+  if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) {
+    mySketchMgr->startSketch(theOperation);
   }
+  if (myDocumentShapeFilter.IsNull())
+    myDocumentShapeFilter = new PartSet_GlobalFilter(myWorkshop);
+  myWorkshop->viewer()->addSelectionFilter(myDocumentShapeFilter);
 }
 
-void PartSet_Module::onMousePressed(QMouseEvent* theEvent)
+void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation)
 {
-  XGUI_Workshop* aXWshp = xWorkshop();
-  PartSet_OperationSketchBase* aPreviewOp = 
-    dynamic_cast<PartSet_OperationSketchBase*>(workshop()->currentOperation());
-  Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
-  if (aPreviewOp && (!aView.IsNull())) {
-    ModuleBase_ISelection* aSelection = workshop()->selection();
-    // Initialise operation with preliminary selection
-    std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
-    std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
-
-    aPreviewOp->mousePressed(theEvent, aView, aSelected, aHighlighted);
+  if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) {
+    mySketchMgr->stopSketch(theOperation);
   }
+  myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter);
 }
 
-void PartSet_Module::onMouseReleased(QMouseEvent* theEvent)
+bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const
 {
-  PartSet_OperationSketchBase* aPreviewOp = 
-    dynamic_cast<PartSet_OperationSketchBase*>(myWorkshop->currentOperation());
-  Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
-  if (aPreviewOp && (!aView.IsNull())) {
-    ModuleBase_ISelection* aSelection = workshop()->selection();
-    // Initialise operation with preliminary selection
-    std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
-    std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
-
-    aPreviewOp->mouseReleased(theEvent, aView, aSelected, aHighlighted);
+  bool aCanDisplay = false;
+  if (mySketchMgr->activeSketch()) {
+    FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
+
+    if (aFeature.get() != NULL) {
+      if (aFeature == mySketchMgr->activeSketch()) {
+        aCanDisplay = false;
+      }
+      else {
+        aCanDisplay = mySketchMgr->sketchOperationIdList().contains(aFeature->getKind().c_str());
+      }
+    }
   }
-}
+  else {
+    aCanDisplay = ModuleBase_IModule::canDisplayObject(theObject);
+  }
+  return aCanDisplay;
 
-void PartSet_Module::onMouseMoved(QMouseEvent* theEvent)
+void PartSet_Module::addViewerItems(QMenu* theMenu) const
 {
-  PartSet_OperationSketchBase* aPreviewOp = 
-    dynamic_cast<PartSet_OperationSketchBase*>(myWorkshop->currentOperation());
-  Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
-  if (aPreviewOp && (!aView.IsNull()))
-    aPreviewOp->mouseMoved(theEvent, aView);
+  if (!isSketchOperationActive() && !isSketchFeatureOperationActive())
+    return;
+  ModuleBase_ISelection* aSelection = myWorkshop->selection();
+  QObjectPtrList aObjects = aSelection->selectedPresentations();
+  if (aObjects.size() > 0) {
+    bool hasFeature = false;
+    foreach(ObjectPtr aObject, aObjects)
+    {
+      FeaturePtr aFeature = ModelAPI_Feature::feature(aObject);
+      if (aFeature.get() != NULL) {
+        hasFeature = true;
+      }
+    }
+    if (hasFeature)
+      theMenu->addAction(action("DELETE_PARTSET_CMD"));
+  }
 }
 
-void PartSet_Module::onKeyRelease(QKeyEvent* theEvent)
+void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation)
 {
-  ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
-  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
-  if (aPreviewOp) {
-    aPreviewOp->keyReleased(theEvent->key());
+  ModuleBase_IPropertyPanel* aPanel = theOperation->propertyPanel();
+  if ((theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) && 
+    (theOperation->isEditOperation())) {
+    // we have to manually activate the sketch label in edit mode
+      aPanel->activateWidget(aPanel->modelWidgets().first());
+      return;
   }
-}
 
-void PartSet_Module::onMouseDoubleClick(QMouseEvent* theEvent)
-{
-  PartSet_OperationSketchBase* aPreviewOp = 
-    dynamic_cast<PartSet_OperationSketchBase*>(myWorkshop->currentOperation());
-  Handle(V3d_View) aView = myWorkshop->viewer()->activeView();
-  if (aPreviewOp && (!aView.IsNull())) {
-    ModuleBase_ISelection* aSelection = workshop()->selection();
-    // Initialise operation with preliminary selection
-    std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
-    std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
-    aPreviewOp->mouseDoubleClick(theEvent, aView, aSelected, aHighlighted);
+  // Restart last operation type 
+  if ((theOperation->id() == myLastOperationId) && myLastFeature) {
+    ModuleBase_ModelWidget* aWgt = aPanel->activeWidget();
+    if (theOperation->id().toStdString() == SketchPlugin_Line::ID()) {
+      // Initialise new line with first point equal to end of previous
+      PartSet_WidgetPoint2D* aPnt2dWgt = dynamic_cast<PartSet_WidgetPoint2D*>(aWgt);
+      if (aPnt2dWgt) {
+        std::shared_ptr<ModelAPI_Data> aData = myLastFeature->data();
+        std::shared_ptr<GeomDataAPI_Point2D> aPoint = 
+          std::dynamic_pointer_cast<GeomDataAPI_Point2D>(aData->attribute(SketchPlugin_Line::END_ID()));
+        if (aPoint) {
+          aPnt2dWgt->setPoint(aPoint->x(), aPoint->y());
+          PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), theOperation->feature(), 
+            aWgt->attributeID(), aPoint->x(), aPoint->y());
+          aPanel->activateNextWidget(aPnt2dWgt);
+        }
+      }
+    }
+  } else {
+    // Start editing constraint
+    if (theOperation->isEditOperation()) {
+      // TODO: #391 - to be removed
+      std::string aId = theOperation->id().toStdString();
+      if (PartSet_SketcherMgr::sketchOperationIdList().contains(QString(aId.c_str()))) {
+        if ((aId == SketchPlugin_ConstraintRadius::ID()) ||
+            (aId == SketchPlugin_ConstraintLength::ID()) || 
+            (aId == SketchPlugin_ConstraintDistance::ID())) {
+          // Find and activate widget for management of point for dimension line position
+          QList<ModuleBase_ModelWidget*> aWidgets = aPanel->modelWidgets();
+          foreach (ModuleBase_ModelWidget* aWgt, aWidgets) {
+            PartSet_WidgetPoint2D* aPntWgt = dynamic_cast<PartSet_WidgetPoint2D*>(aWgt);
+            if (aPntWgt) {
+              aPanel->activateWidget(aPntWgt);
+              return;
+            }
+          }
+        } 
+      }
+    }
   }
 }
 
-void PartSet_Module::onPlaneSelected(double theX, double theY, double theZ)
-{
-  myWorkshop->viewer()->setViewProjection(theX, theY, theZ);
-  xWorkshop()->actionsMgr()->update();
-  // Set working plane
-  ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
-  FeaturePtr aSketch = anOperation->feature();
-  setSketchingMode(getSketchPlane(aSketch));
-}
 
-void PartSet_Module::onFitAllView()
+void PartSet_Module::onSelectionChanged()
 {
-  myWorkshop->viewer()->fitAll();
-}
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if (!aOperation)
+    return;
 
-void PartSet_Module::onRestartOperation(std::string theName, ObjectPtr theObject)
-{
-  FeaturePtr aFeature = ModelAPI_Feature::feature(theObject);
-
-  std::string aKind = aFeature ? aFeature->getKind() : "";
-  ModuleBase_Operation* anOperation = createOperation(theName, aKind);
-
-  PartSet_OperationSketchBase* aSketchOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
-  if (aSketchOp) {
-    PartSet_OperationFeatureCreate* aCreateOp = dynamic_cast<PartSet_OperationFeatureCreate*>(anOperation);
-    if (aCreateOp)
-      aCreateOp->initFeature(aFeature);
-    else {
-      anOperation->setFeature(aFeature);
+  bool isSketcherOp = false;
+  // An edit operation is enable only if the current opeation is the sketch operation
+  if (mySketchMgr->activeSketch()) {
+    if (PartSet_Tools::sketchPlane(mySketchMgr->activeSketch()))
+      isSketcherOp = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID());
+  }
+  if (isSketcherOp) {
+    // Editing of constraints can be done on selection
+    ModuleBase_ISelection* aSelect = myWorkshop->selection();
+    QList<ModuleBase_ViewerPrs> aSelected = aSelect->getSelected();
+    if (aSelected.size() == 1) {
+      ModuleBase_ViewerPrs aPrs = aSelected.first();
+      ObjectPtr aObject = aPrs.object();
+      FeaturePtr aFeature = ModelAPI_Feature::feature(aObject);
+      if (aFeature) {
+        std::string aId = aFeature->getKind();
+        if ((aId == SketchPlugin_ConstraintRadius::ID()) ||
+            (aId == SketchPlugin_ConstraintLength::ID()) || 
+            (aId == SketchPlugin_ConstraintDistance::ID())) {
+          editFeature(aFeature);
+        }
+      }
     }
-    ModuleBase_ISelection* aSelection = workshop()->selection();
-    // Initialise operation with preliminary selection
-    std::list<ModuleBase_ViewerPrs> aSelected = aSelection->getSelected();
-    std::list<ModuleBase_ViewerPrs> aHighlighted = aSelection->getHighlighted();
-    aSketchOp->initSelection(aSelected, aHighlighted);
-  } //else if (aFeature) {
-    //anOperation->setFeature(aFeature);
-    ////Deactivate result of current feature in order to avoid its selection
-    //XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-    //std::list<ResultPtr> aResults = aFeature->results();
-    //std::list<ResultPtr>::const_iterator aIt;
-    //for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt) {
-    //  aDisplayer->deactivate(*aIt);
-    //}
-  //}
-  sendOperation(anOperation);
-  xWorkshop()->actionsMgr()->updateCheckState();
+  } 
 }
 
-void PartSet_Module::onMultiSelectionEnabled(bool theEnabled)
+void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent)
 {
-  ModuleBase_IViewer* aViewer = myWorkshop->viewer();
-  aViewer->enableMultiselection(theEnabled);
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+  XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr();
+  anOpMgr->onKeyReleased(theEvent);
 }
 
-void PartSet_Module::onStopSelection(const QList<ObjectPtr>& theFeatures, const bool isStop)
+void PartSet_Module::onEnterReleased()
 {
-  XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-  //if (!isStop) {
-  //  foreach(ObjectPtr aObject, theFeatures) {
-  //    activateFeature(aObject);
-  //  }
-  //}
-  aDisplayer->stopSelection(theFeatures, isStop, false);
-
-  ModuleBase_IViewer* aViewer = myWorkshop->viewer();
-  aViewer->enableSelection(!isStop);
-
-  aDisplayer->updateViewer();
+  myRestartingMode = RM_EmptyFeatureUsed;
 }
 
-void PartSet_Module::onSetSelection(const QList<ObjectPtr>& theFeatures)
+void PartSet_Module::onOperationActivatedByPreselection()
 {
-  XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-  aDisplayer->setSelected(theFeatures, false);
-  aDisplayer->updateViewer();
-}
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if(aOperation && isSketchFeatureOperationActive()) {
+    // Set final definitions if they are necessary
+    //propertyPanelDefined(aOperation);
 
-void PartSet_Module::setSketchingMode(const gp_Pln& thePln)
-{
-  XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-  if (!myPlaneFilter.IsNull()) {
-    aDisplayer->removeSelectionFilter(myPlaneFilter);
-    myPlaneFilter.Nullify();
+    /// Commit sketcher operations automatically
+    aOperation->commit();
   }
-  QIntList aModes;
-  // Clear standard selection modes
-  aDisplayer->setSelectionModes(aModes);
-  aDisplayer->openLocalContext();
-  // Get default selection modes
-  aModes = sketchSelectionModes(ObjectPtr());
-  aDisplayer->activateObjectsOutOfContext(aModes);
-
-  // Set filter
-  mySketchFilter = new ModuleBase_ShapeInPlaneFilter(thePln);
-  aDisplayer->addSelectionFilter(mySketchFilter);
 }
 
-void PartSet_Module::onFeatureConstructed(ObjectPtr theFeature, int theMode)
+void PartSet_Module::onNoMoreWidgets()
 {
-  bool isDisplay = theMode != PartSet_OperationSketchBase::FM_Hide;
-  ModuleBase_Operation* aCurOperation = myWorkshop->currentOperation();
-  PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
-  if (aPrevOp) {
-    std::list<FeaturePtr> aList = aPrevOp->subFeatures();
-    XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-    QIntList aModes = sketchSelectionModes(aPrevOp->feature());
-    std::list<FeaturePtr>::iterator aSFIt;
-    for (aSFIt = aList.begin(); aSFIt != aList.end(); ++aSFIt) {
-      std::list<ResultPtr> aResults = (*aSFIt)->results();
-      std::list<ResultPtr>::iterator aIt;
-      for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) {
-        if (!isDisplay)
-          aDisplayer->erase((*aIt), false);
-      }
-      if (!isDisplay)
-        aDisplayer->erase((*aSFIt), false);
+  if (isSketchFeatureOperationActive()) {
+    ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+    if (aOperation) {
+      if (myRestartingMode != RM_Forbided)
+        myRestartingMode = RM_LastFeatureUsed;
+      aOperation->commit();
     }
-    //aDisplayer->deactivateObjectsOutOfContext();
   }
-  if (isDisplay)
-    ModelAPI_EventCreator::get()->sendUpdated(
-        theFeature, Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY));
 }
 
-ModuleBase_Operation* PartSet_Module::createOperation(const std::string& theCmdId,
-                                                      const std::string& theFeatureKind)
+void PartSet_Module::onVertexSelected()
 {
-  // create the operation
-  ModuleBase_Operation* anOperation = 0;
-  if (theCmdId == PartSet_OperationSketch::Type()) {
-    anOperation = new PartSet_OperationSketch(theCmdId.c_str(), this);
-  } else {
-    ModuleBase_Operation* aCurOperation = myWorkshop->currentOperation();
-    CompositeFeaturePtr aSketch;
-    PartSet_OperationSketchBase* aPrevOp = dynamic_cast<PartSet_OperationSketchBase*>(aCurOperation);
-    if (aPrevOp) {
-      aSketch = aPrevOp->sketch();
-    }
-    if (PartSet_OperationFeatureCreate::canProcessKind(theCmdId)) {
-      anOperation = new PartSet_OperationFeatureCreate(theCmdId.c_str(), this, aSketch);
-    } else if (theCmdId == PartSet_OperationFeatureEditMulti::Type()) {
-      anOperation = new PartSet_OperationFeatureEditMulti(theCmdId.c_str(), this, aSketch);
-    } else if (theCmdId == PartSet_OperationFeatureEdit::Type()) {
-      anOperation = new PartSet_OperationFeatureEdit(theCmdId.c_str(), this, aSketch);
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if (aOperation->id().toStdString() == SketchPlugin_Line::ID()) {
+    /// If last line finished on vertex the lines creation sequence has to be break
+    ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel();
+    const QList<ModuleBase_ModelWidget*>& aWidgets = aPanel->modelWidgets();
+    if (aWidgets.last() == aPanel->activeWidget()) {
+      myRestartingMode = RM_Forbided;
     }
   }
+}
 
-  if (!anOperation) {
-    anOperation = new ModuleBase_Operation(theCmdId.c_str(), this);
-  }
+QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
+                                            Config_WidgetAPI* theWidgetApi, std::string theParentId,
+                                            QList<ModuleBase_ModelWidget*>& theModelWidgets)
+{
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+  XGUI_Workshop* aWorkshop = aConnector->workshop();
+  if (theType == "sketch-start-label") {
+    PartSet_WidgetSketchLabel* aWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, theParentId);
+    aWgt->setWorkshop(aWorkshop);
+    connect(aWgt, SIGNAL(planeSelected(const std::shared_ptr<GeomAPI_Pln>&)), 
+      mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr<GeomAPI_Pln>&)));
+    theModelWidgets.append(aWgt);
+    return aWgt->getControl();
 
-  // set operation description and list of widgets corresponding to the feature xml definition
-  std::string aFeatureKind = theFeatureKind.empty() ? theCmdId : theFeatureKind;
-
-  std::string aPluginFileName = featureFile(aFeatureKind);
-  Config_WidgetReader aWdgReader = Config_WidgetReader(aPluginFileName);
-  aWdgReader.readAll();
-  std::string aXmlCfg = aWdgReader.featureWidgetCfg(aFeatureKind);
-  std::string aDescription = aWdgReader.featureDescription(aFeatureKind);
-
-  anOperation->getDescription()->setDescription(QString::fromStdString(aDescription));
-  anOperation->getDescription()->setXmlRepresentation(QString::fromStdString(aXmlCfg));
-
-  // connect the operation
-  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
-  if (aPreviewOp) {
-    connect(aPreviewOp, SIGNAL(featureConstructed(ObjectPtr, int)), this,
-            SLOT(onFeatureConstructed(ObjectPtr, int)));
-    connect(aPreviewOp, SIGNAL(restartRequired(std::string, ObjectPtr)), this,
-            SLOT(onRestartOperation(std::string, ObjectPtr)));
-    connect(aPreviewOp, SIGNAL(multiSelectionEnabled(bool)), this,
-            SLOT(onMultiSelectionEnabled(bool)));
-
-    connect(aPreviewOp, SIGNAL(stopSelection(const QList<ObjectPtr>&, const bool)), this,
-            SLOT(onStopSelection(const QList<ObjectPtr>&, const bool)));
-    connect(aPreviewOp, SIGNAL(setSelection(const QList<ObjectPtr>&)), this,
-            SLOT(onSetSelection(const QList<ObjectPtr>&)));
-
-    PartSet_OperationSketch* aSketchOp = dynamic_cast<PartSet_OperationSketch*>(aPreviewOp);
-    if (aSketchOp) {
-      connect(aSketchOp, SIGNAL(planeSelected(double, double, double)), this,
-              SLOT(onPlaneSelected(double, double, double)));
-      connect(aSketchOp, SIGNAL(fitAllView()), this, SLOT(onFitAllView()));
-    }
-  }
+  } else if (theType == "sketch-2dpoint_selector") {
+    PartSet_WidgetPoint2D* aWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId);
+    aWgt->setWorkshop(aWorkshop);
+    aWgt->setSketch(mySketchMgr->activeSketch());
 
-  return anOperation;
-}
+    connect(aWgt, SIGNAL(vertexSelected()), this, SLOT(onVertexSelected()));
 
+    theModelWidgets.append(aWgt);
+    return aWgt->getControl();
 
-void PartSet_Module::updateCurrentPreview(const std::string& theCmdId)
-{
-  ModuleBase_Operation* anOperation = myWorkshop->currentOperation();
-  if (!anOperation)
-    return;
+  } if (theType == "point2ddistance") {
+    PartSet_WidgetPoint2dDistance* aWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId);
+    aWgt->setWorkshop(aWorkshop);
+    aWgt->setSketch(mySketchMgr->activeSketch());
 
-  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
-  if (!aPreviewOp)
-    return;
+    theModelWidgets.append(aWgt);
+    return aWgt->getControl();
 
-  FeaturePtr aFeature = aPreviewOp->feature();
-  if (!aFeature || aFeature->getKind() != theCmdId)
-    return;
+  } if (theType == "sketch_shape_selector") {
+    PartSet_WidgetShapeSelector* aWgt = 
+      new PartSet_WidgetShapeSelector(theParent, workshop(), theWidgetApi, theParentId);
+    aWgt->setSketcher(mySketchMgr->activeSketch());
 
-  XGUI_Displayer* aDisplayer = xWorkshop()->displayer();
-  // Hide result of sketch
-  std::list<ResultPtr> aResults = aFeature->results();
-  std::list<ResultPtr>::const_iterator aIt;
-  for (aIt = aResults.cbegin(); aIt != aResults.cend(); ++aIt)
-    aDisplayer->erase(*aIt, false);
+    theModelWidgets.append(aWgt);
+    return aWgt->getControl();
 
-  std::list<FeaturePtr> aList = aPreviewOp->subFeatures();
+  } if (theType == "sketch_constraint_shape_selector") {
+    PartSet_WidgetConstraintShapeSelector* aWgt = 
+      new PartSet_WidgetConstraintShapeSelector(theParent, workshop(), theWidgetApi, theParentId);
+    aWgt->setSketcher(mySketchMgr->activeSketch());
 
-  std::list<FeaturePtr>::const_iterator anIt = aList.begin(), aLast = aList.end();
-  for (; anIt != aLast; anIt++) {
-    boost::shared_ptr<SketchPlugin_Feature> aSPFeature = boost::dynamic_pointer_cast<
-        SketchPlugin_Feature>(*anIt);
-    if (!aSPFeature)
-      continue;
-    std::list<ResultPtr> aResults = aSPFeature->results();
-    std::list<ResultPtr>::const_iterator aRIt;
-    for (aRIt = aResults.cbegin(); aRIt != aResults.cend(); ++aRIt) {
-      aDisplayer->display((*aRIt), false);
-      aDisplayer->activate((*aRIt), sketchSelectionModes((*aRIt)));
-    }
-    aDisplayer->display(aSPFeature, false);
-    aDisplayer->activate(aSPFeature, sketchSelectionModes(aSPFeature));
-  }
-  aDisplayer->updateViewer();
+    theModelWidgets.append(aWgt);
+    return aWgt->getControl();
+
+  } else
+    return 0;
 }
 
-void PartSet_Module::editFeature(FeaturePtr theFeature)
+bool PartSet_Module::isSketchOperationActive() const
 {
-  if (!theFeature)
-    return;
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
 
-//  if (theFeature->getKind() == SKETCH_KIND) {
-  //FeaturePtr aFeature = theFeature;
-  //if (XGUI_Tools::isModelObject(aFeature)) {
-  //  ObjectPtr aObject = boost::dynamic_pointer_cast<ModelAPI_Object>(aFeature);
-  //  aFeature = aObject->featureRef();
-  //}
-
-  //if (aFeature) {
-  onRestartOperation(theFeature->getKind(), theFeature);
-  updateCurrentPreview(theFeature->getKind());
-  //}
-//  }
+  bool isSketchOp = aOperation && aOperation->id().toStdString() == SketchPlugin_Sketch::ID();
+  return isSketchOp;
 }
 
-void PartSet_Module::onStorePoint2D(ObjectPtr theFeature, const std::string& theAttribute)
+bool PartSet_Module::isSketchFeatureOperationActive() const
 {
-  FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theFeature);
-
-  PartSet_OperationSketchBase* aPreviewOp = 
-    dynamic_cast<PartSet_OperationSketchBase*>(myWorkshop->currentOperation());
-  if (!aPreviewOp)
-    return;
-
-  boost::shared_ptr<GeomDataAPI_Point2D> aPoint = boost::dynamic_pointer_cast<GeomDataAPI_Point2D>(
-      aFeature->data()->attribute(theAttribute));
+  bool isCurrentSketchOp = false;
+  ModuleBase_Operation* aOperation = myWorkshop->currentOperation();
+  if (aOperation) {
+    FeaturePtr aFeature = aOperation->feature();
+    std::shared_ptr<SketchPlugin_Feature> aSPFeature = 
+              std::dynamic_pointer_cast<SketchPlugin_Feature>(aFeature);
+    isCurrentSketchOp = aSPFeature.get() != NULL;
+  }
+  return isCurrentSketchOp;
+}
 
-  PartSet_Tools::setConstraints(aPreviewOp->sketch(), aFeature, theAttribute, aPoint->x(),
-                                aPoint->y());
+void PartSet_Module::createActions()
+{
+  QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this);
+  addAction("DELETE_PARTSET_CMD", aAction);
 }
 
-QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent,
-                                            Config_WidgetAPI* theWidgetApi,
-                                            QList<ModuleBase_ModelWidget*>& theModelWidgets)
+QAction* PartSet_Module::action(const QString& theId) const
 {
-  if (theType == "sketch-start-label") {
-    PartSet_WidgetSketchLabel* aWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, "");
-    aWgt->setOperationsMgr(xWorkshop()->operationMgr());
-    theModelWidgets.append(aWgt);
-    return aWgt->getControl();
-  } else
-    return 0;
+  if (myActions.contains(theId))
+    return myActions[theId];
+  return 0;
 }
 
+void PartSet_Module::addAction(const QString& theId, QAction* theAction)
+{
+  if (myActions.contains(theId))
+    qCritical("A command with Id = '%s' already defined!", qPrintable(theId));
+  theAction->setData(theId);
+  connect(theAction, SIGNAL(triggered(bool)), this, SLOT(onAction(bool)));
+  myActions[theId] = theAction;
+}
 
-XGUI_Workshop* PartSet_Module::xWorkshop() const
+void PartSet_Module::onAction(bool isChecked)
 {
-  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
-  if (aConnector) {
-    return aConnector->workshop();
+  QAction* aAction = static_cast<QAction*>(sender());
+  QString anId = aAction->data().toString();
+
+  if (anId == "DELETE_PARTSET_CMD") {
+    deleteObjects();
   }
-  return 0;
 }
 
-
-QIntList PartSet_Module::sketchSelectionModes(ObjectPtr theFeature)
+void PartSet_Module::deleteObjects()
 {
-  QIntList aModes;
-  FeaturePtr aFeature = boost::dynamic_pointer_cast<ModelAPI_Feature>(theFeature);
-  if (aFeature) {
-    if (aFeature->getKind() == SketchPlugin_Sketch::ID()) {
-      aModes.append(TopAbs_FACE);
-      return aModes;
-    } else if (PartSet_Tools::isConstraintFeature(aFeature->getKind())) {
-      aModes.append(AIS_DSM_Text);
-      aModes.append(AIS_DSM_Line);
-      return aModes;
+  bool isSketchOp = isSketchOperationActive();
+  if (!isSketchOp && !isSketchFeatureOperationActive())
+    return;
+
+  XGUI_ModuleConnector* aConnector = dynamic_cast<XGUI_ModuleConnector*>(workshop());
+  XGUI_Workshop* aWorkshop = aConnector->workshop();
+
+  XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr();
+  if (!isSketchOp && anOpMgr->canStopOperation()) {
+    ModuleBase_Operation* aCurrentOp = anOpMgr->currentOperation();
+    if (aCurrentOp) {
+      aCurrentOp->abort();
     }
-  } 
-  aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_VERTEX));
-  aModes.append(AIS_Shape::SelectionMode((TopAbs_ShapeEnum) TopAbs_EDGE));
-  return aModes;
-}
+  }
+  // sketch feature should be skipped, only sub-features can be removed
+  // when sketch operation is active
+  CompositeFeaturePtr aSketch = mySketchMgr->activeSketch();
+
+  ModuleBase_ISelection* aSel = aConnector->selection();
+  QObjectPtrList aSelectedObj = aSel->selectedPresentations();
+
+  std::set<FeaturePtr> aRefFeatures;
+  foreach (ObjectPtr aObj, aSelectedObj)
+  {
+    //ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+    //if (aPart) {
+      // TODO: check for what there is this condition. It is placed here historicaly because
+      // ther is this condition during remove features.
+    //} else {
+    FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+    if (aFeature.get() != NULL) {
+      aObj->document()->refsToFeature(aFeature, aRefFeatures, false);
+    }
+    //}
+  }
 
+  if (!aRefFeatures.empty()) {
+    QStringList aRefNames;
+    std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
+                                         aLast = aRefFeatures.end();
+    for (; anIt != aLast; anIt++) {
+      FeaturePtr aFeature = (*anIt);
+      if (aFeature == aSketch)
+        continue;
+      aRefNames.append((*anIt)->name().c_str());
+    }
+    if (!aRefNames.empty()) {
+      QString aNames = aRefNames.join(", ");
+
+      QMainWindow* aDesktop = aWorkshop->desktop();
+      QMessageBox::StandardButton aRes = QMessageBox::warning(
+          aDesktop, tr("Delete features"),
+          QString(tr("Selected features are used in the following features: %1.\
+  These features will be deleted also. Would you like to continue?")).arg(aNames),
+          QMessageBox::No | QMessageBox::Yes, QMessageBox::No);
+      if (aRes != QMessageBox::Yes)
+        return;
+    }
+  }
 
-gp_Pln PartSet_Module::getSketchPlane(FeaturePtr theSketch) const
-{
-  DataPtr aData = theSketch->data();
-  boost::shared_ptr<GeomDataAPI_Point> anOrigin = boost::dynamic_pointer_cast<GeomDataAPI_Point>(
-      aData->attribute(SketchPlugin_Sketch::ORIGIN_ID()));
-  boost::shared_ptr<GeomDataAPI_Dir> aNorm = boost::dynamic_pointer_cast<GeomDataAPI_Dir>(
-      aData->attribute(SketchPlugin_Sketch::NORM_ID()));
-  gp_Pnt aOrig(anOrigin->x(), anOrigin->y(), anOrigin->z());
-  gp_Dir aDir(aNorm->x(), aNorm->y(), aNorm->z());
-  return gp_Pln(aOrig, aDir);
-}
+  SessionPtr aMgr = ModelAPI_Session::get();
+  aMgr->startOperation();
+  std::set<FeaturePtr>::const_iterator anIt = aRefFeatures.begin(),
+                                       aLast = aRefFeatures.end();
+  for (; anIt != aLast; anIt++) {
+    FeaturePtr aRefFeature = (*anIt);
+    if (aRefFeature == aSketch)
+      continue;
+    aRefFeature->document()->removeFeature(aRefFeature);
+  }
 
+  foreach (ObjectPtr aObj, aSelectedObj)
+  {
+    DocumentPtr aDoc = aObj->document();
+    //ResultPartPtr aPart = std::dynamic_pointer_cast<ModelAPI_ResultPart>(aObj);
+    //if (aPart) {
+    //  if (aDoc == aMgr->activeDocument()) {
+    //    aDoc->close();
+    //  }
+    //} else {
+      //FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(aObj);
+    FeaturePtr aFeature = ModelAPI_Feature::feature(aObj);
+    if (aFeature.get() != NULL) {
+      aDoc->removeFeature(aFeature);
+    }
+    //}
+  }
+  aWorkshop->displayer()->updateViewer();
+  //myDisplayer->updateViewer();
+  aMgr->finishOperation();
+}