Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
	src/ModelAPI/CMakeLists.txt
	src/ModuleBase/ModuleBase_WidgetFactory.cpp

diff --cc src/Model/Model_Document.cpp
Simple merge

diff --cc src/ModelAPI/CMakeLists.txt
index 513ddcdefca87d6d94a59b7b45cbd52c31ee0e2a,27df7d5652434ab9fd45e260ccbaec56cd29b51d..249ee64ac25822fe2cac6c51fbe3d0bb99f91797
--- 1/src/ModelAPI/CMakeLists.txt
--- 2/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@@ -68,7 -68,7 +68,8 @@@ SET(PROJECT_SOURCE
      ModelAPI_Session.cpp
      ModelAPI_ShapeValidator.cpp
      ModelAPI_Tools.cpp
 +    ModelAPI_ResultParameter.cpp
+     ModelAPI_AttributeValidator.cpp
  )
  
  SET(PROJECT_LIBRARIES

diff --cc src/ModuleBase/ModuleBase_WidgetFactory.cpp
index eedb3a390759f687d552ed6e15fcbe8a7d0e23aa,6925ee993efa84fad1448ebf86bd84900368af51..c9561a13ba458fddc63d95e139bcaa1c7bc18fb1
--- 1/src/ModuleBase/ModuleBase_WidgetFactory.cpp
--- 2/src/ModuleBase/ModuleBase_WidgetFactory.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetFactory.cpp
@@@ -120,28 -122,34 +120,28 @@@ ModuleBase_ModelWidget* ModuleBase_Widg
  
    if (theType == WDG_INFO) {
      result = new ModuleBase_WidgetLabel(theParent, myWidgetApi, myParentId);
 -
    } else if (theType == WDG_DOUBLEVALUE) {
      result = new ModuleBase_WidgetDoubleValue(theParent, myWidgetApi, myParentId);
 -
    } else if (theType == WDG_SHAPE_SELECTOR) {
 -    result =  new ModuleBase_WidgetShapeSelector(theParent, myWorkshop, myWidgetApi, myParentId);
 -
 +    result = new ModuleBase_WidgetShapeSelector(theParent, myWorkshop, myWidgetApi, myParentId);
    } else if (theType == WDG_BOOLVALUE) {
      result = new ModuleBase_WidgetBoolValue(theParent, myWidgetApi, myParentId);
-   } else if (theType == WDG_DOUBLEVALUE_EDITOR) {
-     result = new ModuleBase_WidgetEditor(theParent, myWidgetApi, myParentId);
 -
++  //} else if (theType == WDG_DOUBLEVALUE_EDITOR) {
++  //  result = new ModuleBase_WidgetEditor(theParent, myWidgetApi, myParentId);
    } else if (theType == WDG_FILE_SELECTOR) {
      result = new ModuleBase_WidgetFileSelector(theParent, myWidgetApi, myParentId);
 -
    } else if (theType == WDG_CHOICE) {
 -    result = new ModuleBase_WidgetChoice(theParent, myWidgetApi,myParentId);
 -
 +    result = new ModuleBase_WidgetChoice(theParent, myWidgetApi, myParentId);
    } else if (theType == WDG_STRINGVALUE) {
 -    result = new ModuleBase_WidgetLineEdit(theParent, myWidgetApi,myParentId);
 -
 +    result = new ModuleBase_WidgetLineEdit(theParent, myWidgetApi, myParentId);
 +  } else if (theType == WDG_EXPR_EDITOR) {
 +    result = new ModuleBase_WidgetExprEditor(theParent, myWidgetApi, myParentId);
    } else if (theType == WDG_MULTISELECTOR) {
 -    result = new ModuleBase_WidgetMultiSelector(theParent, myWorkshop, myWidgetApi,myParentId);
 -
 +    result = new ModuleBase_WidgetMultiSelector(theParent, myWorkshop, myWidgetApi, myParentId);
    } else if (theType == WDG_TOOLBOX) {
      result = new ModuleBase_WidgetToolbox(theParent, myWidgetApi, myParentId);
 -
    } else if (theType == WDG_SWITCH) {
      result = new ModuleBase_WidgetSwitch(theParent, myWidgetApi, myParentId);
 -
    } else if (theType == WDG_TOOLBOX_BOX || theType == WDG_SWITCH_CASE) {
      // Do nothing for "box" and "case"
      result = NULL;