From: sbh <sergey.belash@opencascade.com>
Date: Wed, 23 Apr 2014 11:27:48 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom.git
X-Git-Tag: V_0.2~118^2~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=de0f49686ec6655ddc5816c8fa5383964662aec4;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/PartSet/PartSet_Module.cpp
---

de0f49686ec6655ddc5816c8fa5383964662aec4
diff --cc src/PartSet/CMakeLists.txt
index 0300761e6,a50b8cb1f..1554472a2
--- a/src/PartSet/CMakeLists.txt
+++ b/src/PartSet/CMakeLists.txt
@@@ -4,6 -6,8 +6,8 @@@ SET(CMAKE_AUTOMOC ON
  SET(PROJECT_HEADERS
  	PartSet.h
  	PartSet_Module.h
+ 	PartSet_OperationSketchBase.h
 -        PartSet_OperationSketch.h
++    PartSet_OperationSketch.h
  )
  
  SET(PROJECT_SOURCES
diff --cc src/PartSet/PartSet_Module.cpp
index 4c1bcfbde,7a32a90bb..92cea614c
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -63,14 -61,21 +68,22 @@@ 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()));
  
-   ModuleBase_PropPanelOperation* aPartSetOp = new ModuleBase_PropPanelOperation(aCmdId, this);
    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);
  }