From: nds <natalia.donis@opencascade.com>
Date: Fri, 25 Apr 2014 14:00:28 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~116^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=622014f62af50bfd219fb242df168760849e2006;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/PartSet/PartSet_Module.cpp
	src/XGUI/CMakeLists.txt
---

622014f62af50bfd219fb242df168760849e2006
diff --cc src/PartSet/PartSet_Module.cpp
index c76792ca1,1a0e84dd5..ebe70c482
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@@ -79,18 -83,10 +84,18 @@@ void PartSet_Module::launchOperation(co
    std::string aXmlCfg = aWdgReader.featureWidgetCfg(aStdCmdId);
    std::string aDescription = aWdgReader.featureDescription(aStdCmdId);
    ModuleBase_PropPanelOperation* aPartSetOp;
-   if (aCmdId == "Sketch" ) {
-     aPartSetOp = new PartSet_OperationSketch(aCmdId, this);
+   if (theCmdId == "Sketch" ) {
+     aPartSetOp = new PartSet_OperationSketch(theCmdId, this);
 -  } else {
 +  }
 +  else if(aCmdId == "SketchLine") {
 +    ModuleBase_Operation* anOperation = myWorkshop->operationMgr()->currentOperation();
 +    boost::shared_ptr<ModelAPI_Feature> aSketchFeature;
 +    if (anOperation)
 +      aSketchFeature = anOperation->feature();
-     aPartSetOp = new PartSet_OperationSketchLine(aCmdId, this, aSketchFeature);
++    aPartSetOp = new PartSet_OperationSketchLine(theCmdId, this, aSketchFeature);
 +  }
 +  else {
-     aPartSetOp = new ModuleBase_PropPanelOperation(aCmdId, this);
+     aPartSetOp = new ModuleBase_PropPanelOperation(theCmdId, this);
    }
    aPartSetOp->setXmlRepresentation(QString::fromStdString(aXmlCfg));
    aPartSetOp->setDescription(QString::fromStdString(aDescription));
diff --cc src/XGUI/CMakeLists.txt
index 106d695b7,3741d32e6..460458d1a
--- a/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -25,6 -26,8 +25,7 @@@ SET(PROJECT_HEADER
  	XGUI_OperationMgr.h
      XGUI_DataTreeModel.h
      XGUI_SelectionMgr.h
 -    XGUI_SwitchWidget.h
+     XGUI_SalomeConnector.h
  )
  
  SET(PROJECT_AUTOMOC 
diff --cc src/XGUI/XGUI_Workshop.cpp
index 6518d05e7,cbd6239cb..9af73c3df
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@@ -179,17 -200,16 +200,16 @@@ void XGUI_Workshop::onOperationStarted(
    ModuleBase_PropPanelOperation* aOperation =
          (ModuleBase_PropPanelOperation*)(myOperationMgr->currentOperation());
  
-   if(aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
-   } else {
+   if(!aOperation->xmlRepresentation().isEmpty()) { //!< No need for property panel
      connectWithOperation(aOperation);
-     QWidget* aPropWidget = myMainWindow->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
+     QWidget* aPropWidget = myPropertyPanelDock->findChild<QWidget*>(XGUI::PROP_PANEL_WDG);
      qDeleteAll(aPropWidget->children());
  
-     myMainWindow->showPropertyPanel();
+     showPropertyPanel();
  
 -    XGUI_WidgetFactory aFactory = XGUI_WidgetFactory(aOperation);
 +    ModuleBase_WidgetFactory aFactory = ModuleBase_WidgetFactory(aOperation);
      aFactory.createWidget(aPropWidget);
-     myMainWindow->setPropertyPannelTitle(aOperation->description());
+     setPropertyPannelTitle(aOperation->description());
    }
  }