From: vsv <vitaly.smetannikov@opencascade.com>
Date: Thu, 24 Apr 2014 08:41:40 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~122^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=37bf139347283d16d59b08079d52be5f6f29a38c;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom
---

37bf139347283d16d59b08079d52be5f6f29a38c
diff --cc src/PartSet/PartSet_Module.cpp
index a4e64417b,12cf4971a..2b2a3ddb1
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -84,33 -86,13 +86,13 @@@ void PartSet_Module::onFeatureTriggered
    aPartSetOp->setDescription(QString::fromStdString(aDescription));
  
    //TODO(sbh): Implement static method to extract event id [SEID]
 -  static Event_ID aModuleEvent = Event_Loop::eventByName("PartSetModuleEvent");
 +  static Events_ID aModuleEvent = Events_Loop::eventByName("PartSetModuleEvent");
    Config_PointerMessage aMessage(aModuleEvent, this);
    aMessage.setPointer(aPartSetOp);
 -  Event_Loop::loop()->send(aMessage);
 +  Events_Loop::loop()->send(aMessage);
  }
  
- /**
-  * Slot that is called by the operation requiring of preview display or erase
-  * \param isDisplay the display or erase state
- */
- void PartSet_Module::onVisualizePreview(bool isDisplay)
- {
-   ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
-   if (!anOperation)
-     return;
- 
-   PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(anOperation);
-   if (!aPreviewOp)
-     return;
- 
-   if (isDisplay)
-     myWorkshop->displayer()->Display(anOperation->feature(), aPreviewOp->preview());
-   else
-     myWorkshop->displayer()->Erase(anOperation->feature(), aPreviewOp->preview());
- }
- 
- void PartSet_Module::onBeforeOperationStart()
+ void PartSet_Module::onOperationStarted()
  {
    ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();