Fix for bug of RestoreGivenSubShapes() function's dump coming from SALOME Community...

[modules/geom.git] / src / GEOM / GEOM_PythonDump.hxx

diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx
index 2bac138ab4ef525ec1b5383c0b8d93fa4649d2b3..633fd44d049274885b1937b0eca2be8947400243 100644 (file)
--- a/src/GEOM/GEOM_PythonDump.hxx
+++ b/src/GEOM/GEOM_PythonDump.hxx
@@ -1,21 +1,24 @@
-//  Copyright (C) 2003  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// Copyright (C) 2007-2016  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
+//
+// 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, 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
+// 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
+//
 
 #ifndef _GEOM_PYTHONDUMP_HXX_
 #define _GEOM_PYTHONDUMP_HXX_
@@ -27,29 +30,51 @@
 
 #include <TCollection_AsciiString.hxx>
 
+#include <list>
+
 namespace GEOM
 {
   class TPythonDump
   {
     std::ostringstream myStream;
-    static size_t myCounter;
+    static size_t      myCounter;
+    bool               myAppend;
 
     Handle(GEOM_Function) myFunction;
 
   public:
-    Standard_EXPORT TPythonDump (Handle(GEOM_Function)& theFunction);
+    Standard_EXPORT TPythonDump (const Handle(GEOM_Function)& theFunction, bool theAppend=false);
     Standard_EXPORT virtual ~TPythonDump();
 
-//    operator TCollection_AsciiString () const;
+    //operator TCollection_AsciiString () const;
 
+#if OCC_VERSION_MAJOR >= 7
+    template <class T>
+    Standard_EXPORT TPythonDump& operator<< (const Handle(T)& theObject) { return *this << theObject.get(); }
+#endif
+    Standard_EXPORT TPythonDump& operator<< (bool theArg);
     Standard_EXPORT TPythonDump& operator<< (long int theArg);
     Standard_EXPORT TPythonDump& operator<< (int theArg);
     Standard_EXPORT TPythonDump& operator<< (double theArg);
     Standard_EXPORT TPythonDump& operator<< (float theArg);
     Standard_EXPORT TPythonDump& operator<< (const void* theArg);
     Standard_EXPORT TPythonDump& operator<< (const char* theArg);
-    Standard_EXPORT TPythonDump& operator<< (const Handle(GEOM_Object)& theObject);
+    Standard_EXPORT TPythonDump& operator<< (const TCollection_AsciiString theArg);
+    Standard_EXPORT TPythonDump& operator<< (const TopAbs_ShapeEnum theArg);
+    Standard_EXPORT TPythonDump& operator<< (const Handle(::GEOM_BaseObject)& theObject);
+    Standard_EXPORT TPythonDump& operator<< (const Handle(TColStd_HSequenceOfTransient)& objects);
+    Standard_EXPORT TPythonDump& operator<< (const std::list<Handle(::GEOM_Object)>& theObjects);
+    Standard_EXPORT TPythonDump& operator<< (const GEOM_BaseObject* theObject);
   };
+
+  /*! Returns an object from two given, which has the latest entry
+   */
+  Standard_EXPORT Handle(::GEOM_Object) GetCreatedLast (const Handle(::GEOM_Object)& theObj1,
+                                      const Handle(::GEOM_Object)& theObj2);
+
+  /*! Returns an object from \a theObjects, which has the latest entry
+   */
+  Standard_EXPORT Handle(::GEOM_Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects);
 }
 
 #endif