Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/PartSet/PartSet_Module.cpp

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

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

diff --cc src/PartSet/CMakeLists.txt
index 0300761e69687bea5b337f0eb2ef4dd57707b84e,a50b8cb1f4e6cdce63495d1a653567f3e5d2fcaf..1554472a2eef3d4f0a14f7d6a9154cc5504576ef
--- 1/src/PartSet/CMakeLists.txt
--- 2/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_OperationSketch.h
+       PartSet_OperationSketchBase.h
++    PartSet_OperationSketch.h
  )
  
  SET(PROJECT_SOURCES

diff --cc src/PartSet/PartSet_Module.cpp
index 4c1bcfbde26abe997e67a875f361aa391912331f,7a32a90bbf3d4c11ed9e73e72baa1ffb37b64e04..92cea614c7d0722109798636382b9e090cc2fdcf
--- 1/src/PartSet/PartSet_Module.cpp
--- 2/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);
  }

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

diff --cc src/XGUI/XGUI_Workshop.cpp
Simple merge

diff --cc src/XGUI/XGUI_Workshop.h
Simple merge