Merge remote-tracking branch 'origin/BR_LAND_COVER' into BR_v14_rc

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_PriorityTableModel.h

diff --git a/src/HYDROGUI/HYDROGUI_PriorityTableModel.h b/src/HYDROGUI/HYDROGUI_PriorityTableModel.h
index d7a996d4f3852def63e4fad1b3814ee5bc712390..9133843769deec66b81c69263f3be4624c7aaed7 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_PriorityTableModel.h
+++ b/src/HYDROGUI/HYDROGUI_PriorityTableModel.h
@@ -1,8 +1,4 @@
-// Copyright (C) 2007-2015  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
@@ -62,19 +58,21 @@ public:
   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 setColumnCount( int theColumnCount );
   
 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;
@@ -84,12 +82,16 @@ signals:
   void showError( const QString& theMsg );
 
 private:
+  const ObjectKind getObjectsKind() const;
+
   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