Merge branch 'master' of newgeom:newgeom

diff --git a/src/XGUI/XGUI_DocumentDataModel.cpp b/src/XGUI/XGUI_DocumentDataModel.cpp
index f65545188e1b334444ac1282ba7e4dc67ce72f99..ccb90aae2a3e3afe9393656009888dc288ce2169 100644 (file)
--- a/src/XGUI/XGUI_DocumentDataModel.cpp
+++ b/src/XGUI/XGUI_DocumentDataModel.cpp
@@ -55,6 +55,7 @@ QVariant XGUI_DocumentDataModel::headerData(int section, Qt::Orientation orienta
 int XGUI_DocumentDataModel::rowCount(const QModelIndex &parent) const
 {
   std::shared_ptr<ModelAPI_Iterator> aIt = myDocument->featuresIterator(PARTS_GROUP);
+  int a = aIt->numIterationsLeft();
   return aIt->numIterationsLeft() + 2;
 }
 
@@ -96,7 +97,5 @@ bool XGUI_DocumentDataModel::hasChildren(const QModelIndex& theParent) const
     return myDocument->featuresIterator(PARAMETERS_GROUP)->more();
   if (theParent.internalId() == quintptr(&myConstructFolder))
     return myDocument->featuresIterator(CONSTRUCTIONS_GROUP)->more();
-  if (theParent.internalId() == 0)
-    return false;
   return false;
 }
\ No newline at end of file

diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp
index ecf8524964668aba6387a308a8393c947c2c479e..8b3fd9ac3a404dbab6103121b17f8f0da09d4d81 100644 (file)
--- a/src/XGUI/XGUI_Workshop.cpp
+++ b/src/XGUI/XGUI_Workshop.cpp
@@ -9,6 +9,9 @@
 #include "XGUI_Viewer.h"
 #include "XGUI_WidgetFactory.h"
 
+#include <ModelAPI_PluginManager.h>
+#include <ModelAPI_Feature.h>
+
 #include <Event_Loop.h>
 #include <Config_FeatureMessage.h>
 #include <Config_WidgetMessage.h>
@@ -56,6 +59,9 @@ void XGUI_Workshop::startApplication()
   QMdiSubWindow* aWnd = myMainWindow->viewer()->createView();
   aWnd->showMaximized();
   myMainWindow->showPythonConsole();
+
+  std::shared_ptr<ModelAPI_PluginManager> aMgr = ModelAPI_PluginManager::get();
+  std::shared_ptr<ModelAPI_Feature> myRoot = aMgr->createFeature("Point");
 }
 
 //******************************************************