From: sbh <sergey.belash@opencascade.com>
Date: Mon, 6 Apr 2015 17:56:37 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
X-Git-Tag: V_1.1.0~57
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=33b3a43ad2266cb044e4232c902344842adbba7c;p=modules%2Fshaper.git

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
---

33b3a43ad2266cb044e4232c902344842adbba7c
diff --cc src/ModelAPI/CMakeLists.txt
index 513ddcdef,27df7d565..249ee64ac
--- a/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 eedb3a390,6925ee993..c9561a13b
--- a/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;