Merge remote-tracking branch 'remotes/origin/master'

[modules/shaper.git] / src / XGUI / XGUI_PartDataModel.h

diff --git a/src/XGUI/XGUI_PartDataModel.h b/src/XGUI/XGUI_PartDataModel.h
index a44dfb03ca5d22f869bdd67f944985816c6ca1ff..b170ec1cd701b96f0890a193e0d41ab42874b59d 100644 (file)
--- a/src/XGUI/XGUI_PartDataModel.h
+++ b/src/XGUI/XGUI_PartDataModel.h
@@ -14,7 +14,7 @@ class XGUI_EXPORT XGUI_TopDataModel : public XGUI_FeaturesModel
 {
   Q_OBJECT
 public:
-  XGUI_TopDataModel(const DocumentPtr& theDocument, QObject* theParent);
+  XGUI_TopDataModel(QObject* theParent);
   virtual ~XGUI_TopDataModel();
 
   // Reimpl from QAbstractItemModel
@@ -32,12 +32,16 @@ public:
 
   virtual bool hasChildren(const QModelIndex& theParent = QModelIndex()) const;
 
-  //! Returns Feature object by the given Model index.
-  //! Returns 0 if the given index is not index of a feature
-  virtual FeaturePtr feature(const QModelIndex& theIndex) const;
+  //! Returns object by the given Model index.
+  //! Returns 0 if the given index is not index of a object
+  virtual ObjectPtr object(const QModelIndex& theIndex) const;
 
-  //! Returns parent index of the given feature
-  virtual QModelIndex findParent(const FeaturePtr& theFeature) const;
+  //! Returns QModelIndex which corresponds to the given object
+  //! If the object is not found then index is not valid
+  virtual QModelIndex objectIndex(const ObjectPtr& theObject) const;
+
+  //! Returns parent index of the given object
+  virtual QModelIndex findParent(const ObjectPtr& theObject) const;
 
   //! Returns index corresponded to the group
   virtual QModelIndex findGroup(const std::string& theGroup) const;
@@ -63,7 +67,7 @@ class XGUI_PartDataModel : public XGUI_PartModel
 {
   Q_OBJECT
 public:
-  XGUI_PartDataModel(const DocumentPtr& theDocument, QObject* theParent);
+  XGUI_PartDataModel(QObject* theParent);
   virtual ~XGUI_PartDataModel();
 
   // Reimpl from QAbstractItemModel
@@ -81,24 +85,30 @@ public:
 
   virtual bool hasChildren(const QModelIndex& theParent = QModelIndex()) const;
 
-  //! Returns Feature object by the given Model index.
-  //! Returns 0 if the given index is not index of a feature
-  virtual FeaturePtr feature(const QModelIndex& theIndex) const;
+  //! Returns object by the given Model index.
+  //! Returns 0 if the given index is not index of a object
+  virtual ObjectPtr object(const QModelIndex& theIndex) const;
+
+  //! Returns QModelIndex which corresponds to the given object
+  //! If the object is not found then index is not valid
+  virtual QModelIndex objectIndex(const ObjectPtr& theObject) const;
 
   //! Returns true if the given document is a sub-document of this tree
   virtual bool hasDocument(const DocumentPtr& theDoc) const;
 
-  //! Returns parent index of the given feature
-  virtual QModelIndex findParent(const FeaturePtr& theFeature) const;
+  //! Returns parent index of the given object
+  virtual QModelIndex findParent(const ObjectPtr& theObject) const;
 
   //! Returns index corresponded to the group
   virtual QModelIndex findGroup(const std::string& theGroup) const;
 
   //! Return a Part object
-  virtual FeaturePtr part() const;
+  virtual ResultPartPtr part() const;
 
 private: 
-  DocumentPtr featureDocument() const;
+
+  //! Returns document of the current part
+  DocumentPtr partDocument() const;
 
   //! Types of QModelIndexes
   enum DataIds {
@@ -108,7 +118,7 @@ private:
     ConstructFolder,
     ConstructObject,
     BodiesFolder,
-    BodieswObject,
+    BodiesObject,
     HistoryObject
   };