Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

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

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index d0ee20e792b30185092296442fde6b34280498f4..2e410b5004e723c3f8939230c68020536cd0e098 100644 (file)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -138,6 +138,14 @@ void PartSet_Module::onFeatureTriggered()
 void PartSet_Module::launchOperation(const QString& theCmdId)
 {
   ModuleBase_Operation* anOperation = createOperation(theCmdId.toStdString());
+  //PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
+  //if (aPreviewOp) {
+  //  XGUI_Displayer* aDisplayer = myWorkshop->displayer();
+  //  // Initialise operation with preliminary selection
+  //  std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
+  //  std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
+  //  aPreviewOp->initSelection(aSelected, aHighlighted);
+  //} 
   sendOperation(anOperation);
 }
 
@@ -255,7 +263,8 @@ void PartSet_Module::onLaunchOperation(std::string theName, FeaturePtr theFeatur
     // refill the features list with avoiding of the features, obtained only by vertex shape (TODO)
     std::list<XGUI_ViewerPrs> aSelected = aDisplayer->getSelected();
     std::list<XGUI_ViewerPrs> aHighlighted = aDisplayer->getHighlighted();
-    aPreviewOp->init(theFeature, aSelected, aHighlighted);
+    aPreviewOp->initFeature(theFeature);
+    aPreviewOp->initSelection(aSelected, aHighlighted);
   } else {
     anOperation->setEditingFeature(theFeature);
   }