Merge branch 'master' of newgeom:newgeom.git

diff --combined src/XGUI/CMakeLists.txt
index 078e6aa4f5ac1f0e4bfddfeb7d33242a464eb0a3,e740fea8ddc96246d45fcbcf96821c24fd81a3dc..e1993f5d903cb6d10d726b6ff526509a80d02660
--- 1/src/XGUI/CMakeLists.txt
--- 2/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -20,7 -20,7 +20,7 @@@ SET(PROJECT_HEADER
        XGUI_ViewBackground.h
        XGUI_WidgetFactory.h
        XGUI_DocumentDataModel.h
-       XGUI_DataModel.h
+       XGUI_PartDataModel.h
        XGUI_ObjectsBrowser.h
  )
  
@@@ -44,7 -44,7 +44,7 @@@ SET(PROJECT_SOURCE
        XGUI_ViewBackground.cpp
        XGUI_WidgetFactory.cpp
        XGUI_DocumentDataModel.cpp
-       XGUI_DataModel.cpp
+       XGUI_PartDataModel.cpp
        XGUI_ObjectsBrowser.cpp
  )
  
@@@ -60,10 -60,10 +60,11 @@@ SET(PROJECT_LIBRARIE
        opengl32
      Event
      Config
 -      ${Qt5Widgets_LIBRARIES}
 +      ${QT_LIBRARIES}
 +      ${QT_QTMAIN_LIBRARY}
        ${CAS_VIEWER}
        ${CAS_KERNEL}
+     ${CAS_OCAF}
        PyConsole
        PyInterp
        PyEvent
@@@ -71,7 -71,7 +72,7 @@@
        ModuleBase
  )
  
 -QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
 +QT4_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES})
  #QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES})
  
  #SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES})
@@@ -85,6 -85,7 +86,7 @@@ INCLUDE_DIRECTORIES (${PROJECT_SOURCE_D
                                         ${PROJECT_SOURCE_DIR}/src/PyInterp
                                         ${PROJECT_SOURCE_DIR}/src/PyConsole
                                         ${PROJECT_SOURCE_DIR}/src/ModelAPI
+                                        ${PROJECT_SOURCE_DIR}/src/Model
                                         ${PROJECT_SOURCE_DIR}/src/ModuleBase
                                         ${CAS_INCLUDE_DIRS})
  
@@@ -94,6 -95,7 +96,6 @@@ ADD_EXECUTABLE(XGUI WIN3
        ${PROJECT_SOURCES} 
        ${PROJECT_HEADERS} 
        ${PROJECT_COMPILED_RESOURCES} 
 -      ${TEXT_RESOURCES} 
  )
  
  ADD_DEPENDENCIES(XGUI ModelAPI)