Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
	src/PartSet/PartSet_OperationFeatureBase.cpp

diff --cc src/ModuleBase/CMakeLists.txt
Simple merge

diff --cc src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 36c1efd1a6db36668c5a789ae95eb3bf8e640b72,fa05bba8205e5c013c570722b1c18ea8461a74a2..a5e09fea367af384b75ca16d969b2dc54d200216
--- 1/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
--- 2/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@@ -3,9 -3,8 +3,10 @@@
  // Author:      Vitaly Smetannikov
  
  #include "ModuleBase_WidgetShapeSelector.h"
- #include "ModuleBase_IWorkshop.h"
+ #include <ModuleBase_IWorkshop.h>
 +#include "ModuleBase_WidgetValue.h"
+ #include <ModuleBase_Tools.h>
 +#include "ModuleBase_WidgetValueFeature.h"
  
  #include <Events_Loop.h>
  #include <ModelAPI_Events.h>

diff --cc src/PartSet/PartSet_OperationFeatureBase.cpp
index a3eacd02428ade5b6b93262e7098461eb7eda936,d722998f8419108fd5afebc8793a12a76c2ac4d0..3e0c412ec133c564cd4627bd6e4b633db7f132a5
--- 1/src/PartSet/PartSet_OperationFeatureBase.cpp
--- 2/src/PartSet/PartSet_OperationFeatureBase.cpp
+++ b/src/PartSet/PartSet_OperationFeatureBase.cpp
@@@ -101,12 -113,48 +101,10 @@@ void PartSet_OperationFeatureBase::mous
    commit();
  }
  
- 
- 
 -void PartSet_OperationFeatureBase::onWidgetActivated(ModuleBase_ModelWidget* theWidget)
 +/*bool PartSet_OperationFeatureBase::setWidgetValue(ObjectPtr theFeature, double theX, double theY)
  {
 -  if(myActiveWidget) {
 -    myActiveWidget->setHighlighted(false);
 -  }
 -  if(theWidget) {
 -    theWidget->setHighlighted(true);
 -  }
 -
 -  myActiveWidget = theWidget;
 -  activateByPreselection();
 -  if (myInitFeature && myActiveWidget) {
 -    ModuleBase_WidgetPoint2D* aWgt = dynamic_cast<ModuleBase_WidgetPoint2D*>(myActiveWidget);
 -    if (aWgt && aWgt->initFromPrevious(myInitFeature)) {
 -      myInitFeature = FeaturePtr();
 -      emit activateNextWidget(myActiveWidget);
 -    }
 -  }
 -}
 -
 -void PartSet_OperationFeatureBase::activateByPreselection()
 -{
 -  if ((myPreSelection.size() > 0) && myActiveWidget) {
 -    const ModuleBase_ViewerPrs& aPrs = myPreSelection.front();
 -    ModuleBase_WidgetValueFeature aValue;
 -    aValue.setObject(aPrs.object());
 -    if (myActiveWidget->setValue(&aValue)) {
 -      myPreSelection.remove(aPrs);
 -      if(isValid()) {
 -        myActiveWidget = NULL;
 -        commit();
 -      } else {
 -        emit activateNextWidget(myActiveWidget);
 -      }
 -    }
 -    // If preselection is enough to make a valid feature - apply it immediately
 -  }
 -}
 -
 -bool PartSet_OperationFeatureBase::setWidgetValue(ObjectPtr theFeature, double theX, double theY)
 -{
 -  if (!myActiveWidget)
 +  ModuleBase_ModelWidget* aActiveWgt = myPropertyPanel->activeWidget();
 +  if (!aActiveWgt)
      return false;
    ModuleBase_WidgetValueFeature* aValue = new ModuleBase_WidgetValueFeature();
    aValue->setObject(theFeature);

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