Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #387 #388 Fix for the crash in the swig generated code on export
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_PartDataModel.h
diff --git
a/src/XGUI/XGUI_PartDataModel.h
b/src/XGUI/XGUI_PartDataModel.h
index b170ec1cd701b96f0890a193e0d41ab42874b59d..4ef9cd58fe5e77611c73fb0f32d3fd04994183b1 100644
(file)
--- a/
src/XGUI/XGUI_PartDataModel.h
+++ b/
src/XGUI/XGUI_PartDataModel.h
@@
-1,3
+1,4
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
#ifndef XGUI_PartDataModel_H
#define XGUI_PartDataModel_H
#ifndef XGUI_PartDataModel_H
#define XGUI_PartDataModel_H
@@
-12,8
+13,8
@@
*/
class XGUI_EXPORT XGUI_TopDataModel : public XGUI_FeaturesModel
{
*/
class XGUI_EXPORT XGUI_TopDataModel : public XGUI_FeaturesModel
{
-
Q_OBJECT
-public:
+Q_OBJECT
+
public:
XGUI_TopDataModel(QObject* theParent);
virtual ~XGUI_TopDataModel();
XGUI_TopDataModel(QObject* theParent);
virtual ~XGUI_TopDataModel();
@@
-25,8
+26,8
@@
public:
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QModelIndex index(int theRow, int theColumn,
-
const QModelIndex& theParent =
QModelIndex()) const;
+ virtual QModelIndex index(int theRow, int theColumn,
const QModelIndex& theParent =
+
QModelIndex()) const;
virtual QModelIndex parent(const QModelIndex& theIndex) const;
virtual QModelIndex parent(const QModelIndex& theIndex) const;
@@
-46,18
+47,20
@@
public:
//! Returns index corresponded to the group
virtual QModelIndex findGroup(const std::string& theGroup) const;
//! Returns index corresponded to the group
virtual QModelIndex findGroup(const std::string& theGroup) const;
-private:
+
private:
//! Types of QModelIndexes
//! Types of QModelIndexes
- enum DataIds {
+ enum DataIds
+ {
ParamsFolder,
ParamObject,
ConstructFolder,
ConstructObject
ParamsFolder,
ParamObject,
ConstructFolder,
ConstructObject
+ //GroupsFolder,
+ //GroupObject
};
};
};
};
-
/**\class XGUI_PartDataModel
* \ingroup GUI
* \brief This is a data model for Object Browser (QTreeView).
/**\class XGUI_PartDataModel
* \ingroup GUI
* \brief This is a data model for Object Browser (QTreeView).
@@
-65,8
+68,8
@@
private:
*/
class XGUI_PartDataModel : public XGUI_PartModel
{
*/
class XGUI_PartDataModel : public XGUI_PartModel
{
-
Q_OBJECT
-public:
+Q_OBJECT
+
public:
XGUI_PartDataModel(QObject* theParent);
virtual ~XGUI_PartDataModel();
XGUI_PartDataModel(QObject* theParent);
virtual ~XGUI_PartDataModel();
@@
-78,8
+81,8
@@
public:
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
virtual int columnCount(const QModelIndex &parent = QModelIndex()) const;
- virtual QModelIndex index(int theRow, int theColumn,
-
const QModelIndex& theParent =
QModelIndex()) const;
+ virtual QModelIndex index(int theRow, int theColumn,
const QModelIndex& theParent =
+
QModelIndex()) const;
virtual QModelIndex parent(const QModelIndex& theIndex) const;
virtual QModelIndex parent(const QModelIndex& theIndex) const;
@@
-105,13
+108,16
@@
public:
//! Return a Part object
virtual ResultPartPtr part() const;
//! Return a Part object
virtual ResultPartPtr part() const;
-private:
+ private:
//! Returns document of the current part
DocumentPtr partDocument() const;
//! Returns document of the current part
DocumentPtr partDocument() const;
+ int getRowsNumber() const;
+
//! Types of QModelIndexes
//! Types of QModelIndexes
- enum DataIds {
+ enum DataIds
+ {
MyRoot,
ParamsFolder,
ParamObject,
MyRoot,
ParamsFolder,
ParamObject,
@@
-119,9
+125,11
@@
private:
ConstructObject,
BodiesFolder,
BodiesObject,
ConstructObject,
BodiesFolder,
BodiesObject,
+ GroupsFolder,
+ GroupObject,
HistoryObject
};
};
HistoryObject
};
};
-#endif
\ No newline at end of file
+#endif