Merge branch 'master' of newgeom:newgeom.git

Conflicts:
	src/XGUI/CMakeLists.txt
	src/XGUI/XGUI_MainWindow.cpp
	src/XGUI/XGUI_MainWindow.h

diff --cc src/XGUI/CMakeLists.txt
index 38deae12299035d6f11d2a10c2d0f7cf3b3e0dd8,90632e71ec5a027f158a46deb9833fc826d05b85..713f9b9051c88c731b4c2e11939b3de5963ae311
--- 1/src/XGUI/CMakeLists.txt
--- 2/src/XGUI/CMakeLists.txt
+++ b/src/XGUI/CMakeLists.txt
@@@ -18,7 -18,9 +18,10 @@@ SET(PROJECT_HEADER
        XGUI_RubberBand.h
        XGUI_Constants.h
        XGUI_ViewBackground.h
 +      XGUI_WidgetFactory.h
+       XGUI_DocumentDataModel.h
+       XGUI_DataModel.h
+       XGUI_ObjectsBrowser.h
  )
  
  SET(PROJECT_AUTOMOC 
@@@ -39,7 -41,9 +42,10 @@@ SET(PROJECT_SOURCE
      XGUI_Viewer.cpp
        XGUI_RubberBand.cpp
        XGUI_ViewBackground.cpp
 +      XGUI_WidgetFactory.cpp
+       XGUI_DocumentDataModel.cpp
+       XGUI_DataModel.cpp
+       XGUI_ObjectsBrowser.cpp
  )
  
  SET(PROJECT_RESOURCES 

diff --cc src/XGUI/XGUI_MainWindow.cpp
index 40a0d26cfae25c68f665bc88c03f02287c5f8586,007198fc29b3a10e28c8cccd841f5e260cf80d6b..c89e0fc0a1224586ceb3059717e6a4ef724db155
--- 1/src/XGUI/XGUI_MainWindow.cpp
--- 2/src/XGUI/XGUI_MainWindow.cpp
+++ b/src/XGUI/XGUI_MainWindow.cpp
@@@ -29,9 -29,20 +30,9 @@@ XGUI_MainWindow::XGUI_MainWindow(QWidge
      myObjectBrowser(0), 
      myPythonConsole(0)
  {
-   setWindowTitle(tr("WINDOW_TITLE"));
+   setWindowTitle(tr("New Geom"));
    myMenuBar = new XGUI_MainMenu(this);
  
 -  QDockWidget* aDoc = new QDockWidget(this);
 -  aDoc->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
 -  aDoc->setWindowTitle(tr("Object browser"));
 -
 -  myObjectBrowser = new XGUI_ObjectsBrowser(aDoc);
 -  //myObjectBrowser->setColumnCount(1);
 -  //myObjectBrowser->setHeaderHidden(true);
 -  aDoc->setWidget(myObjectBrowser);
 -  addDockWidget(Qt::LeftDockWidgetArea, aDoc);
 -  //aDoc->hide();
 -
    QMdiArea* aMdiArea = new QMdiArea(this);
    setCentralWidget(aMdiArea);
  
@@@ -138,69 -233,5 +139,18 @@@ QDockWidget* XGUI_MainWindow::createPro
    aBtn->setFlat(true);
    aBtnLay->addWidget(aBtn);
  
 -  addDockWidget(Qt::RightDockWidgetArea, aPropPanel);
 +  return aPropPanel;
 +}
 +
 +QDockWidget* XGUI_MainWindow::createObjectBrowser()
 +{
 +  QDockWidget* aObjDock = new QDockWidget(this);
 +  aObjDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-   aObjDock->setWindowTitle(tr("OBJECT_BROWSER_TITLE"));
-   myObjectBrowser = new QTreeWidget(aObjDock);
-   myObjectBrowser->setColumnCount(1);
-   myObjectBrowser->setHeaderHidden(true);
++  aObjDock->setWindowTitle(tr("Object browser"));
++  myObjectBrowser = new XGUI_ObjectsBrowser(aObjDock);
++  //myObjectBrowser->setColumnCount(1);
++  //myObjectBrowser->setHeaderHidden(true);
 +  aObjDock->setWidget(myObjectBrowser);
 +//  fillObjectBrowser();
 +  return aObjDock;
  }
- 
- //******************************************************
- 
- // TEST FUNCTIONS
- 
- //******************************************************
- void XGUI_MainWindow::fillObjectBrowser()
- {
-   QStringList aNames;
-   aNames << "Parameters" << "Constructions";
-   aNames << "Part 1" << "Part 2" << "Part 3";
-   aNames << "Properties";
- 
-   QStringList aIcons;
-   aIcons << ":pictures/params_folder.png";
-   aIcons << ":pictures/constr_folder.png";
-   aIcons << ":pictures/part_ico.png";
-   aIcons << ":pictures/part_ico.png";
-   aIcons << ":pictures/part_ico.png";
-   aIcons << ":pictures/properties.png";
- 
-   QList<QTreeWidgetItem*> aItems;
-   foreach(QString aName, aNames)
-   {
-     QTreeWidgetItem* aItem = new QTreeWidgetItem(myObjectBrowser);
-     aItem->setText(0, aName);
-     aItems.append(aItem);
-   }
-   for(int i = 0; i < aItems.length(); i++) {
-     aItems[i]->setIcon(0, QIcon(aIcons[i]));
-   }
-   myObjectBrowser->addTopLevelItems(aItems);
- 
-   for(int i = 2; i < 5; i++) {
-     QTreeWidgetItem* aItem = new QTreeWidgetItem(aItems[i]);
-     aItem->setText(0, "Parameters");
-     aItem->setIcon(0, QIcon(":pictures/params_folder.png"));
- 
-     aItem = new QTreeWidgetItem(aItems[i]);
-     aItem->setText(0, "Construction");
-     aItem->setIcon(0, QIcon(":pictures/constr_folder.png"));
- 
-     aItem = new QTreeWidgetItem(aItems[i]);
-     aItem->setText(0, "Bodies");
-     aItem->setIcon(0, QIcon(":pictures/part_ico.png"));
- 
-     aItem = new QTreeWidgetItem(aItems[i]);
-     aItem->setText(0, "Features");
-     aItem->setIcon(0, QIcon(":pictures/features.png"));
-   }
- }

diff --cc src/XGUI/XGUI_MainWindow.h
index 0806b5863a8e791426ab7a22051e32a24dea7fa1,2f85d1c0175fe69b22e03b6022df716d3f782d15..e12614a7380fa6ac38040960acd193fe5f683cbe
--- 1/src/XGUI/XGUI_MainWindow.h
--- 2/src/XGUI/XGUI_MainWindow.h
+++ b/src/XGUI/XGUI_MainWindow.h
@@@ -41,14 -41,12 +41,12 @@@ public
    void hidePythonConsole();
  
  private:
 -  //!! For test purposes only
 -  //void fillObjectBrowser();
 -  void addPropertyPanel();
 +  void createDockWidgets();
 +  QDockWidget* createObjectBrowser();
 +  QDockWidget* createPropertyPanel();
-   //!! For test purposes only
-   void fillObjectBrowser();
  
    XGUI_MainMenu* myMenuBar;
-   QTreeWidget* myObjectBrowser;
+   XGUI_ObjectsBrowser* myObjectBrowser;
  
    XGUI_Viewer* myViewer;
  

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