From: nds <natalia.donis@opencascade.com>
Date: Wed, 23 Apr 2014 12:27:32 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~132^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aa07c7e0e3410522a1464d1863d1052c96edb7aa;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

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

aa07c7e0e3410522a1464d1863d1052c96edb7aa
diff --cc src/PartSet/PartSet_Module.cpp
index bd136d50e,92cea614c..f82eee4b2
--- a/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/XGUI/XGUI_Workshop.cpp
index f639e1adc,5cdf21db8..3775dc254
--- a/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 4f62bf452,eea91e476..a1c79c0b3
--- a/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();