Merge branch 'master' of newgeom:newgeom

Conflicts:
	src/Config/Config_Keywords.h
	src/ModuleBase/ModuleBase_WidgetFactory.cpp
	src/PartSet/PartSet_OperationFeatureCreate.cpp

diff --cc src/Config/Config_Keywords.h
index 08614013bc16061713bbb2c7dc836a8647609862,c9d705d551da19b2980e08176a27197f2ccce6cb..0a3fabcb132de94ca2e1044732058ef77f6788d8
--- 1/src/Config/Config_Keywords.h
--- 2/src/Config/Config_Keywords.h
+++ b/src/Config/Config_Keywords.h
@@@ -31,8 -31,9 +31,10 @@@ const static char* WDG_SELECTOR = "sele
  
  //Specific widget containers
  const static char* WDG_POINT_SELECTOR = "point_selector";
+ const static char* WDG_POINT2D_DISTANCE = "point2ddistance";
+ 
  const static char* WDG_FEATURE_SELECTOR = "feature_selector";
 +const static char* WDG_DOUBLEVALUE_EDITOR = "doublevalue_editor";
  
  const static char* _ID = "id";
  //const static char* WORKBENCH_ID = "id";

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

diff --cc src/ModuleBase/ModuleBase_WidgetFactory.cpp
index e651ba7d362fbf3d8dbba99b07b4bd78fa7493dd,4ce4f79aa40184b58b3acddbef5798f14d557017..0ced5bb8b19d290b6a087414eb838b90d85f2267
--- 1/src/ModuleBase/ModuleBase_WidgetFactory.cpp
--- 2/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@@ -124,8 -124,8 +125,11 @@@ QWidget* ModuleBase_WidgetFactory::crea
    } else if (theType == WDG_FEATURE_SELECTOR) {
      result = featureSelectorControl(theParent);
  
 +  } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
 +    result = doubleValueEditor(theParent);
++  
+   } else if (theType == WDG_POINT2D_DISTANCE) {
+     result = point2dDistanceControl(theParent);
  
    }
    else if (myWidgetApi->isContainerWidget() || myWidgetApi->isPagedWidget()) {

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

diff --cc src/PartSet/PartSet_OperationFeatureCreate.cpp
index bd5529244be6770994993bb8d189a491ff155c3d,afc823140cd60e077c05384086e463c865c87c34..516a308d4ef833b9d0b7ec3c835ea2b2fbe95055
--- 1/src/PartSet/PartSet_OperationFeatureCreate.cpp
--- 2/src/PartSet/PartSet_OperationFeatureCreate.cpp
+++ b/src/PartSet/PartSet_OperationFeatureCreate.cpp
@@@ -53,8 -54,8 +54,8 @@@ PartSet_OperationFeatureCreate::~PartSe
  
  bool PartSet_OperationFeatureCreate::canProcessKind(const std::string& theId)
  {
 -  return theId == SKETCH_LINE_KIND || theId == SKETCH_POINT_KIND /*||
 -         theId == SKETCH_CONSTRAINT_DISTANCE_KIND*/ || theId == SKETCH_CIRCLE_KIND /*||
 +  return theId == SKETCH_LINE_KIND || theId == SKETCH_POINT_KIND ||
-          theId == SKETCH_CONSTRAINT_DISTANCE_KIND/*|| theId == SKETCH_CIRCLE_KIND ||
++         theId == SKETCH_CONSTRAINT_DISTANCE_KIND || theId == SKETCH_CIRCLE_KIND /*||
           theId == SKETCH_ARC_KIND*/;
  }
  

diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge