Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Module.cpp
	src/XGUI/XGUI_Workshop.h

diff --cc src/ModuleBase/ModuleBase_Operation.cpp
Simple merge

diff --cc src/ModuleBase/ModuleBase_Operation.h
Simple merge

diff --cc src/PartSet/PartSet_Module.cpp
index bd136d50ea533957644e26a4acf0ead6b6923f0f,92cea614c7d0722109798636382b9e090cc2fdcf..f82eee4b2249fe239766cb03c221710028381f39
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -67,17 -68,22 +74,18 @@@ void PartSet_Module::onFeatureTriggered
    QString aCmdId = aCmd->id();
    std::string aXmlCfg = aWdgReader.featureWidgetCfg(aCmdId.toStdString());
    std::string aDescription = aWdgReader.featureDescription(aCmdId.toStdString());
-   //TODO(sbh): Implement static method to extract event id [SEID]
-   static Event_ID aModuleEvent = Event_Loop::eventByName("PartSetModuleEvent");
-   Config_PointerMessage aMessage(aModuleEvent, this);
    ModuleBase_PropPanelOperation* aPartSetOp;
-   if (aCmdId == "Sketch" )
+   if (aCmdId == "Sketch" ) {
      aPartSetOp = new PartSet_OperationSketch(aCmdId, this);
-   else
+   } else {
      aPartSetOp = new ModuleBase_PropPanelOperation(aCmdId, this);
- 
+   }
 -  PartSet_OperationSketchBase* aPreviewOp = dynamic_cast<PartSet_OperationSketchBase*>(aPartSetOp);
 -  if (aPreviewOp)
 -    connect(aPreviewOp, SIGNAL(visualizePreview()), this, SLOT(onVisualizePreview()));
 -
    aPartSetOp->setXmlRepresentation(QString::fromStdString(aXmlCfg));
    aPartSetOp->setDescription(QString::fromStdString(aDescription));
+ 
+   //TODO(sbh): Implement static method to extract event id [SEID]
+   static Event_ID aModuleEvent = Event_Loop::eventByName("PartSetModuleEvent");
+   Config_PointerMessage aMessage(aModuleEvent, this);
    aMessage.setPointer(aPartSetOp);
    Event_Loop::loop()->send(aMessage);
  }

diff --cc src/PartSet/PartSet_Module.h
Simple merge

diff --cc src/XGUI/XGUI_Workshop.cpp
index f639e1adca48b2e3694c888dae616b3004a6cafc,5cdf21db84baf4f3758989d8520925a596b6f0d4..3775dc25469f7e44fdbc9ddf7886f5dec1df692a
--- 1/src/XGUI/XGUI_Workshop.cpp
--- 2/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -260,9 -210,9 +262,9 @@@ void XGUI_Workshop::addFeature(const Co
  /*
   *
   */
 -void XGUI_Workshop::fillPropertyPanel(ModuleBase_PropPanelOperation* theOperation)
 +/*void XGUI_Workshop::fillPropertyPanel(ModuleBase_PropPanelOperation* theOperation)
  {
-   connectToPropertyPanel(theOperation);
+   connectWithOperation(theOperation);
    QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
    qDeleteAll(aPropWidget->children());
    theOperation->start();

diff --cc src/XGUI/XGUI_Workshop.h
index 4f62bf452de7a11e254f8ccd3b6ac41c880b9783,eea91e4763edbcf5347889184a8408d7a7e9f8dc..a1c79c0b3ece2d859c9be45fde0d430ab48a3c46
--- 1/src/XGUI/XGUI_Workshop.h
--- 2/src/XGUI/XGUI_Workshop.h
+++ b/src/XGUI/XGUI_Workshop.h
@@@ -72,11 -71,9 +72,11 @@@ public slots
  protected:
    //Event-loop processing methods:
    void addFeature(const Config_FeatureMessage*);
-   void connectToPropertyPanel(ModuleBase_Operation* theOperation);
 -  void fillPropertyPanel(ModuleBase_PropPanelOperation* theOperation);
+   void connectWithOperation(ModuleBase_Operation* theOperation);
 -  void setCurrentOperation(ModuleBase_Operation* theOperation);
 +
 +protected slots:
 +  void onBeforeOperationStart();
 +  void onAfterOperationStart();
  
  private:
    void initMenu();