Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #568: use ordered list view with selection synchronized with object browser...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_PriorityTableModel.h
diff --git
a/src/HYDROGUI/HYDROGUI_PriorityTableModel.h
b/src/HYDROGUI/HYDROGUI_PriorityTableModel.h
index 666d72c58dc2736b8afa6d3332031ba6dcf5cd5b..9133843769deec66b81c69263f3be4624c7aaed7 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_PriorityTableModel.h
+++ b/
src/HYDROGUI/HYDROGUI_PriorityTableModel.h
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-62,19
+58,22
@@
public:
bool removeRows( const QList<int> theRows );
bool removeAll();
bool removeRows( const QList<int> theRows );
bool removeAll();
- void setObjects( const QList<Handle(HYDROData_
Object
)>& theObjects );
+ void setObjects( const QList<Handle(HYDROData_
Entity
)>& theObjects );
void setRules( const HYDROData_ListOfRules& theObjects );
HYDROData_ListOfRules getRules() const;
bool createNewRule();
bool canCreateNewRule() const;
void setRules( const HYDROData_ListOfRules& theObjects );
HYDROData_ListOfRules getRules() const;
bool createNewRule();
bool canCreateNewRule() const;
+
+ void setColumnCount( int theColumnCount );
protected:
protected:
- bool isUsed( const Handle(HYDROData_
Object
)& theObj1,
- const Handle(HYDROData_
Object
)& theObj2 ) const;
+ bool isUsed( const Handle(HYDROData_
Entity
)& theObj1,
+ const Handle(HYDROData_
Entity
)& theObj2 ) const;
- QStringList getAvailablePairs( const Handle(HYDROData_Object)& theObject ) const;
+ QStringList getAvailablePairs( const Handle(HYDROData_Entity)& theObject ) const;
+ QStringList getAvailableObjectNames() const;
QString priorityToString( const int thePriority ) const;
QString mergeTypeToString( const int theMergeType ) const;
QString priorityToString( const int thePriority ) const;
QString mergeTypeToString( const int theMergeType ) const;
@@
-83,12
+82,16
@@
signals:
void showError( const QString& theMsg );
private:
void showError( const QString& theMsg );
private:
+ const ObjectKind getObjectsKind() const;
+
friend class test_HYDROGUI_PriorityTableModel;
HYDROGUI_Module* myModule;
HYDROData_ListOfRules myRules;
friend class test_HYDROGUI_PriorityTableModel;
HYDROGUI_Module* myModule;
HYDROData_ListOfRules myRules;
- QList<Handle(HYDROData_Object)> myObjects;
+ QList<Handle(HYDROData_Entity)> myObjects;
+
+ int myColumnCount;
};
#endif
\ No newline at end of file
};
#endif
\ No newline at end of file