Fix regression: storeViewParameters() does not work for OCC view

[modules/geom.git] / src / GEOMAlgo / GEOMAlgo_PassKey.hxx

diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
index 54051e170cf1b23bc19795331e81e3d117665e46..656cd67803da61e21df377fa5fcd561201ba1bd7 100644 (file)
--- a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
+++ b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx
@@ -1,21 +1,24 @@
-// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-// 
-// 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.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//
+//  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.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 #ifndef _GEOMAlgo_PassKey_HeaderFile
 #define _GEOMAlgo_PassKey_HeaderFile
@@ -23,12 +26,12 @@
 #ifndef _Standard_Integer_HeaderFile
 #include <Standard_Integer.hxx>
 #endif
+#ifndef _TColStd_IndexedMapOfInteger_HeaderFile
+#include <TColStd_IndexedMapOfInteger.hxx>
+#endif
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
-#ifndef _Standard_Address_HeaderFile
-#include <Standard_Address.hxx>
-#endif
 class TColStd_ListOfInteger;
 
 
@@ -39,6 +42,7 @@ class TColStd_ListOfInteger;
 #include <Standard_Macro.hxx>
 #endif
 
+
 class GEOMAlgo_PassKey  {
 
 public:
@@ -57,26 +61,54 @@ public:
       }
  // Methods PUBLIC
  // 
+
+
 Standard_EXPORT GEOMAlgo_PassKey();
+Standard_EXPORT virtual ~GEOMAlgo_PassKey();
+
+
+Standard_EXPORT GEOMAlgo_PassKey(const GEOMAlgo_PassKey& Other);
+
+
 Standard_EXPORT   GEOMAlgo_PassKey& Assign(const GEOMAlgo_PassKey& Other) ;
   GEOMAlgo_PassKey& operator =(const GEOMAlgo_PassKey& Other) 
 {
   return Assign(Other);
 }
 
+
+
+Standard_EXPORT   void Clear() ;
+
+
 Standard_EXPORT   void SetIds(const Standard_Integer aI1) ;
+
+
 Standard_EXPORT   void SetIds(const Standard_Integer aI1,const Standard_Integer aI2) ;
+
+
 Standard_EXPORT   void SetIds(const Standard_Integer aI1,const Standard_Integer aI2,const Standard_Integer aI3) ;
+
+
 Standard_EXPORT   void SetIds(const Standard_Integer aI1,const Standard_Integer aI2,const Standard_Integer aI3,const Standard_Integer aI4) ;
+
+
 Standard_EXPORT   void SetIds(const TColStd_ListOfInteger& aLS) ;
-Standard_EXPORT   Standard_Integer NbMax() const;
-Standard_EXPORT   void Clear() ;
-Standard_EXPORT   void Compute() ;
+
+
+Standard_EXPORT   Standard_Integer NbIds() const;
+
+
 Standard_EXPORT   Standard_Boolean IsEqual(const GEOMAlgo_PassKey& aOther) const;
-Standard_EXPORT   Standard_Address Key() const;
+
+
 Standard_EXPORT   Standard_Integer HashCode(const Standard_Integer Upper) const;
+
+
 Standard_EXPORT   Standard_Integer Id(const Standard_Integer aIndex) const;
-Standard_EXPORT   void Dump() const;
+
+
+Standard_EXPORT   void Dump(const Standard_Integer aHex = 0) const;
 
 
 
@@ -91,9 +123,8 @@ protected:
  // Fields PROTECTED
  //
 Standard_Integer myNbIds;
-Standard_Integer myNbMax;
 Standard_Integer mySum;
-Standard_Integer myIds[8];
+TColStd_IndexedMapOfInteger myMap;
 
 
 private: