Porting to OCCT6.5.1

src/GEOM/GEOM_Engine.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -33,6 +32,8 @@
 #include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
 #include "GEOM_PythonDump.hxx"
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 
 #include <Basics_Utils.hxx>
@@ -45,7 +46,6 @@
 #include <TDataStd_ChildNodeIterator.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_DriverTable.hxx>
-#include <TDataStd_HArray1OfByte.hxx>
 #include <TDataStd_ByteArray.hxx>
 #include <TDataStd_UAttribute.hxx>
 #include <TDF_ChildIterator.hxx>
@@ -60,7 +60,14 @@
 #include <TColStd_MapOfTransient.hxx>
 #include <TColStd_HSequenceOfInteger.hxx>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#include <TColStd_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
+#else
+#include <TDataStd_HArray1OfByte.hxx>
 #include <Interface_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
+#endif
+
 #include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
 
 #include <set>
@@ -230,7 +237,12 @@ GEOM_Engine::~GEOM_Engine()
     RemoveObject(*objit);
 
   //Close all documents not closed
-  for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next())
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  TColStd_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument);
+#else
+  Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument);
+#endif
+  for (; anItr.More(); anItr.Next())
     Close(anItr.Key());
 
   _mapIDDocument.Clear();
@@ -264,12 +276,16 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID, bool force)
 //=============================================================================
 int GEOM_Engine::GetDocID(Handle(TDocStd_Document) theDocument)
 {
-  if(theDocument.IsNull()) return -1;
+  if (theDocument.IsNull()) return -1;
-  for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next())
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
-    if(anItr.Value() == theDocument) return anItr.Key();
+  TColStd_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument);
+#else
+  Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr (_mapIDDocument);
+#endif
+  for (; anItr.More(); anItr.Next())
+    if (anItr.Value() == theDocument) return anItr.Key();
 
   return -1;
-
 }
 
 //=============================================================================
@@ -377,7 +393,7 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape,
   aSSI.SetIndices(theIndices);
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     GEOM_Solver aSolver (GEOM_Engine::GetEngine());
@@ -806,7 +822,11 @@ Handle(TColStd_HSequenceOfAsciiString) GEOM_Engine::GetAllDumpNames() const
 #define TEXTURE_LABEL_DATA     5
 
 int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight,
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                            const Handle(TColStd_HArray1OfByte)& theTexture,
+#else
                             const Handle(TDataStd_HArray1OfByte)& theTexture,
+#endif
                             const TCollection_AsciiString& theFileName)
 {
   Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
@@ -851,11 +871,19 @@ int GEOM_Engine::addTexture(int theDocID, int theWidth, int theHeight,
   return aTextureID;
 }
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+Handle(TColStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theTextureID,
+#else
 Handle(TDataStd_HArray1OfByte) GEOM_Engine::getTexture(int theDocID, int theTextureID,
-                                                       int& theWidth, int& theHeight,
+#endif
-                                                       TCollection_AsciiString& theFileName)
+                                                      int& theWidth, int& theHeight,
+                                                      TCollection_AsciiString& theFileName)
 {
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) anArray;
+#else
   Handle(TDataStd_HArray1OfByte) anArray;
+#endif
   theWidth = theHeight = 0;
 
   Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
@@ -1455,7 +1483,11 @@ void AddObjectColors (int                      theDocID,
   }
 }
 
-static TCollection_AsciiString pack_data(const Handle(TDataStd_HArray1OfByte)& aData )
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+static TCollection_AsciiString pack_data (const Handle(TColStd_HArray1OfByte)& aData)
+#else
+static TCollection_AsciiString pack_data (const Handle(TDataStd_HArray1OfByte)& aData)
+#endif
 {
   TCollection_AsciiString stream;
   if (!aData.IsNull()) {
@@ -1483,7 +1515,12 @@ void AddTextures (int theDocID, TCollection_AsciiString& theScript)
       if (*it <= 0) continue;
       Standard_Integer aWidth, aHeight;
       TCollection_AsciiString aFileName;
-      Handle(TDataStd_HArray1OfByte) aTexture = engine->getTexture(theDocID, *it, aWidth, aHeight, aFileName);
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+      Handle(TColStd_HArray1OfByte) aTexture =
+#else
+      Handle(TDataStd_HArray1OfByte) aTexture =
+#endif
+        engine->getTexture(theDocID, *it, aWidth, aHeight, aFileName);
       if (aWidth > 0 && aHeight > 0 && !aTexture.IsNull() && aTexture->Length() > 0 ) {
         TCollection_AsciiString aCommand = "\n\t";
         aCommand += "texture_map["; aCommand += *it; aCommand += "] = ";

src/GEOM/GEOM_Engine.hxx

@@ -18,7 +18,6 @@
 // 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_Engine_HXX_
 #define _GEOM_Engine_HXX_
@@ -27,7 +26,14 @@
 #include "GEOM_Object.hxx"
 #include "GEOM_DataMapOfAsciiStringTransient.hxx"
 
-#include <Interface_DataMapOfIntegerTransient.hxx> 
+#include <CASCatch_OCCTVersion.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_DataMapOfIntegerTransient.hxx>
+#else
+#include <Interface_DataMapOfIntegerTransient.hxx>
+#endif
+
 #include <Resource_DataMapOfAsciiStringAsciiString.hxx>
 #include <TDocStd_Document.hxx>
 #include <TColStd_HArray1OfInteger.hxx>
@@ -51,7 +57,11 @@ struct TObjectData
   bool                    _unpublished;
 };
   
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+class Handle_TColStd_HArray1OfByte;
+#else
 class Handle_TDataStd_HArray1OfByte;
+#endif
 
 struct TVariable{
   TCollection_AsciiString myVariable;
@@ -148,12 +158,20 @@ class GEOM_Engine
   Standard_EXPORT Handle(TColStd_HSequenceOfAsciiString) GetAllDumpNames() const;
 
   Standard_EXPORT int addTexture(int theDocID, int theWidth, int theHeight,
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                                 const Handle(TColStd_HArray1OfByte)& theTexture,
+#else
                                  const Handle(TDataStd_HArray1OfByte)& theTexture,
+#endif
                                  const TCollection_AsciiString& theFileName = "");
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Standard_EXPORT Handle(TColStd_HArray1OfByte) getTexture(int theDocID, int theTextureID,
+#else
   Standard_EXPORT Handle(TDataStd_HArray1OfByte) getTexture(int theDocID, int theTextureID,
-                                                            int& theWidth, int& theHeight,
+#endif
-                                                            TCollection_AsciiString& theFileName);
+                                                           int& theWidth, int& theHeight,
+                                                           TCollection_AsciiString& theFileName);
 
   Standard_EXPORT std::list<int> getAllTextures(int theDocID);
 
@@ -165,7 +183,11 @@ class GEOM_Engine
  private:
 
   Handle(GEOM_Application)  _OCAFApp;
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  TColStd_DataMapOfIntegerTransient _mapIDDocument;
+#else
   Interface_DataMapOfIntegerTransient _mapIDDocument;
+#endif
   int _UndoLimit;
   GEOM_DataMapOfAsciiStringTransient _objects;
 

src/GEOM/GEOM_Function.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
@@ -27,6 +26,8 @@
 #include <GEOM_Solver.hxx>
 #include <GEOM_ISubShape.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 
 #include <TDF.hxx>
@@ -208,7 +209,7 @@ TopoDS_Shape GEOM_Function::GetValue()
 
     if (!isResult) {
       try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x060100
         OCC_CATCH_SIGNALS;
 #endif
         GEOM_Solver aSolver(GEOM_Engine::GetEngine());

src/GEOM/Makefile.am

@@ -15,14 +15,13 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  File   : Makefile.in
 #  Author : Damien COQUERET (OCC)
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header: 
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -67,6 +66,7 @@ libGEOMbasic_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
 	$(BOOST_CPPFLAGS)	\
+	$(GUI_CXXFLAGS)		\
 	-I$(top_builddir)/idl
 
 libGEOMbasic_la_LDFLAGS  =			\

src/GEOMAlgo/BlockFix_UnionFaces.cxx

@@ -18,14 +18,15 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  File:    BlockFix_UnionFaces.cxx
 //  Created: Tue Dec  7 17:15:42 2004
 //  Author:  Pavel DURANDIN
-//
+
 #include <BlockFix_UnionFaces.ixx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <ShapeAnalysis_WireOrder.hxx>
 #include <ShapeAnalysis_Edge.hxx>
 
@@ -42,7 +43,11 @@
 #include <ShapeFix_Wire.hxx>
 #include <ShapeFix_Edge.hxx>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <IntPatch_ImpImpIntersection.hxx>
+#else
 #include <IntPatch_TheIIIntOfIntersection.hxx>
+#endif
 
 #include <BRep_Tool.hxx>
 #include <BRep_Builder.hxx>
@@ -614,10 +619,15 @@ Standard_Boolean BlockFix_UnionFaces::IsSameDomain(const TopoDS_Face& aFace,
     Handle(BRepTopAdaptor_TopolTool) aTT2 = new BRepTopAdaptor_TopolTool();
 
     try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
       OCC_CATCH_SIGNALS;
 #endif
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+      IntPatch_ImpImpIntersection anIIInt (aGA1, aTT1, aGA2, aTT2, aPrec, aPrec);
+#else
       IntPatch_TheIIIntOfIntersection anIIInt (aGA1, aTT1, aGA2, aTT2, aPrec, aPrec);
+#endif
       if (!anIIInt.IsDone() || anIIInt.IsEmpty())
         return false;
 

src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
@@ -29,6 +28,7 @@
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 #endif
+
 class Standard_NoSuchObject;
 class TopoDS_Shape;
 class GEOMAlgo_ShapeSet;
@@ -36,7 +36,6 @@ class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapeShapeSet;
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -44,73 +43,32 @@ class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
 #include <Standard_Macro.hxx>
 #endif
 
-
+class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet  : public TCollection_BasicMapIterator
-class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet  : public TCollection_BasicMapIterator {
+{
-
 public:
+  void* operator new(size_t,void* anAddress) 
+  {
+    return anAddress;
+  }
+  void* operator new(size_t size) 
+  { 
+    return Standard::Allocate(size); 
+  }
+  void  operator delete(void *anAddress) 
+  { 
+    if (anAddress) Standard::Free((Standard_Address&)anAddress); 
+  }
 
-    void* operator new(size_t,void* anAddress) 
+  Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet();
-      {
-        return anAddress;
-      }
-    void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
 
+  Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet
+  (const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
 
-Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet();
+  Standard_EXPORT   void Initialize(const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
-
-
-Standard_EXPORT GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& aMap);
-
-
-Standard_EXPORT   void Initialize(const GEOMAlgo_DataMapOfShapeShapeSet& aMap) ;
-
-
-Standard_EXPORT  const TopoDS_Shape& Key() const;
-
-
-Standard_EXPORT  const GEOMAlgo_ShapeSet& Value() const;
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
 
+  Standard_EXPORT  const TopoDS_Shape& Key() const;
 
+  Standard_EXPORT  const GEOMAlgo_ShapeSet& Value() const;
 };
 
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx

@@ -15,7 +15,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
@@ -36,56 +35,26 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopoDS_Shape;
 class TopTools_OrientedShapeMapHasher;
 class GEOMAlgo_DataMapOfOrientedShapeShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape;
 
-
-
 class GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape : public TCollection_MapNode {
 
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape
- // 
+  (const TopoDS_Shape& K, const TopoDS_Shape& I, const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape(const TopoDS_Shape& K,const TopoDS_Shape& I,const TCollection_MapNodePtr& n);
 
   TopoDS_Shape& Key() const;
-
   TopoDS_Shape& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean	       IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-TopoDS_Shape myKey;
-TopoDS_Shape myValue;
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)
 
+private:
+  TopoDS_Shape myKey;
+  TopoDS_Shape myValue;
 };
 
 #define TheKey TopoDS_Shape
@@ -120,9 +89,4 @@ TopoDS_Shape myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_0.cxx

@@ -15,10 +15,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -35,17 +36,28 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfOrientedShapeShape.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape::~GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape() {}
- 
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape",
@@ -57,7 +69,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfOrientedSha
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -71,17 +82,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape) Handle(GEOMAlgo_
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape() {}
 #define TheKey TopoDS_Shape
 #define TheKey_hxx <TopoDS_Shape.hxx>
 #define TheItem TopoDS_Shape
@@ -97,4 +107,3 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape::
 #define TCollection_DataMap GEOMAlgo_DataMapOfOrientedShapeShape
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
 #include <TCollection_DataMapNode.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
@@ -42,56 +41,26 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class GEOMAlgo_PassKey;
 class GEOMAlgo_PassKeyMapHasher;
 class GEOMAlgo_DataMapOfPassKeyInteger;
 class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger;
 
-
-
 class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger : public TCollection_MapNode {
 
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger
- // 
+  (const GEOMAlgo_PassKey& K, const Standard_Integer& I, const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger(const GEOMAlgo_PassKey& K,const Standard_Integer& I,const TCollection_MapNodePtr& n);
 
   GEOMAlgo_PassKey& Key() const;
-
   Standard_Integer& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)
 
 private: 
-
+  GEOMAlgo_PassKey myKey;
- // Methods PRIVATE
+  Standard_Integer myValue;
- // 
-
-
- // Fields PRIVATE
- //
-GEOMAlgo_PassKey myKey;
-Standard_Integer myValue;
-
-
 };
 
 #define TheKey GEOMAlgo_PassKey
@@ -126,9 +95,4 @@ Standard_Integer myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx

@@ -18,10 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -38,9 +39,22 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger::~GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger() {}
- 
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_Type_()
 {
@@ -80,11 +94,9 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger::Dyna
 { 
   return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger) ; 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger() {}
 #define TheKey GEOMAlgo_PassKey
 #define TheKey_hxx <GEOMAlgo_PassKey.hxx>
 #define TheItem Standard_Integer
@@ -100,4 +112,3 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger::Dyna
 #define TCollection_DataMap GEOMAlgo_DataMapOfPassKeyInteger
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfPassKeyInteger.hxx>
 #include <TCollection_DataMapNode.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx

@@ -15,7 +15,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
@@ -39,57 +38,27 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class GEOMAlgo_PassKeyShape;
 class TopoDS_Shape;
 class GEOMAlgo_PassKeyShapeMapHasher;
 class GEOMAlgo_DataMapOfPassKeyShapeShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape;
 
-
-
 class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape : public TCollection_MapNode {
 
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape
- // 
+  (const GEOMAlgo_PassKeyShape& K, const TopoDS_Shape& I, const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape(const GEOMAlgo_PassKeyShape& K,const TopoDS_Shape& I,const TCollection_MapNodePtr& n);
 
   GEOMAlgo_PassKeyShape& Key() const;
-
   TopoDS_Shape& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)
 
 private: 
-
+  GEOMAlgo_PassKeyShape myKey;
- // Methods PRIVATE
+  TopoDS_Shape myValue;
- // 
-
-
- // Fields PRIVATE
- //
-GEOMAlgo_PassKeyShape myKey;
-TopoDS_Shape myValue;
-
-
 };
 
 #define TheKey GEOMAlgo_PassKeyShape
@@ -124,9 +93,4 @@ TopoDS_Shape myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx

@@ -15,10 +15,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -38,17 +39,28 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape::~GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape() {}
- 
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape",
@@ -60,7 +72,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShap
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -74,17 +85,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape) Handle(GEOMAlgo_D
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape() {}
 #define TheKey GEOMAlgo_PassKeyShape
 #define TheKey_hxx <GEOMAlgo_PassKeyShape.hxx>
 #define TheItem TopoDS_Shape
@@ -100,4 +110,3 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape::D
 #define TCollection_DataMap GEOMAlgo_DataMapOfPassKeyShapeShape
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfPassKeyShapeShape.hxx>
 #include <TCollection_DataMapNode.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
@@ -42,56 +41,26 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopTools_ListOfShape;
 class TColStd_MapRealHasher;
 class GEOMAlgo_DataMapOfRealListOfShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape;
 
-
+class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape : public TCollection_MapNode
-
+{
-class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape : public TCollection_MapNode {
-
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape
- // 
+  (const Standard_Real& K,const TopTools_ListOfShape& I,const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape(const Standard_Real& K,const TopTools_ListOfShape& I,const TCollection_MapNodePtr& n);
 
   Standard_Real& Key() const;
-
   TopTools_ListOfShape& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)
 
 private: 
-
+  Standard_Real myKey;
- // Methods PRIVATE
+  TopTools_ListOfShape myValue;
- // 
-
-
- // Fields PRIVATE
- //
-Standard_Real myKey;
-TopTools_ListOfShape myValue;
-
-
 };
 
 #define TheKey Standard_Real
@@ -126,9 +95,4 @@ TopTools_ListOfShape myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx

@@ -18,10 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -38,17 +39,28 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape::~GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape() {}
- 
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape",
@@ -60,7 +72,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfRealListOfS
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -74,17 +85,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape) Handle(GEOMAlgo_Dat
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape() {}
 #define TheKey Standard_Real
 #define TheKey_hxx <Standard_Real.hxx>
 #define TheItem TopTools_ListOfShape
@@ -100,4 +110,3 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape::Dyn
 #define TCollection_DataMap GEOMAlgo_DataMapOfRealListOfShape
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfRealListOfShape.hxx>
 #include <TCollection_DataMapNode.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx

@@ -44,42 +44,27 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopoDS_Shape;
 class TopTools_MapOfShape;
 class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapeMapOfShape;
 class GEOMAlgo_DataMapIteratorOfDataMapOfShapeMapOfShape;
 
-
-
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape : public TCollection_MapNode {
 
 public:
+  GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape
+  (const TopoDS_Shape& K, const TopTools_MapOfShape& I, const TCollection_MapNodePtr& n);
 
-  
+  TopoDS_Shape& Key() const;
-      GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape(const TopoDS_Shape& K,const TopTools_MapOfShape& I,const TCollection_MapNodePtr& n);
+  TopTools_MapOfShape& Value() const;
-  
-        TopoDS_Shape& Key() const;
-  
-        TopTools_MapOfShape& Value() const;
-
-
-
 
   DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape)
 
-protected:
+private:
-
+  TopoDS_Shape myKey;
-
+  TopTools_MapOfShape myValue;
-
-
-private: 
-
-
-TopoDS_Shape myKey;
-TopTools_MapOfShape myValue;
-
-
 };
 
 #define TheKey TopoDS_Shape
@@ -114,8 +99,4 @@ TopTools_MapOfShape myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_0.cxx

@@ -21,6 +21,8 @@
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -42,15 +44,27 @@
 #endif
 
  
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape",
@@ -62,7 +76,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfS
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -76,17 +89,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape) Handle(GEOMAlgo_Dat
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeMapOfShape() {}
 #define TheKey TopoDS_Shape
 #define TheKey_hxx <TopoDS_Shape.hxx>
 #define TheItem TopTools_MapOfShape

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx

@@ -44,42 +44,27 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopoDS_Shape;
 class gp_Pnt;
 class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapePnt;
 class GEOMAlgo_DataMapIteratorOfDataMapOfShapePnt;
 
-
+class GEOMAlgo_DataMapNodeOfDataMapOfShapePnt : public TCollection_MapNode
-
+{
-class GEOMAlgo_DataMapNodeOfDataMapOfShapePnt : public TCollection_MapNode {
-
 public:
+  GEOMAlgo_DataMapNodeOfDataMapOfShapePnt
+  (const TopoDS_Shape& K, const gp_Pnt& I, const TCollection_MapNodePtr& n);
 
-  
+  TopoDS_Shape& Key() const;
-      GEOMAlgo_DataMapNodeOfDataMapOfShapePnt(const TopoDS_Shape& K,const gp_Pnt& I,const TCollection_MapNodePtr& n);
+  gp_Pnt& Value() const;
-  
-        TopoDS_Shape& Key() const;
-  
-        gp_Pnt& Value() const;
-
-
-
 
   DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt)
 
-protected:
-
-
-
-
 private: 
-
+  TopoDS_Shape myKey;
-
+  gp_Pnt myValue;
-TopoDS_Shape myKey;
-gp_Pnt myValue;
-
-
 };
 
 #define TheKey TopoDS_Shape
@@ -114,8 +99,4 @@ gp_Pnt myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_0.cxx

@@ -21,6 +21,8 @@
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapePnt.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -42,15 +44,27 @@
 #endif
 
  
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfShapePnt",
@@ -62,7 +76,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapePnt_Ty
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -76,17 +89,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt) Handle(GEOMAlgo_DataMapNod
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfShapePnt::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfShapePnt::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapePnt) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapePnt() {}
 #define TheKey TopoDS_Shape
 #define TheKey_hxx <TopoDS_Shape.hxx>
 #define TheItem gp_Pnt

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
@@ -42,56 +41,26 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopoDS_Shape;
 class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapeReal;
 class GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal;
 
-
+class GEOMAlgo_DataMapNodeOfDataMapOfShapeReal : public TCollection_MapNode
-
+{
-class GEOMAlgo_DataMapNodeOfDataMapOfShapeReal : public TCollection_MapNode {
-
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfShapeReal
- // 
+  (const TopoDS_Shape& K, const Standard_Real& I, const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfShapeReal(const TopoDS_Shape& K,const Standard_Real& I,const TCollection_MapNodePtr& n);
 
   TopoDS_Shape& Key() const;
-
   Standard_Real& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfShapeReal();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)
 
 private: 
-
+  TopoDS_Shape myKey;
- // Methods PRIVATE
+  Standard_Real myValue;
- // 
-
-
- // Fields PRIVATE
- //
-TopoDS_Shape myKey;
-Standard_Real myValue;
-
-
 };
 
 #define TheKey TopoDS_Shape
@@ -126,9 +95,4 @@ Standard_Real myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx

@@ -18,10 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -38,17 +39,28 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfShapeReal::~GEOMAlgo_DataMapNodeOfDataMapOfShapeReal() {}
- 
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfShapeReal",
@@ -60,7 +72,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_T
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -76,15 +87,14 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal) Handle(GEOMAlgo_DataMapNo
 
   return _anOtherObject ;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfShapeReal::DynamicType() const 
 { 
   return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal) ; 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfShapeReal::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal() {}
 #define TheKey TopoDS_Shape
 #define TheKey_hxx <TopoDS_Shape.hxx>
 #define TheItem Standard_Real

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
@@ -26,6 +25,9 @@
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #include <Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 #endif
@@ -42,57 +44,27 @@
 #ifndef _TCollection_MapNodePtr_HeaderFile
 #include <TCollection_MapNodePtr.hxx>
 #endif
+
 class TopoDS_Shape;
 class GEOMAlgo_ShapeSet;
 class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapOfShapeShapeSet;
 class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
 
-
+class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet : public TCollection_MapNode
-
+{
-class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet : public TCollection_MapNode {
-
 public:
- // Methods PUBLIC
+  GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet
- // 
+  (const TopoDS_Shape& K, const GEOMAlgo_ShapeSet& I, const TCollection_MapNodePtr& n);
-
-GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet(const TopoDS_Shape& K,const GEOMAlgo_ShapeSet& I,const TCollection_MapNodePtr& n);
 
   TopoDS_Shape& Key() const;
-
   GEOMAlgo_ShapeSet& Value() const;
-//Standard_EXPORT ~GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet();
-
-
-
-
- // Type management
- //
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- //Standard_EXPORT Standard_Boolean            IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
 
+  DEFINE_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)
 
 private: 
-
+  TopoDS_Shape myKey;
- // Methods PRIVATE
+  GEOMAlgo_ShapeSet myValue;
- // 
-
-
- // Fields PRIVATE
- //
-TopoDS_Shape myKey;
-GEOMAlgo_ShapeSet myValue;
-
-
 };
 
 #define TheKey TopoDS_Shape
@@ -127,9 +99,4 @@ GEOMAlgo_ShapeSet myValue;
 #undef TCollection_DataMap
 #undef TCollection_DataMap_hxx
 
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx

@@ -18,10 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #ifndef _Standard_TypeMismatch_HeaderFile
 #include <Standard_TypeMismatch.hxx>
 #endif
@@ -41,17 +42,28 @@
 #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_HeaderFile
 #include <GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx>
 #endif
-//GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet::~GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet() {}
  
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
 
+IMPLEMENT_STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
+  STANDARD_TYPE(TCollection_MapNode),
+  STANDARD_TYPE(MMgt_TShared),
+  STANDARD_TYPE(Standard_Transient),
+
+IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
+IMPLEMENT_STANDARD_TYPE_END(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)
+
+IMPLEMENT_DOWNCAST(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet,Standard_Transient)
+IMPLEMENT_STANDARD_RTTI(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)
+
+#else
 
 Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_Type_()
 {
-
+  static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(TCollection_MapNode);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
- 
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet",
@@ -63,7 +75,6 @@ Standard_EXPORT Handle_Standard_Type& GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeS
   return _aType;
 }
 
-
 // DownCast method
 //   allow safe downcasting
 //
@@ -77,17 +88,16 @@ const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet) Handle(GEOMAlgo_DataM
      }
   }
 
-  return _anOtherObject ;
+  return _anOtherObject;
 }
+
 const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet::DynamicType() const 
 { 
-  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet) ; 
+  return STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet); 
 }
-//Standard_Boolean GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet::IsKind(const Handle(Standard_Type)& AType) const 
+
-//{ 
+#endif
-//  return (STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet) == AType || TCollection_MapNode::IsKind(AType)); 
+
-//}
-//Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet::~Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet() {}
 #define TheKey TopoDS_Shape
 #define TheKey_hxx <TopoDS_Shape.hxx>
 #define TheItem GEOMAlgo_ShapeSet
@@ -103,4 +113,3 @@ const Handle(Standard_Type)& GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet::Dynam
 #define TCollection_DataMap GEOMAlgo_DataMapOfShapeShapeSet
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfShapeShapeSet.hxx>
 #include <TCollection_DataMapNode.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapOfOrientedShapeShape_0.cxx

@@ -15,7 +15,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
 
@@ -54,4 +53,3 @@
 #define TCollection_DataMap GEOMAlgo_DataMapOfOrientedShapeShape
 #define TCollection_DataMap_hxx <GEOMAlgo_DataMapOfOrientedShapeShape.hxx>
 #include <TCollection_DataMap.gxx>
-

src/GEOMAlgo/GEOMAlgo_DataMapOfShapeShapeSet.hxx

@@ -18,7 +18,6 @@
 // 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 _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
 #define _GEOMAlgo_DataMapOfShapeShapeSet_HeaderFile
@@ -35,6 +34,7 @@
 #ifndef _Standard_Boolean_HeaderFile
 #include <Standard_Boolean.hxx>
 #endif
+
 class Standard_DomainError;
 class Standard_NoSuchObject;
 class TopoDS_Shape;
@@ -43,7 +43,6 @@ class TopTools_ShapeMapHasher;
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
 class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
 
-
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
@@ -51,7 +50,6 @@ class GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet;
 #include <Standard_Macro.hxx>
 #endif
 
-
 class GEOMAlgo_DataMapOfShapeShapeSet  : public TCollection_BasicMap {
 
 public:
@@ -68,91 +66,44 @@ public:
       { 
         if (anAddress) Standard::Free((Standard_Address&)anAddress); 
       }
- // Methods PUBLIC
+
- // 
+  Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const Standard_Integer NbBuckets = 1);
 
 
-Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const Standard_Integer NbBuckets = 1);
+  Standard_EXPORT   GEOMAlgo_DataMapOfShapeShapeSet& Assign(const GEOMAlgo_DataMapOfShapeShapeSet& Other) ;
-
-
-Standard_EXPORT   GEOMAlgo_DataMapOfShapeShapeSet& Assign(const GEOMAlgo_DataMapOfShapeShapeSet& Other) ;
   GEOMAlgo_DataMapOfShapeShapeSet& operator =(const GEOMAlgo_DataMapOfShapeShapeSet& Other) 
-{
+  {
-  return Assign(Other);
+    return Assign(Other);
-}
+  }
 
+  Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
 
+  Standard_EXPORT   void Clear() ;
+  ~GEOMAlgo_DataMapOfShapeShapeSet()
+  {
+    Clear();
+  }
 
-Standard_EXPORT   void ReSize(const Standard_Integer NbBuckets) ;
+  Standard_EXPORT   Standard_Boolean Bind(const TopoDS_Shape& K,const GEOMAlgo_ShapeSet& I) ;
 
+  Standard_EXPORT   Standard_Boolean IsBound(const TopoDS_Shape& K) const;
 
-Standard_EXPORT   void Clear() ;
+  Standard_EXPORT   Standard_Boolean UnBind(const TopoDS_Shape& K) ;
-~GEOMAlgo_DataMapOfShapeShapeSet()
-{
-  Clear();
-}
 
+  Standard_EXPORT  const GEOMAlgo_ShapeSet& Find(const TopoDS_Shape& K) const;
+  const GEOMAlgo_ShapeSet& operator()(const TopoDS_Shape& K) const
+  {
+    return Find(K);
+  }
 
-
+  Standard_EXPORT   GEOMAlgo_ShapeSet& ChangeFind(const TopoDS_Shape& K) ;
-Standard_EXPORT   Standard_Boolean Bind(const TopoDS_Shape& K,const GEOMAlgo_ShapeSet& I) ;
-
-
-Standard_EXPORT   Standard_Boolean IsBound(const TopoDS_Shape& K) const;
-
-
-Standard_EXPORT   Standard_Boolean UnBind(const TopoDS_Shape& K) ;
-
-
-Standard_EXPORT  const GEOMAlgo_ShapeSet& Find(const TopoDS_Shape& K) const;
- const GEOMAlgo_ShapeSet& operator()(const TopoDS_Shape& K) const
-{
-  return Find(K);
-}
-
-
-
-Standard_EXPORT   GEOMAlgo_ShapeSet& ChangeFind(const TopoDS_Shape& K) ;
   GEOMAlgo_ShapeSet& operator()(const TopoDS_Shape& K) 
-{
+  {
-  return ChangeFind(K);
+    return ChangeFind(K);
-}
+  }
-
-
-
-
-
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
 
 private: 
-
+  Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& Other);
- // Methods PRIVATE
- // 
-
-
-Standard_EXPORT GEOMAlgo_DataMapOfShapeShapeSet(const GEOMAlgo_DataMapOfShapeShapeSet& Other);
-
-
- // Fields PRIVATE
- //
-
-
 };
 
-
-
-
-
-// other Inline functions and methods (like "C++: function call" methods)
-//
-
-
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape.hxx

@@ -15,58 +15,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)(const GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfOrientedShapeShape) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx

@@ -18,58 +18,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)(const GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx

@@ -15,58 +15,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)(const GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx

@@ -18,58 +18,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)(const GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx

@@ -18,58 +18,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeReal;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)(const GEOMAlgo_DataMapNodeOfDataMapOfShapeReal* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfShapeReal* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfShapeReal* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfShapeReal *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeReal) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx

@@ -18,58 +18,26 @@
 // 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 _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_HeaderFile
 
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
 #ifndef _Standard_HeaderFile
 #include <Standard.hxx>
 #endif
+#ifndef _Standard_DefineHandle_HeaderFile
+#include <Standard_DefineHandle.hxx>
+#endif
 
 #ifndef _Handle_TCollection_MapNode_HeaderFile
 #include <Handle_TCollection_MapNode.hxx>
 #endif
 
 class Standard_Transient;
-class Handle_Standard_Type;
+class Handle(Standard_Type);
 class Handle(TCollection_MapNode);
 class GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet);
 
-class Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet) : public Handle(TCollection_MapNode) {
+DEFINE_STANDARD_HANDLE(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet,TCollection_MapNode)
-  public:
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)():Handle(TCollection_MapNode)() {} 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)& aHandle) : Handle(TCollection_MapNode)(aHandle) 
-     {
-     }
 
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)(const GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet* anItem) : Handle(TCollection_MapNode)((TCollection_MapNode *)anItem) 
-     {
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)& operator=(const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)& operator=(const GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet* operator->() const
-     {
-      return (GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet *)ControlAccess();
-     }
-
-//   Standard_EXPORT ~Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet)();
- 
-   Standard_EXPORT static const Handle(GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet) DownCast(const Handle(Standard_Transient)& AnObject);
-};
 #endif

src/GEOMAlgo/Makefile.am

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
+
 # GEOM GEOMAlgo : tools for Glue Faces algorithm
 # File   : Makefile.am
 # Author : Julia DOROVSKIKH
@@ -360,6 +360,7 @@ salomeinclude_HEADERS =					\
 libGEOMAlgo_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
+	$(GUI_CXXFLAGS)		\
 	-I$(srcdir)/../NMTDS	\
 	-I$(srcdir)/../NMTTools
 

src/GEOMGUI/GEOM_Displayer.cxx

@@ -18,12 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GEOM_Displayer.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #include "GEOM_Displayer.h"
 
 #include "GeometryGUI.h"
@@ -48,6 +47,7 @@
 #include <SUIT_ViewManager.h>
 #include <SUIT_ResourceMgr.h>
 
+#include <CASCatch_OCCTVersion.hxx>
 
 #include <SalomeApp_Study.h>
 #include <SalomeApp_Application.h>
@@ -95,8 +95,12 @@
 #include CORBA_CLIENT_HEADER(SALOMEDS_Attributes)
 
 #include <GEOMImpl_Types.hxx>
-#include <Graphic3d_HArray1OfBytes.hxx>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
+#include <Graphic3d_HArray1OfBytes.hxx>
+#endif
 
 //================================================================
 // Function : getActiveStudy
@@ -114,7 +118,7 @@ static inline SalomeApp_Study* getActiveStudy()
 static inline int getViewManagerId( SALOME_View* theViewFrame) {
   SUIT_ViewModel* aModel = dynamic_cast<SUIT_ViewModel*>(theViewFrame);
   SUIT_ViewManager* aViewMgr = 0;
-  if(aModel != 0) 
+  if (aModel != 0)
     aViewMgr = aModel->getViewManager();
   return ((aViewMgr == 0) ? -1 :aViewMgr->getGlobalId());
 }
@@ -154,9 +158,9 @@ int GEOM_Displayer::getMinMaxShapeType( const TopoDS_Shape& shape, bool ismin )
       int stype = getMinMaxShapeType( sub_shape, ismin );
       if ( stype == TopAbs_SHAPE ) continue;
       if ( ismin && stype > ret )
-	ret = stype;
+        ret = stype;
       else if ( !ismin && ( ret < TopAbs_SOLID || stype < ret ) )
-	ret = stype;
+        ret = stype;
     }
   }
 
@@ -206,13 +210,13 @@ SUIT_SelectionFilter* GEOM_Displayer::getFilter( const int theMode )
 
 //================================================================
 // Function : getComplexFilter
-// Purpose  : Get compound filter corresponding to the type of 
+// Purpose  : Get compound filter corresponding to the type of
 //            object from GEOMImpl_Types.h
 //================================================================
 SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList<int>* aSubShapes)
 {
   GEOM_CompoundFilter* aFilter;
-  
+
   if(aSubShapes != NULL ) {
     aFilter = new GEOM_CompoundFilter(getStudy());
     QList<int> aTopAbsTypes;
@@ -224,7 +228,7 @@ SUIT_SelectionFilter* GEOM_Displayer::getComplexFilter( const QList<int>* aSubSh
     }
     aFilter->addSubTypes(aTopAbsTypes);
   }
-  
+
   return aFilter;
 }
 
@@ -355,7 +359,7 @@ void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO,
       int aMgrId = getViewManagerId(vf);
       SalomeApp_Study* aStudy = getStudy();
       aStudy->setObjectProperty(aMgrId, theIO->getEntry(), VISIBILITY_PROP, 1 );
-      
+
       setVisibilityState(theIO->getEntry(), Qtx::ShownState);
 
       delete prs;  // delete presentation because displayer is its owner
@@ -407,7 +411,7 @@ void GEOM_Displayer::Erase( const Handle(SALOME_InteractiveObject)& theIO,
       if ( updateViewer )
         vf->Repaint();
       delete prs;  // delete presentation because displayer is its owner
-      
+
       int aMgrId = getViewManagerId(vf);
       SalomeApp_Study* aStudy = getStudy();
       aStudy->setObjectProperty(aMgrId, theIO->getEntry(), VISIBILITY_PROP, 0 );
@@ -539,7 +543,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
   SOCC_Prs* occPrs = dynamic_cast<SOCC_Prs*>( prs );
   if ( !occPrs )
     return;
-  
+
   if ( myType == GEOM_MARKER && !myShape.IsNull() && myShape.ShapeType() == TopAbs_FACE )
   {
     TopoDS_Face aFace = TopoDS::Face( myShape );
@@ -595,29 +599,29 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
     {
       SalomeApp_Study* aStudy = getStudy();
       if(!aStudy)
-	return;
+        return;
       if ( !myShape.IsNull() ) {
 
-	bool onlyVertex = (myShape.ShapeType() == TopAbs_VERTEX || isCompoundOfVertices( myShape ));
+        bool onlyVertex = (myShape.ShapeType() == TopAbs_VERTEX || isCompoundOfVertices( myShape ));
 
-	QString anEntry;
+        QString anEntry;
-	int aMgrId = -1;
+        int aMgrId = -1;
-	if(!myIO.IsNull()) {
+        if(!myIO.IsNull()) {
-	  aMgrId = getViewManagerId(myViewFrame);
+          aMgrId = getViewManagerId(myViewFrame);
-	  anEntry = myIO->getEntry();
+          anEntry = myIO->getEntry();
-	}
+        }
-	bool useStudy = !anEntry.isEmpty() && aMgrId != -1;
+        bool useStudy = !anEntry.isEmpty() && aMgrId != -1;
-	bool useObjColor = false;
+        bool useObjColor = false;
-	bool useObjMarker = false;
+        bool useObjMarker = false;
-	
+
-	PropMap aPropMap;
+        PropMap aPropMap;
-	PropMap aDefPropMap;
+        PropMap aDefPropMap;
-	
+
-	if(useStudy){
+        if(useStudy){
-	  aPropMap = aStudy->getObjectPropMap(aMgrId,anEntry);
+          aPropMap = aStudy->getObjectPropMap(aMgrId,anEntry);
-	  aDefPropMap = getDefaultPropertyMap(SOCC_Viewer::Type());
+          aDefPropMap = getDefaultPropertyMap(SOCC_Viewer::Type());
-	  MergePropertyMaps(aPropMap, aDefPropMap);
+          MergePropertyMaps(aPropMap, aDefPropMap);
-	}
+        }
 
         //Handle(GEOM_AISShape) AISShape = new GEOM_AISShape( myShape, "" );
         Handle(GEOM_AISShape) AISShape;
@@ -633,41 +637,39 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
         AISShape->SetInfiniteState( myShape.Infinite() ); // || myShape.ShapeType() == TopAbs_VERTEX // VSR: 05/04/2010: Fix 20668 (Fit All for points & lines)
 
         // Setup shape properties here ..., e.g. display mode, color, transparency, etc
-	if(useStudy) {
+        if(useStudy) {
-	  AISShape->SetDisplayMode( aPropMap.value(DISPLAY_MODE_PROP).toInt() );
+          AISShape->SetDisplayMode( aPropMap.value(DISPLAY_MODE_PROP).toInt() );
-	  AISShape->SetDisplayVectors(aPropMap.value(VECTOR_MODE_PROP).toInt());
+          AISShape->SetDisplayVectors(aPropMap.value(VECTOR_MODE_PROP).toInt());
-
-	  //Color property
-	  if(aPropMap.contains(COLOR_PROP)) {
-	    Quantity_Color  quant_col = SalomeApp_Tools::color( aPropMap.value(COLOR_PROP).value<QColor>());
-	    AISShape->SetShadingColor( quant_col );
-	  } else 
-	    useObjColor = true;	  
-	}else {
-	  AISShape->SetDisplayMode( myDisplayMode );
-	  AISShape->SetShadingColor( myShadingColor );
-	}
-	
 
+          //Color property
+          if(aPropMap.contains(COLOR_PROP)) {
+            Quantity_Color  quant_col = SalomeApp_Tools::color( aPropMap.value(COLOR_PROP).value<QColor>());
+            AISShape->SetShadingColor( quant_col );
+          } else
+            useObjColor = true;
+        }else {
+          AISShape->SetDisplayMode( myDisplayMode );
+          AISShape->SetShadingColor( myShadingColor );
+        }
 
         // Set color and number for iso lines
         SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
         QColor col = aResMgr->colorValue( "Geometry", "isos_color",
                                           QColor(int(0.5*255), int(0.5*255), int(0.5*255)) );
         Quantity_Color aColor = SalomeApp_Tools::color( col );
-	
+
-	//get the ISOS number, set transparency if need
+        //get the ISOS number, set transparency if need
         int anUIsoNumber, aVIsoNumber;
-	if(useStudy) {
+        if(useStudy) {
-	  QString anIsos = aPropMap.value(ISOS_PROP).toString();
+          QString anIsos = aPropMap.value(ISOS_PROP).toString();
-	  QStringList uv =  anIsos.split(DIGIT_SEPARATOR);
+          QStringList uv =  anIsos.split(DIGIT_SEPARATOR);
-	  anUIsoNumber = uv[0].toInt();
+          anUIsoNumber = uv[0].toInt();
-	  aVIsoNumber = uv[1].toInt();
+          aVIsoNumber = uv[1].toInt();
-	  //AISShape->SetTransparency(aPropMap.value(TRANSPARENCY_PROP).toDouble());
+          //AISShape->SetTransparency(aPropMap.value(TRANSPARENCY_PROP).toDouble());
-	} else {
+        } else {
-	  anUIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_u", 1);
+          anUIsoNumber = aResMgr->integerValue("OCCViewer", "iso_number_u", 1);
-	  aVIsoNumber  = aResMgr->integerValue("OCCViewer", "iso_number_v", 1);
+          aVIsoNumber  = aResMgr->integerValue("OCCViewer", "iso_number_v", 1);
-	}
+        }
 
         Handle(Prs3d_IsoAspect) anAspect = AISShape->Attributes()->UIsoAspect();
         anAspect->SetNumber( anUIsoNumber );
@@ -684,36 +686,41 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
           AISShape->SetColor( (Quantity_NameOfColor)GetColor() );
           if ( onlyVertex )
           {
-	    if(aPropMap.contains(MARKER_TYPE_PROP)) {
+            if(aPropMap.contains(MARKER_TYPE_PROP)) {
-	      QStringList aList = aPropMap.value(MARKER_TYPE_PROP).toString().split(DIGIT_SEPARATOR);
+              QStringList aList = aPropMap.value(MARKER_TYPE_PROP).toString().split(DIGIT_SEPARATOR);
-	      if(aList.size() == 2) { //Standard marker string contains "TypeOfMarker:ScaleOfMarker"
+              if(aList.size() == 2) { //Standard marker string contains "TypeOfMarker:ScaleOfMarker"
-		Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
+                Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
-		int  aTypeOfMarker = aList[0].toInt();
+                int  aTypeOfMarker = aList[0].toInt();
-		double  aScaleOfMarker = aList[1].toDouble();
+                double  aScaleOfMarker = aList[1].toDouble();
-		anAspect->SetScale( aScaleOfMarker );
+                anAspect->SetScale( aScaleOfMarker );
-		anAspect->SetTypeOfMarker((Aspect_TypeOfMarker) (aTypeOfMarker-1) );
+                anAspect->SetTypeOfMarker((Aspect_TypeOfMarker) (aTypeOfMarker-1));
-		anAspect->SetColor( (Quantity_NameOfColor)GetColor() );
+                anAspect->SetColor((Quantity_NameOfColor)GetColor());
-		AISShape->Attributes()->SetPointAspect( anAspect );
+                AISShape->Attributes()->SetPointAspect(anAspect);
-	      } else { //Custom marker string contains "IdOfTexsture"
+              } else { //Custom marker string contains "IdOfTexsture"
-		int textureId = aList[0].toInt();
+                int textureId = aList[0].toInt();
-		Standard_Integer aWidth, aHeight;
+                Standard_Integer aWidth, aHeight;
-		Handle(Graphic3d_HArray1OfBytes) aTexture = GeometryGUI::getTexture( aStudy, textureId, aWidth, aHeight );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
-		if ( !aTexture.IsNull() ) {
+                Handle(TColStd_HArray1OfByte) aTexture =
-		  static int TextureId = 0;
+#else
-		  Handle(Prs3d_PointAspect) aTextureAspect = new Prs3d_PointAspect((Quantity_NameOfColor)GetColor(),
+                Handle(Graphic3d_HArray1OfBytes) aTexture =
-										   ++TextureId,
+#endif
-										   aWidth, aHeight,										   
+                  GeometryGUI::getTexture(aStudy, textureId, aWidth, aHeight);
-										   aTexture );
+                if (!aTexture.IsNull()) {
-		  AISShape->Attributes()->SetPointAspect( aTextureAspect );
+                  static int TextureId = 0;
-		  
+                  Handle(Prs3d_PointAspect) aTextureAspect =
-		} else {
+                    new Prs3d_PointAspect ((Quantity_NameOfColor)GetColor(),
-		  useObjMarker = true;
+                                           ++TextureId,
-		}
+                                           aWidth, aHeight,
-	      }
+                                           aTexture);
-	    } else {
+                  AISShape->Attributes()->SetPointAspect(aTextureAspect);
-	      useObjMarker = true;
+                } else {
-	    }	    
+                  useObjMarker = true;
-	  }
+                }
+              }
+            } else {
+              useObjMarker = true;
+            }
+          }
         }
         else
         {
@@ -722,79 +729,80 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
             col = aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) );
             aColor = SalomeApp_Tools::color( col );
 
-	    if(aPropMap.contains(MARKER_TYPE_PROP)) {
+            if(aPropMap.contains(MARKER_TYPE_PROP)) {
-	      QStringList aList = aPropMap.value(MARKER_TYPE_PROP).toString().split(DIGIT_SEPARATOR);
+              QStringList aList = aPropMap.value(MARKER_TYPE_PROP).toString().split(DIGIT_SEPARATOR);
-	      if(aList.size() == 2) { //Standard marker string contains "TypeOfMarker:ScaleOfMarker"
+              if(aList.size() == 2) { //Standard marker string contains "TypeOfMarker:ScaleOfMarker"
-		int  aTypeOfMarker = aList[0].toInt();
+                int  aTypeOfMarker = aList[0].toInt();
-		double  aScaleOfMarker = aList[1].toDouble();
+                double  aScaleOfMarker = aList[1].toDouble();
-		Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
+                Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
-		anAspect->SetScale( aScaleOfMarker );
+                anAspect->SetScale( aScaleOfMarker );
-		anAspect->SetTypeOfMarker((Aspect_TypeOfMarker) (aTypeOfMarker-1) );
+                anAspect->SetTypeOfMarker((Aspect_TypeOfMarker) (aTypeOfMarker-1) );
-		anAspect->SetColor( aColor );
+                anAspect->SetColor( aColor );
-		AISShape->Attributes()->SetPointAspect( anAspect );
+                AISShape->Attributes()->SetPointAspect( anAspect );
-	      } else { //Custom marker string contains "IdOfTexsture"
+              } else { //Custom marker string contains "IdOfTexsture"
-		int textureId = aList[0].toInt();
+                int textureId = aList[0].toInt();
-		Standard_Integer aWidth, aHeight;
+                Standard_Integer aWidth, aHeight;
-		Handle(Graphic3d_HArray1OfBytes) aTexture = GeometryGUI::getTexture( aStudy, textureId, aWidth, aHeight );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
-		if ( !aTexture.IsNull() ) {
+                Handle(TColStd_HArray1OfByte) aTexture =
-		  static int TextureId = 0;
+#else
-		  Handle(Prs3d_PointAspect) aTextureAspect = new Prs3d_PointAspect(aColor,
+                Handle(Graphic3d_HArray1OfBytes) aTexture =
-										   ++TextureId,
+#endif
-										   aWidth, aHeight,										   
+                  GeometryGUI::getTexture(aStudy, textureId, aWidth, aHeight);
-										   aTexture );
+                if (!aTexture.IsNull()) {
-		  AISShape->Attributes()->SetPointAspect( aTextureAspect );
+                  static int TextureId = 0;
-		  
+                  Handle(Prs3d_PointAspect) aTextureAspect =
-		} else {
+                    new Prs3d_PointAspect (aColor, ++TextureId, aWidth, aHeight, aTexture);
-		  useObjMarker = true;
+                  AISShape->Attributes()->SetPointAspect( aTextureAspect );
-		}
+                } else {
-	      }
+                  useObjMarker = true;
-	    } else {
+                }
-	      useObjMarker = true;
+              }
-	    }       
+            } else {
-	  }
+              useObjMarker = true;
-          else
+            }
-          {
+          }
+          else {
             // Set line aspect
             col = aResMgr->colorValue( "Geometry", "wireframe_color", QColor( 255, 255, 0 ) );
             aColor = SalomeApp_Tools::color( col );
-            
+
             Handle(Prs3d_LineAspect) anAspect = AISShape->Attributes()->LineAspect();
             anAspect->SetColor( aColor );
             AISShape->Attributes()->SetLineAspect( anAspect );
-            
+
             // Set unfree boundaries aspect
             anAspect = AISShape->Attributes()->UnFreeBoundaryAspect();
             anAspect->SetColor( aColor );
             AISShape->Attributes()->SetUnFreeBoundaryAspect( anAspect );
-            
+
             // Set free boundaries aspect
             col = aResMgr->colorValue( "Geometry", "free_bound_color", QColor( 0, 255, 0 ) );
             aColor = SalomeApp_Tools::color( col );
-            
+
             anAspect = AISShape->Attributes()->FreeBoundaryAspect();
             anAspect->SetColor( aColor );
             AISShape->Attributes()->SetFreeBoundaryAspect( anAspect );
-            
+
             // Set wire aspect
             col = aResMgr->colorValue( "Geometry", "line_color", QColor( 255, 0, 0 ) );
             aColor = SalomeApp_Tools::color( col );
-            
+
             anAspect = AISShape->Attributes()->WireAspect();
             anAspect->SetColor( aColor );
             AISShape->Attributes()->SetWireAspect( anAspect );
-            
+
             // bug [SALOME platform 0019868]
             // Set deviation angle. Default one is 12 degrees (Prs3d_Drawer.cxx:18)
             //AISShape->SetOwnDeviationAngle( 10*PI/180 );
 
             // IMP 0020626
             double aDC = 0;
-	    if(useStudy) {
+            if(useStudy) {
-	      aDC = aPropMap.value(DEFLECTION_COEFF_PROP).toDouble();
+              aDC = aPropMap.value(DEFLECTION_COEFF_PROP).toDouble();
-	    }
+            }
-	    else {
+            else {
-	      aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001);
+              aDC = aResMgr->doubleValue("Geometry", "deflection_coeff", 0.001);
-	    }
+            }
 
             aDC = std::max( aDC, DEFLECTION_MIN ); // to avoid to small values of the coefficient
             AISShape->SetOwnDeviationCoefficient(aDC);
@@ -821,81 +829,84 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
           AISShape->SetOwner( anObj );
         }
 
-	Handle( SALOME_InteractiveObject ) anIO = AISShape->getIO();
+        Handle( SALOME_InteractiveObject ) anIO = AISShape->getIO();
-	if ( !anIO.IsNull() ) {
+        if ( !anIO.IsNull() ) {
-	  _PTR(SObject) SO ( aStudy->studyDS()->FindObjectID( anIO->getEntry() ) );
+          _PTR(SObject) SO ( aStudy->studyDS()->FindObjectID( anIO->getEntry() ) );
-	  if ( SO ) {
+          if ( SO ) {
-	    // get CORBA reference to data object
+            // get CORBA reference to data object
-	    CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO);
+            CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO);
-	    if ( !CORBA::is_nil( object ) ) {
+            if ( !CORBA::is_nil( object ) ) {
-	      // downcast to GEOM object
+              // downcast to GEOM object
-	      GEOM::GEOM_Object_var aGeomObject = GEOM::GEOM_Object::_narrow( object );
+              GEOM::GEOM_Object_var aGeomObject = GEOM::GEOM_Object::_narrow( object );
-	      bool hasColor = false;
+              bool hasColor = false;
-	      SALOMEDS::Color aSColor = getColor(aGeomObject,hasColor);
+              SALOMEDS::Color aSColor = getColor(aGeomObject,hasColor);
-	      if( hasColor && useObjColor) {
+              if( hasColor && useObjColor) {
-		Quantity_Color aQuanColor( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
+                Quantity_Color aQuanColor( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
-		AISShape->SetColor( aQuanColor );
+                AISShape->SetColor( aQuanColor );
-		AISShape->SetShadingColor( aQuanColor );
+                AISShape->SetShadingColor( aQuanColor );
-		if ( onlyVertex ) {
+                if ( onlyVertex ) {
-		  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
+                  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
-		  anAspect->SetColor( aQuanColor );
+                  anAspect->SetColor( aQuanColor );
-		  anAspect->SetScale( myScaleOfMarker );
+                  anAspect->SetScale( myScaleOfMarker );
-		  anAspect->SetTypeOfMarker( myTypeOfMarker );
+                  anAspect->SetTypeOfMarker( myTypeOfMarker );
-		  AISShape->Attributes()->SetPointAspect( anAspect );
+                  AISShape->Attributes()->SetPointAspect( anAspect );
-		}
+                }
-	      } else if(!hasColor) {
+              } else if(!hasColor) {
-		//In case if color wasn't defined in the property map of the object 
+                //In case if color wasn't defined in the property map of the object
-		//and GEOM_Object color also wasn't defined get default color from Resource Mgr.
+                //and GEOM_Object color also wasn't defined get default color from Resource Mgr.
-		QColor col = aResMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
+                QColor col = aResMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
-		Quantity_Color aQuanColor = SalomeApp_Tools::color( col );
+                Quantity_Color aQuanColor = SalomeApp_Tools::color( col );
-		AISShape->SetShadingColor( aQuanColor );
+                AISShape->SetShadingColor( aQuanColor );
-		aStudy->setObjectProperty( aMgrId, anIO->getEntry(), COLOR_PROP, col );
+                aStudy->setObjectProperty( aMgrId, anIO->getEntry(), COLOR_PROP, col );
-	      }
+              }
 
-	      // ... marker type
+              // ... marker type
-	      if(useObjMarker) {
+              if(useObjMarker) {
-		GEOM::marker_type aType = aGeomObject->GetMarkerType();
+                GEOM::marker_type aType = aGeomObject->GetMarkerType();
-		GEOM::marker_size aSize = aGeomObject->GetMarkerSize();
+                GEOM::marker_size aSize = aGeomObject->GetMarkerSize();
-		if ( aType > GEOM::MT_NONE && aType < GEOM::MT_USER && aSize > GEOM::MS_NONE && aSize <= GEOM::MS_70 ) {
+                if ( aType > GEOM::MT_NONE && aType < GEOM::MT_USER && aSize > GEOM::MS_NONE && aSize <= GEOM::MS_70 ) {
-		  Aspect_TypeOfMarker aMType = (Aspect_TypeOfMarker)( (int)aType-1 );
+                  Aspect_TypeOfMarker aMType = (Aspect_TypeOfMarker)( (int)aType-1 );
-		  double aMSize = ((int)aSize+1)*0.5;
+                  double aMSize = ((int)aSize+1)*0.5;
-		  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
+                  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
-		  anAspect->SetScale( aMSize );
+                  anAspect->SetScale( aMSize );
-		  anAspect->SetTypeOfMarker( aMType );
+                  anAspect->SetTypeOfMarker( aMType );
-		  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
+                  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
-		  if ( hasColor )
+                  if ( hasColor )
-		    aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
+                    aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
-		  anAspect->SetColor( aQuanColor );
+                  anAspect->SetColor( aQuanColor );
-		  AISShape->Attributes()->SetPointAspect( anAspect );
+                  AISShape->Attributes()->SetPointAspect( anAspect );
-		}
+                }
-		else if ( aType == GEOM::MT_USER ) {
+                else if ( aType == GEOM::MT_USER ) {
-		  int aTextureId = aGeomObject->GetMarkerTexture();
+                  int aTextureId = aGeomObject->GetMarkerTexture();
-		  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
+                  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
-		  if ( hasColor ) aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
+                  if ( hasColor ) aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
-		  Standard_Integer aWidth, aHeight;
+                  Standard_Integer aWidth, aHeight;
-		  Handle(Graphic3d_HArray1OfBytes) aTexture = GeometryGUI::getTexture( getStudy(), aTextureId, aWidth, aHeight );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
-		  if ( !aTexture.IsNull() ) {
+                  Handle(TColStd_HArray1OfByte) aTexture =
-		    static int TextureId = 0;
+#else
-		    Handle(Prs3d_PointAspect) aTextureAspect = new Prs3d_PointAspect(aQuanColor,
+                  Handle(Graphic3d_HArray1OfBytes) aTexture =
-										     ++TextureId,
+#endif
-										     aWidth, aHeight,
+                    GeometryGUI::getTexture(getStudy(), aTextureId, aWidth, aHeight);
-										     aTexture );
+                  if (!aTexture.IsNull()) {
-		    AISShape->Attributes()->SetPointAspect( aTextureAspect );
+                    static int TextureId = 0;
-		  }
+                    Handle(Prs3d_PointAspect) aTextureAspect =
-		} else { //Use marker from the preferences
+                      new Prs3d_PointAspect(aQuanColor, ++TextureId, aWidth, aHeight, aTexture );
-		  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
+                    AISShape->Attributes()->SetPointAspect( aTextureAspect );
-		  anAspect->SetScale( myScaleOfMarker );
+                  }
-		  anAspect->SetTypeOfMarker( myTypeOfMarker );
+                } else { //Use marker from the preferences
-		  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
+                  Handle(Prs3d_PointAspect) anAspect = AISShape->Attributes()->PointAspect();
-		  if ( hasColor )
+                  anAspect->SetScale( myScaleOfMarker );
-		    aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
+                  anAspect->SetTypeOfMarker( myTypeOfMarker );
-		  anAspect->SetColor( aQuanColor );
+                  Quantity_Color aQuanColor = SalomeApp_Tools::color( aResMgr->colorValue( "Geometry", "point_color", QColor( 255, 255, 0 ) ) );
-		  AISShape->Attributes()->SetPointAspect( anAspect );		
+                  if ( hasColor )
-		}
+                    aQuanColor = Quantity_Color( aSColor.R, aSColor.G, aSColor.B, Quantity_TOC_RGB );
-	      }
+                  anAspect->SetColor( aQuanColor );
-	    }
+                  AISShape->Attributes()->SetPointAspect( anAspect );
-	  }
+                }
-	}
+              }
+            }
+          }
+        }
         // AISShape->SetName(???); ??? necessary to set name ???
         occPrs->AddObject( AISShape );
 
@@ -949,7 +960,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
 
   if ( !vtkPrs || myShape.IsNull() || !aStudy)
     return;
-  
+
   bool useStudy = false;
   PropMap aPropMap;
 
@@ -958,7 +969,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
   if ( myType == GEOM_MARKER && myShape.ShapeType() == TopAbs_FACE ) {
     //myToActivate = false; // ouv: commented to make the trihedron pickable (see IPAL18657)
     GEOM_VTKTrihedron* aTrh = GEOM_VTKTrihedron::New();
-    
+
     if ( HasColor() ) {
       Quantity_Color aColor( (Quantity_NameOfColor)GetColor() );
       aTrh->SetColor( aColor.Red(), aColor.Green(), aColor.Blue() );
@@ -971,7 +982,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
 
     gp_Ax2 anAx2 = aPlane->Pln().Position().Ax2();
     aTrh->SetPlacement( new Geom_Axis2Placement( anAx2 ) );
-    
+
     //    if ( SVTK_Viewer* vf = dynamic_cast<SVTK_Viewer*>( GetActiveView() ) )
     //      aTrh->SetSize( 0.5 * vf->GetTrihedronSize() );
 
@@ -990,13 +1001,13 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
     }
     useStudy = !anEntry.isEmpty() && aMgrId != -1;
 
-    
+
     theActors = vtkActorCollection::New();
     GEOM_Actor* aGeomActor = GEOM_Actor::New();
     aGeomActor->SetShape(myShape,aDefPropMap.value(DEFLECTION_COEFF_PROP).toDouble(),myType == GEOM_VECTOR);
     theActors->AddItem(aGeomActor);
     aGeomActor->Delete();
-    
+
     if(useStudy) {
       aPropMap = aStudy->getObjectPropMap(aMgrId,anEntry);
       MergePropertyMaps(aPropMap, aDefPropMap);
@@ -1004,11 +1015,11 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
   }
 
   theActors->InitTraversal();
-  
+
   vtkActor* anActor = (vtkActor*)theActors->GetNextActor();
-  
+
   vtkProperty* aProp = 0;
-  
+
   if ( HasColor() || HasWidth() )
   {
     aProp = vtkProperty::New();
@@ -1037,57 +1048,57 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
       GActor->SetProperty( aProp );
       GActor->SetPreviewProperty( aProp );
     }
-    
+
     GEOM_Actor* aGeomGActor = GEOM_Actor::SafeDownCast( anActor );
     if ( aGeomGActor != 0 )
       {
-	if ( aProp ) {
+        if ( aProp ) {
-	  aGeomGActor->SetShadingProperty( aProp );
+          aGeomGActor->SetShadingProperty( aProp );
-	  aGeomGActor->SetWireframeProperty( aProp );
+          aGeomGActor->SetWireframeProperty( aProp );
-	}
+        }
-	int aIsos[2]= { 1, 1 };
+        int aIsos[2]= { 1, 1 };
-	if(useStudy) {
+        if(useStudy) {
-	  QString anIsos = aPropMap.value(ISOS_PROP).toString();
+          QString anIsos = aPropMap.value(ISOS_PROP).toString();
-	  QStringList uv =  anIsos.split(DIGIT_SEPARATOR);
+          QStringList uv =  anIsos.split(DIGIT_SEPARATOR);
-	  aIsos[0] = uv[0].toInt(); aIsos[1] = uv[1].toInt();
+          aIsos[0] = uv[0].toInt(); aIsos[1] = uv[1].toInt();
-	  aGeomGActor->SetNbIsos(aIsos);
+          aGeomGActor->SetNbIsos(aIsos);
-	  aGeomGActor->SetOpacity(1.0 - aPropMap.value(TRANSPARENCY_PROP).toDouble());
+          aGeomGActor->SetOpacity(1.0 - aPropMap.value(TRANSPARENCY_PROP).toDouble());
-	  aGeomGActor->SetVectorMode(aPropMap.value(VECTOR_MODE_PROP).toInt());
+          aGeomGActor->SetVectorMode(aPropMap.value(VECTOR_MODE_PROP).toInt());
-	  aGeomGActor->setDisplayMode(aPropMap.value(DISPLAY_MODE_PROP).toInt());
+          aGeomGActor->setDisplayMode(aPropMap.value(DISPLAY_MODE_PROP).toInt());
-	  aGeomGActor->SetDeflection(aPropMap.value(DEFLECTION_COEFF_PROP).toDouble()); 
+          aGeomGActor->SetDeflection(aPropMap.value(DEFLECTION_COEFF_PROP).toDouble());
 
-	  vtkFloatingPointType aColor[3] = {1.,0.,0.};
+          vtkFloatingPointType aColor[3] = {1.,0.,0.};
-	  if(aPropMap.contains(COLOR_PROP)) {
+          if(aPropMap.contains(COLOR_PROP)) {
-	    QColor c = aPropMap.value(COLOR_PROP).value<QColor>();
+            QColor c = aPropMap.value(COLOR_PROP).value<QColor>();
-	    aColor[0] = c.red()/255.; aColor[1] = c.green()/255.; aColor[2] = c.blue()/255.;
+            aColor[0] = c.red()/255.; aColor[1] = c.green()/255.; aColor[2] = c.blue()/255.;
-	  } else { //Get Color from geom object
+          } else { //Get Color from geom object
-	    Handle( SALOME_InteractiveObject ) anIO = aGeomGActor->getIO();
+            Handle( SALOME_InteractiveObject ) anIO = aGeomGActor->getIO();
-	    if ( !anIO.IsNull() ) {
+            if ( !anIO.IsNull() ) {
-	      _PTR(SObject) SO ( aStudy->studyDS()->FindObjectID( anIO->getEntry() ) );
+              _PTR(SObject) SO ( aStudy->studyDS()->FindObjectID( anIO->getEntry() ) );
-	      if ( SO ) {
+              if ( SO ) {
-		// get CORBA reference to data object
+                // get CORBA reference to data object
-		CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO);
+                CORBA::Object_var object = GeometryGUI::ClientSObjectToObject(SO);
-		if ( !CORBA::is_nil( object ) ) {
+                if ( !CORBA::is_nil( object ) ) {
-		  // downcast to GEOM object
+                  // downcast to GEOM object
-		  GEOM::GEOM_Object_var aGeomObject = GEOM::GEOM_Object::_narrow( object );
+                  GEOM::GEOM_Object_var aGeomObject = GEOM::GEOM_Object::_narrow( object );
-		  bool hasColor = false;
+                  bool hasColor = false;
-		  SALOMEDS::Color aSColor = getColor(aGeomObject,hasColor);
+                  SALOMEDS::Color aSColor = getColor(aGeomObject,hasColor);
-		  if(hasColor) {
+                  if(hasColor) {
-		    aColor[0] = aSColor.R; aColor[1] = aSColor.G; aColor[2] = aSColor.B;
+                    aColor[0] = aSColor.R; aColor[1] = aSColor.G; aColor[2] = aSColor.B;
-		  } else {
+                  } else {
-		    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
+                    SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-		    if(aResMgr) {
+                    if(aResMgr) {
-		      QColor c = aResMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
+                      QColor c = aResMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
-		      aColor[0] = c.red()/255.; aColor[1] = c.green()/255.; aColor[2] = c.blue()/255.;
+                      aColor[0] = c.red()/255.; aColor[1] = c.green()/255.; aColor[2] = c.blue()/255.;
-		      aStudy->setObjectProperty( aMgrId, anIO->getEntry(), COLOR_PROP, c );
+                      aStudy->setObjectProperty( aMgrId, anIO->getEntry(), COLOR_PROP, c );
-		    }
+                    }
-		  }
+                  }
-		}
+                }
-	      }
+              }
-	    }
+            }
-	  }
+          }
-	  aGeomGActor->SetColor(aColor[0],aColor[1],aColor[2]);
+          aGeomGActor->SetColor(aColor[0],aColor[1],aColor[2]);
-	}
+        }
       }
 
     if ( myToActivate )
@@ -1367,10 +1378,10 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
   if ( theModes.Extent() == 1 )
     {
       int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key();
-      
+
       if ( aMode == GEOM_COMPOUNDFILTER )
         aFilter = getComplexFilter( theSubShapes );
-      else    
+      else
         aFilter = getFilter( aMode );
     }
   else if ( theModes.Extent() > 1 )
@@ -1384,7 +1395,7 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
           int aMode = anIter.Key();
           if ( aMode == GEOM_COMPOUNDFILTER )
             aFilter = getComplexFilter( theSubShapes );
-          else    
+          else
             aFilter = getFilter( aMode );
 
           if ( aFilter )
@@ -1457,14 +1468,14 @@ void GEOM_Displayer::AfterDisplay( SALOME_View* v, const SALOME_OCCPrs* p )
       AIS_ListIteratorOfListOfInteractive it( objects );
       for ( ; it.More(); it.Next() ) {
         Handle(GEOM_AISShape) sh = Handle(GEOM_AISShape)::DownCast( it.Value() );
-	if ( sh.IsNull() ) continue;
+        if ( sh.IsNull() ) continue;
-	Handle(SALOME_InteractiveObject) IO = sh->getIO();
+        Handle(SALOME_InteractiveObject) IO = sh->getIO();
-	if ( IO.IsNull() ) continue;
+        if ( IO.IsNull() ) continue;
-	PropMap aPropMap = aStudy->getObjectPropMap( aMgrId, IO->getEntry() );
+        PropMap aPropMap = aStudy->getObjectPropMap( aMgrId, IO->getEntry() );
-	if ( aPropMap.contains( TRANSPARENCY_PROP ) ) {
+        if ( aPropMap.contains( TRANSPARENCY_PROP ) ) {
-	  double transparency = aPropMap.value(TRANSPARENCY_PROP).toDouble();
+          double transparency = aPropMap.value(TRANSPARENCY_PROP).toDouble();
-	  ic->SetTransparency( sh, transparency, true );
+          ic->SetTransparency( sh, transparency, true );
-	}
+        }
       }
     }
   }
@@ -1501,7 +1512,7 @@ bool GEOM_Displayer::HasColor() const
 void GEOM_Displayer::UnsetColor()
 {
   myColor = -1;
-  
+
   SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
   QColor col = resMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
   myShadingColor = SalomeApp_Tools::color( col );
@@ -1686,8 +1697,8 @@ SALOMEDS::Color GEOM_Displayer::getUniqueColor( const QList<SALOMEDS::Color>& th
 
 PropMap GEOM_Displayer::getDefaultPropertyMap(const QString& viewer_type) {
   PropMap aDefaultMap;
-  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();    
+  SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
-  //1. Visibility 
+  //1. Visibility
   aDefaultMap.insert(VISIBILITY_PROP , 1);
 
   //2. Nb Isos
@@ -1712,11 +1723,11 @@ PropMap GEOM_Displayer::getDefaultPropertyMap(const QString& viewer_type) {
 
   //5. Vector Mode
   aDefaultMap.insert( VECTOR_MODE_PROP , 0);
-  
+
   //6. Color
   QColor col = aResMgr->colorValue( "Geometry", "shading_color", QColor( 255, 0, 0 ) );
   aDefaultMap.insert( COLOR_PROP , col);
-    
+
   //7. Deflection Coeff
   double aDC;
 
@@ -1770,44 +1781,44 @@ SALOMEDS::Color GEOM_Displayer::getColor(GEOM::GEOM_Object_var theGeomObject, bo
 
   if ( app && !theGeomObject->_is_nil()) {
     SalomeApp_Study* study = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
-    
+
     if ( study ) {
       aSColor = theGeomObject->GetColor();
       hasColor = aSColor.R >= 0 && aSColor.G >= 0 && aSColor.B >= 0;
       if( !hasColor && theGeomObject->GetType() == GEOM_GROUP ) { // auto color for group
-	GEOM::GEOM_Gen_var theGeomGen = GeometryGUI::GetGeomGen();
+        GEOM::GEOM_Gen_var theGeomGen = GeometryGUI::GetGeomGen();
-	GEOM::GEOM_IGroupOperations_var anOperations = theGeomGen->GetIGroupOperations( study->id() );
+        GEOM::GEOM_IGroupOperations_var anOperations = theGeomGen->GetIGroupOperations( study->id() );
-	GEOM::GEOM_Object_var aMainObject = anOperations->GetMainShape( theGeomObject );
+        GEOM::GEOM_Object_var aMainObject = anOperations->GetMainShape( theGeomObject );
-	if ( !aMainObject->_is_nil() && aMainObject->GetAutoColor() )
+        if ( !aMainObject->_is_nil() && aMainObject->GetAutoColor() )
-	  {
+          {
-	    QList<SALOMEDS::Color> aReservedColors;
+            QList<SALOMEDS::Color> aReservedColors;
-	    
+
-	    SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( app );
+            SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( app );
-	    CORBA::String_var IOR = app->orb()->object_to_string( aMainObject );
+            CORBA::String_var IOR = app->orb()->object_to_string( aMainObject );
-	    if ( strcmp(IOR.in(), "") != 0 )
+            if ( strcmp(IOR.in(), "") != 0 )
-	      {
+              {
-		_PTR(Study) aStudy = study->studyDS();
+                _PTR(Study) aStudy = study->studyDS();
-		_PTR(SObject) aMainSObject( aStudy->FindObjectIOR( std::string(IOR) ) );
+                _PTR(SObject) aMainSObject( aStudy->FindObjectIOR( std::string(IOR) ) );
-		_PTR(ChildIterator) it( aStudy->NewChildIterator( aMainSObject ) );
+                _PTR(ChildIterator) it( aStudy->NewChildIterator( aMainSObject ) );
-		for( ; it->More(); it->Next() )
+                for( ; it->More(); it->Next() )
-		  {
+                  {
-		    _PTR(SObject) aChildSObject( it->Value() );
+                    _PTR(SObject) aChildSObject( it->Value() );
-		    GEOM::GEOM_Object_var aChildObject =
+                    GEOM::GEOM_Object_var aChildObject =
-		      GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aChildSObject));
+                      GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aChildSObject));
-		    if( CORBA::is_nil( aChildObject ) )
+                    if( CORBA::is_nil( aChildObject ) )
-		      continue;
+                      continue;
-		    
+
-		    if( aChildObject->GetType() != GEOM_GROUP )
+                    if( aChildObject->GetType() != GEOM_GROUP )
-		      continue;
+                      continue;
-		    
+
-		    SALOMEDS::Color aReservedColor = aChildObject->GetColor();
+                    SALOMEDS::Color aReservedColor = aChildObject->GetColor();
-		    aReservedColors.append( aReservedColor );
+                    aReservedColors.append( aReservedColor );
-		  }
+                  }
-	      }
+              }
-	    
+
-	    aSColor = getUniqueColor( aReservedColors );
+            aSColor = getUniqueColor( aReservedColors );
-	    hasColor = true;
+            hasColor = true;
-	  }
+          }
       }
     }
   }
@@ -1816,7 +1827,7 @@ SALOMEDS::Color GEOM_Displayer::getColor(GEOM::GEOM_Object_var theGeomObject, bo
 
 
 void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& theIO,
-				       const bool eraseOnlyChildren) {
+                                       const bool eraseOnlyChildren) {
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
   if ( !app )
     return;
@@ -1826,7 +1837,7 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
     return;
 
   LightApp_DataObject* parent = appStudy->findObjectByEntry(theIO->getEntry());
-  
+
   if( !parent)
     return;
 
@@ -1838,13 +1849,13 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
   foreach ( vman, vmans ) {
     SUIT_ViewModel* vmod = vman->getViewModel();
     view = dynamic_cast<SALOME_View*> ( vmod );
-    if ( view ) 
+    if ( view )
       views.append( view );
   }
-  
+
   if( views.count() == 0 )
     return;
-  
+
   //Erase childrens w/o update views
   DataObjectList listObj = parent->children( true );
   SUIT_DataObject* obj;
@@ -1852,12 +1863,12 @@ void GEOM_Displayer::EraseWithChildren(const Handle(SALOME_InteractiveObject)& t
     LightApp_DataObject* l_obj = dynamic_cast<LightApp_DataObject*>(obj);
     if(l_obj)
       foreach ( view, views ) {
-      Handle(SALOME_InteractiveObject) anIO = 
+      Handle(SALOME_InteractiveObject) anIO =
-	new SALOME_InteractiveObject(qPrintable(l_obj->entry()), "GEOM", "");
+        new SALOME_InteractiveObject(qPrintable(l_obj->entry()), "GEOM", "");
       Erase(anIO, false, false, view);
     }
   }
-  
+
   //Erase parent with view update or repaint views
   foreach ( view, views ) {
     if(!eraseOnlyChildren)

src/GEOMGUI/GeometryGUI.cxx

@@ -68,6 +68,8 @@
 #include <SALOMEDSClient_ClientFactory.hxx>
 #include <SALOMEDSClient_IParameters.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 // External includes
 #include <QMenu>
 #include <QTime>
@@ -84,7 +86,12 @@
 #include <Aspect_TypeOfMarker.hxx>
 #include <OSD_SharedLibrary.hxx>
 #include <NCollection_DataMap.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
 #include <Graphic3d_HArray1OfBytes.hxx>
+#endif
 
 #include <utilities.h>
 
@@ -1454,11 +1461,22 @@ QString GeometryGUI::engineIOR() const
   return "";
 }
 
-Handle(Graphic3d_HArray1OfBytes) GeometryGUI::getTexture( SalomeApp_Study* theStudy, int theId, int& theWidth, int& theHeight )
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+Handle(TColStd_HArray1OfByte) GeometryGUI::getTexture
+#else
+Handle(Graphic3d_HArray1OfBytes) GeometryGUI::getTexture
+#endif
+      (SalomeApp_Study* theStudy, int theId, int& theWidth, int& theHeight)
 {
   theWidth = theHeight = 0;
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) aTexture;
+#else
   Handle(Graphic3d_HArray1OfBytes) aTexture;
-  if ( theStudy ) {
+#endif
+
+  if (theStudy) {
     TextureMap aTextureMap = myTextureMap[ theStudy->studyDS()->StudyId() ];
     aTexture = aTextureMap[ theId ];
     if ( aTexture.IsNull() ) {
@@ -1469,8 +1487,14 @@ Handle(Graphic3d_HArray1OfBytes) GeometryGUI::getTexture( SalomeApp_Study* theSt
         if ( aWidth > 0 && aHeight > 0 && aStream->length() > 0 ) {
           theWidth  = aWidth;
           theHeight = aHeight;
-          aTexture  = new Graphic3d_HArray1OfBytes( 1, aStream->length() );
+
-          for ( int i = 0; i < aStream->length(); i++ )
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+          aTexture  = new TColStd_HArray1OfByte (1, aStream->length());
+#else
+          aTexture  = new Graphic3d_HArray1OfBytes (1, aStream->length());
+#endif
+
+          for (int i = 0; i < aStream->length(); i++)
             aTexture->SetValue( i+1, (Standard_Byte)aStream[i] );
           aTextureMap[ theId ] = aTexture;
         }
@@ -1663,10 +1687,9 @@ void GeometryGUI::createPreferences()
 
   int operationsGroup = addPreference( tr( "PREF_GROUP_OPERATIONS" ), tabId );
   setPreferenceProperty( operationsGroup, "columns", 2 );
-  
+
   addPreference( tr( "GEOM_PREVIEW" ), operationsGroup,
                  LightApp_Preferences::Bool, "Geometry", "geom_preview" );
-  
 }
 
 void GeometryGUI::preferencesChanged( const QString& section, const QString& param )
@@ -1738,7 +1761,7 @@ void GeometryGUI::storeVisualParameters (int savePoint)
     for (int i = 0, iEnd = vman->getViewsCount(); i < iEnd; i++) {
       const ObjMap anObjects = appStudy->getObjectMap(aMgrId);
       ObjMap::ConstIterator o_it = anObjects.begin();
-      for( ;o_it != anObjects.end(); o_it++ ) {
+      for (; o_it != anObjects.end(); o_it++) {
         const PropMap aProps = o_it.value();
 
         //Check that object exists in the study
@@ -1759,57 +1782,57 @@ void GeometryGUI::storeVisualParameters (int savePoint)
         occParam += QString::number(aMgrId).toLatin1().data();
         occParam += NAME_SEPARATOR;
 
-	if(aProps.contains(VISIBILITY_PROP)) {
+        if(aProps.contains(VISIBILITY_PROP)) {
-	  param = occParam + VISIBILITY_PROP;
+          param = occParam + VISIBILITY_PROP;
-	  ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off");
+          ip->setParameter(entry, param, aProps.value(VISIBILITY_PROP).toInt() == 1 ? "On" : "Off");
-	}
-
-	if(aProps.contains(DISPLAY_MODE_PROP)) {
-	  param = occParam + DISPLAY_MODE_PROP;
-	  ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data());
-	}
-	
-	if(aProps.contains(COLOR_PROP)) {
-	  QColor c = aProps.value(COLOR_PROP).value<QColor>();
-	  QString colorStr = QString::number(c.red()/255.);
-	  colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.);
-	  colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.blue()/255.);
-	  param = occParam + COLOR_PROP;
-	  ip->setParameter(entry, param, colorStr.toLatin1().data());
-	}
-
-        if(vType == SVTK_Viewer::Type()) {
-	  if(aProps.contains(OPACITY_PROP)) {
-	    param = occParam + OPACITY_PROP;
-	    ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
-	  }
-        } else if (vType == SOCC_Viewer::Type()) {
-	  if(aProps.contains(TRANSPARENCY_PROP)) {
-	    param = occParam + TRANSPARENCY_PROP;
-	    ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
-	  }
         }
 
-	if(aProps.contains(ISOS_PROP)) {
+        if(aProps.contains(DISPLAY_MODE_PROP)) {
-	  param = occParam + ISOS_PROP;
+          param = occParam + DISPLAY_MODE_PROP;
-	  ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data());
+          ip->setParameter(entry, param, QString::number(aProps.value(DISPLAY_MODE_PROP).toInt()).toLatin1().data());
-	}
+        }
 
-	if(aProps.contains(VECTOR_MODE_PROP)) {
+        if(aProps.contains(COLOR_PROP)) {
-	  param = occParam + VECTOR_MODE_PROP;
+          QColor c = aProps.value(COLOR_PROP).value<QColor>();
-	  ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data());
+          QString colorStr = QString::number(c.red()/255.);
-	}
+          colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.green()/255.);
+          colorStr += DIGIT_SEPARATOR; colorStr += QString::number(c.blue()/255.);
+          param = occParam + COLOR_PROP;
+          ip->setParameter(entry, param, colorStr.toLatin1().data());
+        }
+
+        if(vType == SVTK_Viewer::Type()) {
+          if(aProps.contains(OPACITY_PROP)) {
+            param = occParam + OPACITY_PROP;
+            ip->setParameter(entry, param, QString::number(1. - aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
+          }
+        } else if (vType == SOCC_Viewer::Type()) {
+          if(aProps.contains(TRANSPARENCY_PROP)) {
+            param = occParam + TRANSPARENCY_PROP;
+            ip->setParameter(entry, param, QString::number(aProps.value(TRANSPARENCY_PROP).toDouble()).toLatin1().data());
+          }
+        }
+
+        if(aProps.contains(ISOS_PROP)) {
+          param = occParam + ISOS_PROP;
+          ip->setParameter(entry, param, aProps.value(ISOS_PROP).toString().toLatin1().data());
+        }
+
+        if(aProps.contains(VECTOR_MODE_PROP)) {
+          param = occParam + VECTOR_MODE_PROP;
+          ip->setParameter(entry, param, QString::number(aProps.value(VECTOR_MODE_PROP).toInt()).toLatin1().data());
+        }
+
+        if(aProps.contains(DEFLECTION_COEFF_PROP)) {
+          param = occParam + DEFLECTION_COEFF_PROP;
+          ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
+        }
 
-	if(aProps.contains(DEFLECTION_COEFF_PROP)) {
-	  param = occParam + DEFLECTION_COEFF_PROP;
-	  ip->setParameter(entry, param, QString::number(aProps.value(DEFLECTION_COEFF_PROP).toDouble()).toLatin1().data());
-	}
-	
         //Marker type of the vertex - ONLY for the "Vertex" and "Compound of the Vertex"
         if(aProps.contains(MARKER_TYPE_PROP)) {
           param = occParam + MARKER_TYPE_PROP;
           ip->setParameter(entry, param, aProps.value(MARKER_TYPE_PROP).toString().toLatin1().data());
-        }	
+        }
       } // object iterator
     } // for (views)
   } // for (viewManagers)
@@ -1923,7 +1946,7 @@ void GeometryGUI::restoreVisualParameters (int savePoint)
 
     QList<SUIT_ViewManager*> lst = getApp()->viewManagers();
 
-    for (int index = 0 ; index < aListOfMap.count(); index++) {
+    for (int index = 0; index < aListOfMap.count(); index++) {
 
       appStudy->setObjectPropMap(index, entry, aListOfMap[index]);
 
@@ -1979,15 +2002,15 @@ void GeometryGUI::onViewAboutToShow()
   \brief Return \c true if rename operation finished successfully, \c false otherwise.
 */
 bool GeometryGUI::renameObject( const QString& entry, const QString& name) {
-  
+
   bool appRes = SalomeApp_Module::renameObject(entry,name);
   if( !appRes )
     return false;
-  
+
   bool result = false;
-  
+
   SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication());
-  SalomeApp_Study* appStudy = app ? dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) : 0; 
+  SalomeApp_Study* appStudy = app ? dynamic_cast<SalomeApp_Study*>( app->activeStudy() ) : 0;
 
   if(!appStudy)
     return result;
@@ -2002,12 +2025,12 @@ bool GeometryGUI::renameObject( const QString& entry, const QString& name) {
   if ( obj ) {
     if ( obj->FindAttribute(anAttr, "AttributeName") ) {
       _PTR(AttributeName) aName (anAttr);
-      
+
       GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(obj));
       if (!CORBA::is_nil(anObj)) {
-	aName->SetValue( name.toLatin1().data() ); // rename the SObject
+        aName->SetValue( name.toLatin1().data() ); // rename the SObject
-	anObj->SetName( name.toLatin1().data() );  // Rename the corresponding GEOM_Object
+        anObj->SetName( name.toLatin1().data() );  // Rename the corresponding GEOM_Object
-	result = true;
+        result = true;
       }
     }
   }

src/GEOMGUI/GeometryGUI.h

@@ -18,17 +18,18 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 // GEOM GEOMGUI : GUI for Geometry component
 // File   : GeometryGUI.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #ifndef GEOMETRYGUI_H
 #define GEOMETRYGUI_H
 
 #include "GEOM_GEOMGUI.hxx"
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <SalomeApp_Module.h>
 
 #include <GEOM_Client.hxx>
@@ -42,7 +43,12 @@
 
 // OCCT Includes
 #include <gp_Ax3.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
 #include <Graphic3d_HArray1OfBytes.hxx>
+#endif
 
 // IDL headers
 #include "SALOMEconfig.h"
@@ -93,7 +99,11 @@ public:
   virtual void                initialize( CAM_Application* );
   virtual QString             engineIOR() const;
 
-  static Handle(Graphic3d_HArray1OfBytes) getTexture( SalomeApp_Study*, int, int&, int& );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  static Handle(TColStd_HArray1OfByte) getTexture (SalomeApp_Study*, int, int&, int&);
+#else
+  static Handle(Graphic3d_HArray1OfBytes) getTexture (SalomeApp_Study*, int, int&, int&);
+#endif
 
   static bool                 InitGeomGen();
 
@@ -180,7 +190,12 @@ public:
 
 private:  
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  typedef QMap<long, Handle(TColStd_HArray1OfByte)> TextureMap;
+#else
   typedef QMap<long, Handle(Graphic3d_HArray1OfBytes)> TextureMap;
+#endif
+
   typedef QMap<long, TextureMap> StudyTextureMap;
   typedef QMap<QString, GEOMGUI*> GUIMap;
 

src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx

@@ -18,10 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <GEOMImpl_I3DPrimOperations.hxx>
 
 #include "utilities.h"
@@ -122,7 +123,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxDXDYDZ (double theDX, dou
 
   //Compute the box value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -179,7 +180,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeBoxTwoPnt (Handle(GEOM_Objec
 
   //Compute the Box value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -230,7 +231,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceHW (double theH, double
 
   //Compute the Face
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -287,7 +288,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFaceObjHW (Handle(GEOM_Objec
 
   //Compute the Face
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -345,7 +346,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskPntVecR
 
   //Compute the Disk value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -405,7 +406,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskThreePnt (Handle(GEOM_Ob
 
   //Compute the Disk value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -455,7 +456,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeDiskR (double theR, int theO
 
   //Compute the Disk
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -503,7 +504,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderRH (double theR, dou
 
   //Compute the Cylinder value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -564,7 +565,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeCylinderPntVecRH (Handle(GEO
 
   //Compute the Cylinder value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -616,7 +617,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConeR1R2H (double theR1, dou
 
   //Compute the Cone value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -679,7 +680,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeConePntVecR1R2H (Handle(GEOM
 
   //Compute the Cone value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -727,7 +728,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSphereR (double theR)
 
   //Compute the Sphere value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -782,7 +783,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeSpherePntR (Handle(GEOM_Obje
 
   //Compute the Sphere value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -833,7 +834,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusRR
 
   //Compute the Torus value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -893,7 +894,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeTorusPntVecRR
 
   //Compute the Torus value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -954,7 +955,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH (Handle(GEOM_Objec
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1018,7 +1019,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismVecH2Ways (Handle(GEOM_
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1081,7 +1082,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1146,7 +1147,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismTwoPnt2Ways
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1207,7 +1208,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1270,7 +1271,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePrismDXDYDZ2Ways
 
   //Compute the Prism value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1327,7 +1328,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipe (Handle(GEOM_Object) th
 
   //Compute the Pipe value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1387,7 +1388,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle (Handle(
 
   //Compute the Revolution value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1445,7 +1446,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeRevolutionAxisAngle2Ways
 
   //Compute the Revolution value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1508,7 +1509,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFilling
 
   //Compute the Solid value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1604,7 +1605,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThruSections(
 
   //Compute the ThruSections value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1728,7 +1729,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeWithDifferentSections(
 
   //Compute the Pipe value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1887,7 +1888,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeWithShellSections(
 
   //Compute the Pipe value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2034,7 +2035,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeShellsWithoutPath(
 
   //Compute the Pipe value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2128,7 +2129,7 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakePipeBiNormalAlongVector (Han
 
   //Compute the Pipe value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_IAdvancedOperations.cxx

@@ -20,6 +20,7 @@
 //  Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 
 #include <Standard_Stream.hxx>
+
 #include "GEOMImpl_Types.hxx"
 #include "GEOMImpl_IAdvancedOperations.hxx"
 #include "GEOMImpl_IBasicOperations.hxx"
@@ -33,6 +34,8 @@
 
 #include "GEOMImpl_Gen.hxx"
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <utilities.h>
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -742,7 +745,7 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
     }
     Handle(GEOM_Object) edge_e1, edge_e2;
     try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
       OCC_CATCH_SIGNALS;
 #endif
       edge_e1 = myBasicOperations->MakeLineTwoPnt(ve1, vi1);
@@ -757,7 +760,7 @@ bool GEOMImpl_IAdvancedOperations::MakePipeTShapePartition(Handle(GEOM_Object) t
     }
 
     try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
       OCC_CATCH_SIGNALS;
 #endif
       edge_e2 = myBasicOperations->MakeLineTwoPnt(ve2, vi2);
@@ -1166,7 +1169,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShape(double theR1, double theW1, double
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1298,7 +1301,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeWithPosition(double theR1, double th
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1431,7 +1434,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamfer(double theR1, double theW1,
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1647,7 +1650,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeChamferWithPosition(double theR1, do
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1835,7 +1838,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFillet(double theR1, double theW1, d
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2036,7 +2039,7 @@ GEOMImpl_IAdvancedOperations::MakePipeTShapeFilletWithPosition(double theR1, dou
 
   //Compute the resulting value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_IBasicOperations.cxx

@@ -18,12 +18,13 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IBasicOperations.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -104,7 +105,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointXYZ
 
   //Compute the point value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -159,7 +160,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointWithReference
 
   //Compute the point value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -257,7 +258,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::makePointOnGeom
   
   //Compute the point value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -401,7 +402,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnLinesIntersection
 
   //Compute the point value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -454,7 +455,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentOnCurve
 
   //Compute the vector value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -505,7 +506,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorDXDYDZ
 
   //Compute the Vector value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -560,7 +561,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeVectorTwoPnt
 
   //Compute the Vector value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -616,7 +617,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLine
 
   //Compute the Line value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -671,7 +672,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoPnt
 
   //Compute the Line value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -726,7 +727,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeLineTwoFaces
 
   //Compute the Line value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -785,7 +786,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneThreePnt
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -842,7 +843,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlanePntVec
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -896,7 +897,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneFace
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -953,7 +954,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlane2Vec
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1007,7 +1008,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePlaneLCS
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1061,7 +1062,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarker
 
   //Compute the marker value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1115,7 +1116,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerFromShape
 
   //Compute the marker value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1172,7 +1173,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarkerPntTwoVec
 
   //Compute the marker value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1231,7 +1232,7 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentPlaneOnFace(const Hand
 
   //Compute the Plane value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1252,5 +1253,3 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentPlaneOnFace(const Hand
   SetErrorCode(OK);
   return aPlane;
 }
-
-

src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -46,6 +45,8 @@
 #include <GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx>
 #include <BlockFix_CheckTool.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -166,7 +167,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -224,7 +225,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad2Edges
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -289,7 +290,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeQuad4Vertices
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -361,7 +362,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa
 
   //Compute the Block value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -420,7 +421,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeHexa2Faces
 
   //Compute the Block value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -476,7 +477,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeBlockCompound
 
   //Compute the Blocks Compound value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -683,7 +684,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdge
 
   //Compute the Edge value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopTools_IndexedDataMapOfShapeListOfShape MVE;
@@ -789,7 +790,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetEdgeNearPoint
 
   //Compute the Edge value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -921,7 +922,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByPoints
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -1056,7 +1057,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByEdges
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -1181,7 +1182,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetOppositeFace
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -1247,7 +1248,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceNearPoint
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -1439,7 +1440,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetFaceByNormale
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -1581,7 +1582,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetShapesNearPoint
 
   // Compute the result
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Vertex aVert = TopoDS::Vertex(anArg);
@@ -1686,7 +1687,7 @@ Standard_Boolean GEOMImpl_IBlocksOperations::IsCompoundOfBlocks
   //Check
   isCompOfBlocks = Standard_True;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopTools_MapOfShape mapShape;
@@ -2543,7 +2544,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::RemoveExtraEdges
 
   //Compute the fixed shape
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2600,7 +2601,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::CheckAndImprove
 
   //Compute the fixed shape
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2652,7 +2653,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::ExplodeCompound
 
   // Explode
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopExp_Explorer exp (aBlockOrComp, TopAbs_SOLID);
@@ -2747,7 +2748,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockNearPoint
 
   //Compute the Block value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Shape aShape;
@@ -2926,7 +2927,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::GetBlockByParts
 
   //Compute the Block value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     // 1. Explode compound on solids
@@ -3045,7 +3046,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::GetBlocksByPart
 
   //Get the Blocks
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopTools_MapOfShape mapShape;
@@ -3168,7 +3169,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation1D
 
   //Compute the transformation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -3232,7 +3233,7 @@ Handle(GEOM_Object) GEOMImpl_IBlocksOperations::MakeMultiTransformation2D
 
   //Compute the transformation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
@@ -35,6 +34,8 @@
 #include <GEOMImpl_PartitionDriver.hxx>
 #include <GEOMImpl_IPartition.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <TDF_Tool.hxx>
 
 #include "utilities.h"
@@ -109,7 +110,7 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeBoolean (Handle(GEOM_Object
 
   //Compute the Boolean value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -270,7 +271,7 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakePartition
 
   //Compute the Partition
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -347,7 +348,7 @@ Handle(GEOM_Object) GEOMImpl_IBooleanOperations::MakeHalfPartition
 
   //Compute the Partition value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifdef WNT
 // E.A. : On windows with python 2.6, there is a conflict
@@ -37,14 +36,11 @@
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_ICurvesOperations.hxx>
-
+#include <GEOMImpl_Types.hxx>
-#include <TColStd_HArray1OfReal.hxx>
 
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>
 
-#include <GEOMImpl_Types.hxx>
-
 #include <GEOMImpl_PolylineDriver.hxx>
 #include <GEOMImpl_CircleDriver.hxx>
 #include <GEOMImpl_SplineDriver.hxx>
@@ -61,9 +57,12 @@
 #include <GEOMImpl_ISketcher.hxx>
 #include <GEOMImpl_I3DSketcher.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 
 #include <TDF_Tool.hxx>
+#include <TColStd_HArray1OfReal.hxx>
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
@@ -233,7 +232,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleThreePnt (Handle(GEOM_
 
   //Compute the Circle value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -293,7 +292,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCircleCenter2Pnt (Handle(GEO
 
   //Compute the Circle value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -358,7 +357,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCirclePntVecR
 
   //Compute the Circle value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -433,7 +432,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeEllipse
 
   //Compute the Ellipse value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -480,10 +479,10 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArc (Handle(GEOM_Object) the
 
   //Add a new Circle Arc function
   Handle(GEOM_Function) aFunction =
-      anArc->AddFunction(GEOMImpl_ArcDriver::GetID(), CIRC_ARC_THREE_PNT);  
+      anArc->AddFunction(GEOMImpl_ArcDriver::GetID(), CIRC_ARC_THREE_PNT);
 
   if (aFunction.IsNull()) return NULL;
-  
+
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ArcDriver::GetID()) return NULL;
   GEOMImpl_IArc aCI (aFunction);
@@ -491,17 +490,16 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArc (Handle(GEOM_Object) the
   Handle(GEOM_Function) aRefPnt1 = thePnt1->GetLastFunction();
   Handle(GEOM_Function) aRefPnt2 = thePnt2->GetLastFunction();
   Handle(GEOM_Function) aRefPnt3 = thePnt3->GetLastFunction();
-  
 
   if (aRefPnt1.IsNull() || aRefPnt2.IsNull() || aRefPnt3.IsNull()) return NULL;
 
   aCI.SetPoint1(aRefPnt1);
   aCI.SetPoint2(aRefPnt2);
   aCI.SetPoint3(aRefPnt3);
-  
+
   //Compute the Arc value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -562,7 +560,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcCenter (Handle(GEOM_Objec
 
   //Compute the Arc value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -604,7 +602,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcOfEllipse (Handle(GEOM_Ob
       anArc->AddFunction(GEOMImpl_ArcDriver::GetID(), ELLIPSE_ARC_CENTER_TWO_PNT);
 
   if (aFunction.IsNull()) return NULL;
-  
+
   //Check if the function is set correctly
   if (aFunction->GetDriverGUID() != GEOMImpl_ArcDriver::GetID()) return NULL;
   GEOMImpl_IArc aCI (aFunction);
@@ -612,17 +610,16 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeArcOfEllipse (Handle(GEOM_Ob
   Handle(GEOM_Function) aRefPnt1 = thePnt1->GetLastFunction();
   Handle(GEOM_Function) aRefPnt2 = thePnt2->GetLastFunction();
   Handle(GEOM_Function) aRefPnt3 = thePnt3->GetLastFunction();
-  
 
   if (aRefPnt1.IsNull() || aRefPnt2.IsNull() || aRefPnt3.IsNull()) return NULL;
 
   aCI.SetPoint1(aRefPnt1);
   aCI.SetPoint2(aRefPnt2);
   aCI.SetPoint3(aRefPnt3);
-  
+
   //Compute the Arc value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -686,7 +683,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakePolyline (std::list<Handle(G
 
   //Compute the Polyline value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -757,7 +754,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineBezier
 
   //Compute the Spline value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -830,7 +827,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolation
 
   //Compute the Spline value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -864,32 +861,34 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSplineInterpolation
  *  MakeCurveParametric
  */
 //=============================================================================
-Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char* thexExpr, const char* theyExpr, const char* thezExpr, 
+Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric
-								    double theParamMin, double theParamMax, double theParamStep, 
+             (const char* thexExpr, const char* theyExpr, const char* thezExpr,
-								    CurveType theCurveType) {
+              double theParamMin, double theParamMax, double theParamStep,
+              CurveType theCurveType)
+{
   TCollection_AsciiString aPyScript;
   aPyScript +="from math import *                                          \n";
   aPyScript +="def X(t):                                                   \n";
-  aPyScript +="    return "; 
+  aPyScript +="    return ";
   aPyScript += thexExpr;
-  aPyScript += "\n";                                                             
+  aPyScript += "\n";
   aPyScript +="def Y(t):                                                   \n";
   aPyScript +="    return ";
   aPyScript += theyExpr;
   aPyScript += "\n";
-  
+
   aPyScript +="def Z(t):                                                   \n";
   aPyScript +="    return ";
   aPyScript += thezExpr;
   aPyScript += "\n";
-  
+
   aPyScript +="def coordCalculator(tmin, tmax, tstep):                      \n";
   aPyScript +="   coords = []                                              \n";
   aPyScript +="   while tmin <= tmax :                                     \n";
   aPyScript +="      coords.append([X(tmin), Y(tmin), Z(tmin)])            \n";
   aPyScript +="      tmin = tmin + tstep                                   \n";
   aPyScript +="   return coords                                            \n";
-  
+
   SetErrorCode(KO);
 
   if(theParamMin >= theParamMax) {
@@ -901,16 +900,16 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
     SetErrorCode("Value of the step must be positive !!!");
     return NULL;
   }
-  
+
   /* Initialize the Python interpreter */
   if (! Py_IsInitialized()) {
     SetErrorCode("Python interpreter is not initialized !!! ");
     return NULL;
-  } 
+  }
 
   PyGILState_STATE gstate;
   gstate = PyGILState_Ensure();
-  
+
   PyObject* main_mod = PyImport_AddModule("__main__");
   PyObject* main_dict = PyModule_GetDict(main_mod);
 
@@ -927,13 +926,13 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
 
   PyObject * func = NULL;
   func = PyObject_GetAttrString(main_mod, "coordCalculator");
-  
+
   if (func == NULL){
     SetErrorCode("Can't get function from python module !!!");
     PyGILState_Release(gstate);
     return NULL;
   }
-  
+
   PyObject* coords = PyObject_CallFunction(func,(char*)"(d, d, d)", theParamMin, theParamMax, theParamStep );
   PyObject* new_stderr = NULL;
 
@@ -956,39 +955,37 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
   if(PyList_Size( coords ) <= 0) {
     SetErrorCode("Empty list of the points, please check input parameters !!!");
     return NULL;
-  }    
+  }
 
   int k=1;
   for ( Py_ssize_t i = 0; i< PyList_Size( coords ); ++i ) {
     PyObject* coord = PyList_GetItem( coords, i );
     if (coord != NULL) {
       for ( Py_ssize_t j = 0; j < PyList_Size(coord); ++j) {
-	PyObject* item = PyList_GetItem(coord, j);
+        PyObject* item = PyList_GetItem(coord, j);
-	aCoordsArray->SetValue(k, PyFloat_AsDouble(item));
+        aCoordsArray->SetValue(k, PyFloat_AsDouble(item));
-	k++;
+        k++;
       }
     }
   }
 
   Py_DECREF(coords);
 
-  
-  
   PyGILState_Release(gstate);
 
-  Handle(GEOM_Object) aCurve; 
+  Handle(GEOM_Object) aCurve;
   Handle(GEOM_Function) aFunction;
   TCollection_AsciiString aCurveType;
-  
+
   switch(theCurveType) {
   case Polyline: {
     //Add a new Polyline object
     aCurve = GetEngine()->AddObject(GetDocID(), GEOM_POLYLINE);
-    
+
     //Add a new Polyline function for creation a polyline relatively to points set
     aFunction = aCurve->AddFunction(GEOMImpl_PolylineDriver::GetID(), POLYLINE_POINTS);
     if (aFunction.IsNull()) return NULL;
-    
+
     //Check if the function is set correctly
     if (aFunction->GetDriverGUID() != GEOMImpl_PolylineDriver::GetID()) return NULL;
 
@@ -1008,10 +1005,10 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
     aFunction =
       aCurve->AddFunction(GEOMImpl_SplineDriver::GetID(), SPLINE_BEZIER);
     if (aFunction.IsNull()) return NULL;
-    
+
     //Check if the function is set correctly
     if (aFunction->GetDriverGUID() != GEOMImpl_SplineDriver::GetID()) return NULL;
-    
+
     GEOMImpl_ISpline aCI (aFunction);
 
     aCI.SetLength(PyList_Size( coords ));
@@ -1028,7 +1025,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
     //Add a new Spline function for creation a bezier curve relatively to points set
     aFunction = aCurve->AddFunction(GEOMImpl_SplineDriver::GetID(), SPLINE_INTERPOLATION);
     if (aFunction.IsNull()) return NULL;
-    
+
     //Check if the function is set correctly
     if (aFunction->GetDriverGUID() != GEOMImpl_SplineDriver::GetID()) return NULL;
 
@@ -1045,7 +1042,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
 
   //Compute the Curve value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1058,19 +1055,19 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeCurveParametric(const char*
     SetErrorCode(aFail->GetMessageString());
     return NULL;
   }
-  
+
   //Make a Python command
   GEOM::TPythonDump pd (aFunction);
   pd << aCurve << " = geompy.MakeCurveParametric(";
   pd << "\"" << thexExpr << "\", ";
   pd << "\"" << theyExpr << "\", ";
   pd << "\"" << thezExpr << "\", ";
-  
+
   pd << theParamMin <<", ";
   pd << theParamMax <<", ";
   pd << theParamStep <<", ";
   pd << aCurveType.ToCString() <<")";
-  
+
   SetErrorCode(OK);
   return aCurve;
 }
@@ -1110,7 +1107,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcher (const char* theCom
 
   //Compute the Sketcher value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1174,10 +1171,10 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::Make3DSketcher (std::list<double
     aCoordsArray->SetValue(ind, *it);
 
   aCI.SetCoordinates(aCoordsArray);
-    
+
   //Compute the Sketcher value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1241,7 +1238,7 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
 
   //Compute the Sketcher value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1262,4 +1259,3 @@ Handle(GEOM_Object) GEOMImpl_ICurvesOperations::MakeSketcherOnPlane
   SetErrorCode(OK);
   return aSketcher;
 }
-

src/GEOMImpl/GEOMImpl_IHealingOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -36,12 +35,14 @@
 #include <GEOMImpl_IHealing.hxx>
 #include <GEOMImpl_CopyDriver.hxx>
 
-#include <ShHealOper_ShapeProcess.hxx>
+#include <CASCatch_OCCTVersion.hxx>
 
 #include "utilities.h"
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
 
+#include <ShHealOper_ShapeProcess.hxx>
+
 #include <ShapeAnalysis_FreeBounds.hxx>
 
 #include <TopoDS_Compound.hxx>
@@ -56,19 +57,11 @@
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
-#ifdef OCC_VERSION_SERVICEPACK
-#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK)
-#else
-#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8)
-#endif
-
-
 //=============================================================================
 /*!
  *   constructor:
  */
 //=============================================================================
-
 GEOMImpl_IHealingOperations::GEOMImpl_IHealingOperations (GEOM_Engine* theEngine, int theDocID)
 : GEOM_IOperations(theEngine, theDocID)
 {
@@ -80,7 +73,6 @@ GEOMImpl_IHealingOperations::GEOMImpl_IHealingOperations (GEOM_Engine* theEngine
  *  destructor
  */
 //=============================================================================
-
 GEOMImpl_IHealingOperations::~GEOMImpl_IHealingOperations()
 {
   MESSAGE("GEOMImpl_IHealingOperations::~GEOMImpl_IHealingOperations");
@@ -146,7 +138,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ShapeProcess (Handle(GEOM_Objec
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -355,7 +347,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::SuppressFaces
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -425,7 +417,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::CloseContour
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -494,7 +486,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::RemoveIntWires
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -562,7 +554,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::FillHoles (Handle(GEOM_Object)
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -630,7 +622,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::Sew (Handle(GEOM_Object) theObj
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -693,7 +685,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::DivideEdge (Handle(GEOM_Object)
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction))
@@ -842,7 +834,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientation (Handle(GEOM_
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -899,7 +891,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::ChangeOrientationCopy (Handle(G
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -958,7 +950,7 @@ Handle(GEOM_Object) GEOMImpl_IHealingOperations::LimitTolerance (Handle(GEOM_Obj
 
   // Compute
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_IInsertOperations.cxx

@@ -18,12 +18,23 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_IInsertOperations.hxx>
 
+#include <GEOMImpl_CopyDriver.hxx>
+#include <GEOMImpl_ExportDriver.hxx>
+#include <GEOMImpl_ImportDriver.hxx>
+#include <GEOMImpl_ICopy.hxx>
+#include <GEOMImpl_IImportExport.hxx>
+#include <GEOMImpl_Types.hxx>
+
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
+
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -33,23 +44,16 @@
 #include <TFunction_Logbook.hxx>
 #include <TDF_Tool.hxx>
 
-#include <GEOM_Function.hxx>
-#include <GEOM_PythonDump.hxx>
-
-#include <GEOMImpl_CopyDriver.hxx>
-#include <GEOMImpl_ExportDriver.hxx>
-#include <GEOMImpl_ImportDriver.hxx>
-
-#include <GEOMImpl_ICopy.hxx>
-#include <GEOMImpl_IImportExport.hxx>
-
-#include <GEOMImpl_Types.hxx>
-
 #include <TopoDS.hxx>
 #include <TopoDS_Vertex.hxx>
 #include <BRep_Tool.hxx>
 #include <gp_Pnt.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
 #include <TDataStd_HArray1OfByte.hxx>
+#endif
 
 #include <Standard_Failure.hxx>
 #include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
@@ -108,7 +112,7 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::MakeCopy(Handle(GEOM_Object) the
 
   //Compute the Copy value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -168,7 +172,7 @@ void GEOMImpl_IInsertOperations::Export
 
   //Perform the Export
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -227,7 +231,7 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
 
   //Perform the Import
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -552,7 +556,11 @@ int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
 
   if (theTextureFile.IsEmpty()) return 0;
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) aTexture;
+#else
   Handle(TDataStd_HArray1OfByte) aTexture;
+#endif
 
   FILE* fp = fopen(theTextureFile.ToCString(), "r");
   if (!fp) return 0;
@@ -594,7 +602,12 @@ int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
   if (bytedata.empty() || bytedata.size() != lines.size()*lenbytes)
     return 0;
 
-  aTexture = new TDataStd_HArray1OfByte(1, lines.size()*lenbytes);
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  aTexture = new TColStd_HArray1OfByte (1, lines.size()*lenbytes);
+#else
+  aTexture = new TDataStd_HArray1OfByte (1, lines.size()*lenbytes);
+#endif
+
   std::list<unsigned char>::iterator bdit;
   int i;
   for (i = 1, bdit = bytedata.begin(); bdit != bytedata.end(); ++bdit, ++i)
@@ -606,7 +619,11 @@ int GEOMImpl_IInsertOperations::LoadTexture(const TCollection_AsciiString& theTe
 }
   
 int GEOMImpl_IInsertOperations::AddTexture(int theWidth, int theHeight, 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                                           const Handle(TColStd_HArray1OfByte)& theTexture)
+#else
                                            const Handle(TDataStd_HArray1OfByte)& theTexture)
+#endif
 {
   SetErrorCode(KO);
   int aTextureId = GetEngine()->addTexture(GetDocID(), theWidth, theHeight, theTexture);
@@ -614,12 +631,21 @@ int GEOMImpl_IInsertOperations::AddTexture(int theWidth, int theHeight,
   return aTextureId;
 }
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+Handle(TColStd_HArray1OfByte) GEOMImpl_IInsertOperations::GetTexture(int theTextureId,
+#else
 Handle(TDataStd_HArray1OfByte) GEOMImpl_IInsertOperations::GetTexture(int theTextureId,
+#endif
                                                                       int& theWidth, int& theHeight)
 {
   SetErrorCode(KO);
   
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) aTexture;
+#else
   Handle(TDataStd_HArray1OfByte) aTexture;
+#endif
+
   theWidth = theHeight = 0;
   TCollection_AsciiString aFileName;
 

src/GEOMImpl/GEOMImpl_IInsertOperations.hxx

@@ -18,22 +18,30 @@
 // 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 _GEOMImpl_IInsertOperations_HXX_
 #define _GEOMImpl_IInsertOperations_HXX_
 
-#include "Utils_SALOME_Exception.hxx"
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
+
+#include <CASCatch_OCCTVersion.hxx>
+
+#include "Utils_SALOME_Exception.hxx"
+
 #include <TDocStd_Document.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
 #include <Resource_Manager.hxx>
+
 #include <list>
 
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+class Handle_TColStd_HArray1OfByte;
+#else
 class Handle_TDataStd_HArray1OfByte;
+#endif
 
 class GEOMImpl_IInsertOperations : public GEOM_IOperations {
  public:
@@ -61,15 +69,23 @@ class GEOMImpl_IInsertOperations : public GEOM_IOperations {
                                                 Handle(TCollection_HAsciiString)& theLibName);
 
   Standard_EXPORT int LoadTexture(const TCollection_AsciiString& theTextureFile);
-  
-  Standard_EXPORT int AddTexture(int theWidth, int theHeight, 
-                                 const Handle(TDataStd_HArray1OfByte)& theTexture);
 
-  Standard_EXPORT Handle(TDataStd_HArray1OfByte) GetTexture(int theTextureId, 
+  Standard_EXPORT int AddTexture(int theWidth, int theHeight,
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                                 const Handle(TColStd_HArray1OfByte)& theTexture);
+#else
+                                 const Handle(TDataStd_HArray1OfByte)& theTexture);
+#endif
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Standard_EXPORT Handle(TColStd_HArray1OfByte) GetTexture(int theTextureId,
+#else
+  Standard_EXPORT Handle(TDataStd_HArray1OfByte) GetTexture(int theTextureId,
+#endif
                                                             int& theWidth, int& theHeight);
 
   Standard_EXPORT std::list<int> GetAllTextures();
-  
+
  private:
   Standard_Boolean InitResMgr ();
 

src/GEOMImpl/GEOMImpl_ILocalOperations.cxx

@@ -18,15 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_ILocalOperations.hxx>
 
-#include <GEOM_Function.hxx>
-#include <GEOM_PythonDump.hxx>
-
 #include <GEOMImpl_Types.hxx>
 
 #include <GEOMImpl_FilletDriver.hxx>
@@ -45,6 +41,11 @@
 #include <GEOMImpl_Gen.hxx>
 #include <GEOMImpl_IShapesOperations.hxx>
 
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
+
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -114,7 +115,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletAll
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -175,7 +176,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdges
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -245,7 +246,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletEdgesR1R2
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -315,7 +316,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFaces
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -385,7 +386,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFilletFacesR1R2
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -454,7 +455,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet2D
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -523,7 +524,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeFillet1D
 
   //Compute the Fillet value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -584,7 +585,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferAll (Handle(GEOM_Objec
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -641,7 +642,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdge
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -699,7 +700,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgeAD
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -762,7 +763,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFaces
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -833,7 +834,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferFacesAD
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -905,7 +906,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdges
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -977,7 +978,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeChamferEdgesAD
 
   //Compute the Chamfer value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1041,7 +1042,7 @@ Handle(GEOM_Object) GEOMImpl_ILocalOperations::MakeArchimede (Handle(GEOM_Object
 
   //Compute the Archimede value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
@@ -35,6 +34,8 @@
 #include <GEOM_Function.hxx>
 #include <GEOM_PythonDump.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <utilities.h>
 #include <OpUtil.hxx>
 #include <Utils_ExceptHandlers.hxx>
@@ -837,7 +838,7 @@ void GEOMImpl_IMeasureOperations::GetPosition
   }
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
 
@@ -893,7 +894,7 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetCentreOfMass
 
   //Compute the CentreOfMass value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -947,7 +948,7 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetVertexByIndex
 
   //Compute
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1006,7 +1007,7 @@ Handle(GEOM_Object) GEOMImpl_IMeasureOperations::GetNormal
 
   //Compute the Normale value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1058,7 +1059,7 @@ void GEOMImpl_IMeasureOperations::GetBasicProperties (Handle(GEOM_Object) theSha
   //Compute the parameters
   GProp_GProps LProps, SProps;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     BRepGProp::LinearProperties(aShape, LProps);
@@ -1114,7 +1115,7 @@ void GEOMImpl_IMeasureOperations::GetInertia
   GProp_GProps System;
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (aShape.ShapeType() == TopAbs_VERTEX ||
@@ -1181,7 +1182,7 @@ void GEOMImpl_IMeasureOperations::GetBoundingBox
   Bnd_Box B;
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     BRepBndLib::Add(aShape, B);
@@ -1226,7 +1227,7 @@ void GEOMImpl_IMeasureOperations::GetTolerance
   FaceMax = EdgeMax = VertMax = -RealLast();
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     for (TopExp_Explorer ExF (aShape, TopAbs_FACE); ExF.More(); ExF.Next()) {
@@ -1288,7 +1289,7 @@ bool GEOMImpl_IMeasureOperations::CheckShape (Handle(GEOM_Object)      theShape,
   //Compute the parameters
   bool isValid = false;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     BRepCheck_Analyzer ana (aShape, theIsCheckGeom);
@@ -1389,7 +1390,7 @@ TCollection_AsciiString GEOMImpl_IMeasureOperations::WhatIs (Handle(GEOM_Object)
   Astr = Astr + " Number of sub-shapes : \n";
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     int iType, nbTypes [TopAbs_SHAPE];
@@ -1797,7 +1798,7 @@ Standard_Real GEOMImpl_IMeasureOperations::GetMinDistance
 
   //Compute the parameters
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
 
@@ -1895,7 +1896,7 @@ void GEOMImpl_IMeasureOperations::PointCoordinates (Handle(GEOM_Object) theShape
   }
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) );
@@ -1943,7 +1944,7 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngle (Handle(GEOM_Object) theLine
   }
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Edge E1 = TopoDS::Edge(aLine1);
@@ -2016,7 +2017,7 @@ Standard_Real GEOMImpl_IMeasureOperations::GetAngleBtwVectors (Handle(GEOM_Objec
   }
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     TopoDS_Edge aE1 = TopoDS::Edge(aVec1);
@@ -2078,7 +2079,7 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByParam
 
   //Compute curvature
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     GeomLProp_CLProps Prop = GeomLProp_CLProps
@@ -2132,7 +2133,7 @@ Standard_Real GEOMImpl_IMeasureOperations::CurveCurvatureByPoint
 
   //Compute curvature
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     GeomAPI_ProjectPointOnCurve PPCurve(aPoint, aCurve, aFP, aLP);
@@ -2175,7 +2176,7 @@ Standard_Real GEOMImpl_IMeasureOperations::getSurfaceCurvatures
   if (aSurf.IsNull()) return aRes;
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     GeomLProp_SLProps Prop = GeomLProp_SLProps

src/GEOMImpl/GEOMImpl_IShapesOperations.cxx

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  File      : GEOMImpl_IShapesOperations.cxx
 //  Created   :
@@ -57,6 +56,8 @@
 #include "GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx"
 #include "GEOMAlgo_ListOfCoupleOfShapes.hxx"
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include "utilities.h"
 #include "OpUtil.hxx"
 #include "Utils_ExceptHandlers.hxx"
@@ -194,7 +195,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdge
 
   //Compute the Edge value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -255,7 +256,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeOnCurveByLength
 
   //Compute the Edge value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -313,7 +314,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeEdgeWire
 
   //Compute the Edge value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -389,7 +390,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeWire
 
   //Compute the shape
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -455,7 +456,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFace (Handle(GEOM_Object) th
 
   //Compute the Face value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -519,7 +520,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeFaceWires
 
   //Compute the shape
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -626,7 +627,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeShape
 
   //Compute the shape
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -695,7 +696,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFaces
   //Compute the sub-shape value
   Standard_Boolean isWarning = Standard_False;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -852,7 +853,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueFacesByList
   //Compute the sub-shape value
   Standard_Boolean isWarning = Standard_False;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -927,7 +928,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueEdges
   //Compute the sub-shape value
   Standard_Boolean isWarning = Standard_False;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1090,7 +1091,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::MakeGlueEdgesByList
   //Compute the sub-shape value
   Standard_Boolean isWarning = Standard_False;
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1722,7 +1723,7 @@ Standard_Integer GEOMImpl_IShapesOperations::NumberOfSubShapes
   */
 
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     int iType, nbTypes [TopAbs_SHAPE];
@@ -1793,7 +1794,7 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::ReverseShape(Handle(GEOM_Object)
 
   //Compute the sub-shape value
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -2566,7 +2567,7 @@ Handle(TColStd_HSequenceOfInteger)
   // Compute tolerance
   Standard_Real T, VertMax = -RealLast();
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     for (TopExp_Explorer ExV (theShape, TopAbs_VERTEX); ExV.More(); ExV.Next()) {

src/GEOMImpl/GEOMImpl_ITransformOperations.cxx

@@ -18,19 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #include <Standard_Stream.hxx>
 
 #include <GEOMImpl_ITransformOperations.hxx>
 
-#include "utilities.h"
-#include <OpUtil.hxx>
-#include <Utils_ExceptHandlers.hxx>
-
-#include <GEOM_Function.hxx>
-#include <GEOM_PythonDump.hxx>
-
 #include <GEOMImpl_TranslateDriver.hxx>
 #include <GEOMImpl_MirrorDriver.hxx>
 #include <GEOMImpl_ProjectionDriver.hxx>
@@ -48,6 +40,15 @@
 
 #include <GEOMImpl_Types.hxx>
 
+#include <GEOM_Function.hxx>
+#include <GEOM_PythonDump.hxx>
+
+#include <CASCatch_OCCTVersion.hxx>
+
+#include "utilities.h"
+#include <OpUtil.hxx>
+#include <Utils_ExceptHandlers.hxx>
+
 #include <TFunction_DriverTable.hxx>
 #include <TFunction_Driver.hxx>
 #include <TFunction_Logbook.hxx>
@@ -126,7 +127,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPoints
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -179,7 +180,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZ
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -235,7 +236,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateTwoPointsCopy
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -290,7 +291,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateDXDYDZCopy
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -345,7 +346,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVector
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -398,7 +399,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorCopy
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -459,7 +460,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TranslateVectorDistance
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -521,7 +522,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate1D
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -584,7 +585,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Translate2D (Handle(GEOM_Obje
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -782,7 +783,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlane
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -835,7 +836,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPlaneCopy
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -889,7 +890,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPoint
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -942,7 +943,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorPointCopy
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -996,7 +997,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxis
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1049,7 +1050,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::MirrorAxisCopy
 
   //Compute the mirror
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1101,7 +1102,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShape
 
   //Compute the offset
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1155,7 +1156,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::OffsetShapeCopy
 
   //Compute the offset
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1209,7 +1210,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ProjectShapeCopy
 
   //Compute the Projection
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1268,7 +1269,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShape
 
   //Compute the scale
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1329,7 +1330,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeCopy
 
   //Compute the scale
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1400,7 +1401,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::ScaleShapeAlongAxes (Handle(G
 
   //Compute the scale
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1465,7 +1466,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShape
 
   //Compute the Position
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1524,7 +1525,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShapeCopy
 
   //Compute the position
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1552,7 +1553,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionShapeCopy
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionAlongPath
-       (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePath, 
+       (Handle(GEOM_Object) theObject, Handle(GEOM_Object) thePath,
         double theDistance, bool theCopy, bool theReverse)
 {
   SetErrorCode(KO);
@@ -1586,7 +1587,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::PositionAlongPath
 
   //Compute the position
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1649,7 +1650,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate (Handle(GEOM_Object) t
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1702,7 +1703,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateCopy (Handle(GEOM_Objec
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1757,7 +1758,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate1D (Handle(GEOM_Object)
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1818,7 +1819,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object)
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1847,7 +1848,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::Rotate2D (Handle(GEOM_Object)
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePoints (Handle(GEOM_Object) theObject,
-                                                                      Handle(GEOM_Object) theCentPoint, 
+                                                                      Handle(GEOM_Object) theCentPoint,
                                                                       Handle(GEOM_Object) thePoint1,
                                                                       Handle(GEOM_Object) thePoint2)
 {
@@ -1880,7 +1881,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePoints (Handle(GEO
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1907,8 +1908,8 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePoints (Handle(GEO
  *  RotateThreePointsCopy
  */
 //=============================================================================
-Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle(GEOM_Object) theObject, 
+Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle(GEOM_Object) theObject,
-                                                         Handle(GEOM_Object) theCentPoint, 
+                                                         Handle(GEOM_Object) theCentPoint,
                                                          Handle(GEOM_Object) thePoint1,
                                                          Handle(GEOM_Object) thePoint2)
 {
@@ -1937,7 +1938,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle
 
   //Compute the translation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {
@@ -1965,7 +1966,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::RotateThreePointsCopy (Handle
  */
 //=============================================================================
 Handle(GEOM_Object) GEOMImpl_ITransformOperations::TransformLikeOtherCopy
-                                                (Handle(GEOM_Object) theObject, 
+                                                (Handle(GEOM_Object) theObject,
                                                  Handle(GEOM_Object) theSample)
 {
   SetErrorCode(KO);
@@ -2083,7 +2084,7 @@ Handle(GEOM_Object) GEOMImpl_ITransformOperations::TransformLikeOtherCopy
 
   // Compute the transformation
   try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
     OCC_CATCH_SIGNALS;
 #endif
     if (!GetSolver()->ComputeFunction(aFunction)) {

src/GEOMImpl/Makefile.am

@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
@@ -23,7 +22,7 @@
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header: 
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -228,6 +227,7 @@ libGEOMimpl_la_CPPFLAGS =		\
         $(CORBA_INCLUDES)		\
 	$(CAS_CPPFLAGS)			\
 	$(KERNEL_CXXFLAGS)		\
+	$(GUI_CXXFLAGS)			\
 	$(BOOST_CPPFLAGS)		\
         $(PYTHON_INCLUDES)              \
 	-I$(srcdir)/../ShHealOper	\

src/GEOMToolsGUI/GEOMToolsGUI_1.cxx

@@ -18,12 +18,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 //  GEOM GEOMGUI : GUI for Geometry component
 //  File   : GEOMToolsGUI_1.cxx
 //  Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
-//
+
 #include <PyConsole_Console.h>
 
 #include "GEOMToolsGUI.h"
@@ -39,6 +38,8 @@
 #include <GEOMBase.h>
 #include <GEOM_Actor.h>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <SALOME_ListIO.hxx>
 #include <SALOME_ListIteratorOfListIO.hxx>
 
@@ -75,7 +76,12 @@
 #include <Prs3d_IsoAspect.hxx>
 #include <Prs3d_PointAspect.hxx>
 #include <Graphic3d_AspectMarker3d.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
 #include <Graphic3d_HArray1OfBytes.hxx>
+#endif
 
 // QT Includes
 #include <QColorDialog>
@@ -94,35 +100,37 @@
 
 void GEOMToolsGUI::OnCheckGeometry()
 {
-  SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  SalomeApp_Application* app =
+    dynamic_cast< SalomeApp_Application* >(SUIT_Session::session()->activeApplication());
   PyConsole_Console* pyConsole = app->pythonConsole();
 
-  if(pyConsole)
+  if (pyConsole)
     pyConsole->exec("from GEOM_usinggeom import *");
 }
 
 void GEOMToolsGUI::OnAutoColor()
 {
   SALOME_ListIO selected;
-  SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() );
+  SalomeApp_Application* app =
-  if( !app )
+    dynamic_cast< SalomeApp_Application* >(SUIT_Session::session()->activeApplication());
+  if (!app)
     return;
 
   LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
-  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>( app->activeStudy() );
+  SalomeApp_Study* appStudy = dynamic_cast<SalomeApp_Study*>(app->activeStudy());
-  if( !aSelMgr || !appStudy )
+  if (!aSelMgr || !appStudy)
     return;
 
-  aSelMgr->selectedObjects( selected );
+  aSelMgr->selectedObjects(selected);
-  if( selected.IsEmpty() )
+  if (selected.IsEmpty())
     return;
 
   Handle(SALOME_InteractiveObject) anIObject = selected.First();
 
   _PTR(Study) aStudy = appStudy->studyDS();
-  _PTR(SObject) aMainSObject( aStudy->FindObjectID( anIObject->getEntry() ) );
+  _PTR(SObject) aMainSObject(aStudy->FindObjectID(anIObject->getEntry()));
   GEOM::GEOM_Object_var aMainObject = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(aMainSObject));
-  if( CORBA::is_nil( aMainObject ) )
+  if (CORBA::is_nil(aMainObject))
     return;
 
   aMainObject->SetAutoColor( true );
@@ -198,7 +206,13 @@ void GEOMToolsGUI::OnAutoColor()
       else {
         Standard_Integer aWidth, aHeight;
         aCurPointAspect->GetTextureSize( aWidth, aHeight );
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+        Handle(TColStd_HArray1OfByte) aTexture = aCurPointAspect->GetTexture();
+#else
         Handle(Graphic3d_HArray1OfBytes) aTexture = aCurPointAspect->GetTexture();
+#endif
+
         aCurDrawer->SetPointAspect( new Prs3d_PointAspect( aQuanColor, 1, aWidth, aHeight, aTexture ) );
       }
       ic->SetLocalAttributes( io, aCurDrawer );
@@ -255,7 +269,7 @@ void GEOMToolsGUI::OnColor()
         SUIT_ViewWindow* window = app->desktop()->activeWindow();
         bool isOCC = ( window && window->getViewManager()->getType() == OCCViewer_Viewer::Type() );
         bool isVTK = ( window && window->getViewManager()->getType() == SVTK_Viewer::Type() );
-	int mgrId = window->getViewManager()->getGlobalId();
+        int mgrId = window->getViewManager()->getGlobalId();
         if ( isVTK ) {
           SVTK_ViewWindow* vtkVW = dynamic_cast<SVTK_ViewWindow*>( window );
           if ( !vtkVW )
@@ -267,8 +281,8 @@ void GEOMToolsGUI::OnColor()
             SUIT_OverrideCursor();
             for ( SALOME_ListIteratorOfListIO It( selected ); It.More(); It.Next() ) {
               aView->SetColor( It.Value(), c );
-	      appStudy->setObjectProperty(mgrId,It.Value()->getEntry(),COLOR_PROP, c);
+              appStudy->setObjectProperty(mgrId,It.Value()->getEntry(),COLOR_PROP, c);
-	    }
+            }
             GeometryGUI::Modified();
           }
         } // if ( isVTK )
@@ -292,7 +306,7 @@ void GEOMToolsGUI::OnColor()
                   
                   if ( io->IsKind( STANDARD_TYPE(AIS_Shape) ) ) {
                     TopoDS_Shape theShape = Handle(AIS_Shape)::DownCast( io )->Shape();
-		    bool onlyVertex = (theShape.ShapeType() == TopAbs_VERTEX || GEOM_Displayer::isCompoundOfVertices( theShape ));
+                    bool onlyVertex = (theShape.ShapeType() == TopAbs_VERTEX || GEOM_Displayer::isCompoundOfVertices( theShape ));
                     if (onlyVertex) {
                       // Set color for a point
 
@@ -308,7 +322,13 @@ void GEOMToolsGUI::OnColor()
                       else {
                         Standard_Integer aWidth, aHeight;
                         aCurPointAspect->GetTextureSize( aWidth, aHeight );
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+                        Handle(TColStd_HArray1OfByte) aTexture = aCurPointAspect->GetTexture();
+#else
                         Handle(Graphic3d_HArray1OfBytes) aTexture = aCurPointAspect->GetTexture();
+#endif
+
                         aCurDrawer->SetPointAspect(new Prs3d_PointAspect(aColor, 1, aWidth, aHeight, aTexture));
                       }
                       ic->SetLocalAttributes(io, aCurDrawer, Standard_False);
@@ -319,7 +339,7 @@ void GEOMToolsGUI::OnColor()
                   if ( io->IsKind( STANDARD_TYPE(GEOM_AISShape) ) )
                     Handle(GEOM_AISShape)::DownCast( io )->SetShadingColor( aColor );
 
-		  appStudy->setObjectProperty(mgrId,It.Value()->getEntry(), COLOR_PROP, c);
+                  appStudy->setObjectProperty(mgrId,It.Value()->getEntry(), COLOR_PROP, c);
 
                   io->Redisplay( Standard_True );
 
@@ -475,7 +495,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
           newNbUIso = NbIsosDlg->getU();
           newNbVIso = NbIsosDlg->getV();
         } else //Cancel case
-	  return;
+          return;
       }
       else if ( actionType == INCR || actionType == DECR ) {
         int delta = 1;
@@ -491,9 +511,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
 
       for(; ic->MoreCurrent(); ic->NextCurrent()) {
         CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current());
-	
+
-	
-	  
         Handle(AIS_Drawer) CurDrawer = CurObject->Attributes();
         
         CurDrawer->SetUIsoAspect( new Prs3d_IsoAspect(Quantity_NOC_GRAY75, Aspect_TOL_SOLID, 0.5 , newNbUIso) );
@@ -502,9 +520,9 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
         ic->SetLocalAttributes(CurObject, CurDrawer);
         ic->Redisplay(CurObject);
 
-	QString anIsos("%1%2%3");anIsos = anIsos.arg(newNbUIso);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(newNbVIso);
+        QString anIsos("%1%2%3");anIsos = anIsos.arg(newNbUIso);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(newNbVIso);
-	int aMgrId = window->getViewManager()->getGlobalId();
+        int aMgrId = window->getViewManager()->getGlobalId();
-	aStudy->setObjectProperty(aMgrId ,CurObject->getIO()->getEntry(), "Isos", anIsos);
+        aStudy->setObjectProperty(aMgrId ,CurObject->getIO()->getEntry(), "Isos", anIsos);
       }
     }
     GeometryGUI::Modified();
@@ -575,7 +593,7 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
         newNbUIso = NbIsosDlg->getU();
         newNbVIso = NbIsosDlg->getV();
       } else 
-	return; //Cancel case 
+        return; //Cancel case 
     }
     else if ( actionType == INCR || actionType == DECR ) {
       int delta = 1;
@@ -595,9 +613,9 @@ void GEOMToolsGUI::OnNbIsos( ActionType actionType )
         int aIsos[2]={newNbUIso,newNbVIso};
         anActor->SetNbIsos(aIsos);
 
-	QString anIsos("%1%2%3");anIsos = anIsos.arg(newNbUIso);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(newNbVIso);
+        QString anIsos("%1%2%3");anIsos = anIsos.arg(newNbUIso);anIsos = anIsos.arg(DIGIT_SEPARATOR);anIsos = anIsos.arg(newNbVIso);
-	int aMgrId = window->getViewManager()->getGlobalId();
+        int aMgrId = window->getViewManager()->getGlobalId();
-	aStudy->setObjectProperty(aMgrId ,anActor->getIO()->getEntry(), ISOS_PROP, anIsos);
+        aStudy->setObjectProperty(aMgrId ,anActor->getIO()->getEntry(), ISOS_PROP, anIsos);
       }
       anAct = aCollection->GetNextActor();
     }
@@ -644,7 +662,7 @@ void GEOMToolsGUI::OnDeflection()
               CurObject = Handle(GEOM_AISShape)::DownCast(ic->Current());
               ic->SetDeviationCoefficient(CurObject, aNewDC, Standard_True);
               ic->Redisplay(CurObject);
-	      appStudy->setObjectProperty(mgrId,CurObject->getIO()->getEntry(), DEFLECTION_COEFF_PROP, aNewDC);
+              appStudy->setObjectProperty(mgrId,CurObject->getIO()->getEntry(), DEFLECTION_COEFF_PROP, aNewDC);
             }
           }
         }
@@ -713,7 +731,7 @@ void GEOMToolsGUI::OnDeflection()
         if (GEOM_Actor* anActor = GEOM_Actor::SafeDownCast(anAct)) {
           // There are no casting to needed actor.
           anActor->SetDeflection(aDC);
-	  appStudy->setObjectProperty(mgrId, anActor->getIO()->getEntry(), DEFLECTION_COEFF_PROP, aDC);
+          appStudy->setObjectProperty(mgrId, anActor->getIO()->getEntry(), DEFLECTION_COEFF_PROP, aDC);
         }
         anAct = aCollection->GetNextActor();
       }
@@ -768,8 +786,8 @@ void GEOMToolsGUI::OnShowHideChildren( bool show )
           if ( obj ) {
             _PTR(AttributeExpandable) aExp = B->FindOrCreateAttribute( obj, "AttributeExpandable" );
             aExp->SetExpandable( show );
-	    if(!show)
+            if(!show)
-	      disp->EraseWithChildren(IObject,true);
+              disp->EraseWithChildren(IObject,true);
           } // if ( obj )
         } // iterator
       }
@@ -820,7 +838,7 @@ void GEOMToolsGUI::OnUnpublishObject() {
           if ( obj ) {
             _PTR(AttributeDrawable) aDrw = B->FindOrCreateAttribute( obj, "AttributeDrawable" );
             aDrw->SetDrawable( false );
-	    disp->EraseWithChildren(IObject);
+            disp->EraseWithChildren(IObject);
           } // if ( obj )
         } // iterator
         aSelMgr->clearSelected();
@@ -850,8 +868,8 @@ void GEOMToolsGUI::OnPublishObject() {
   bool aLocked = ( _PTR(AttributeStudyProperties)( aStudy->GetProperties() ) )->IsLocked();
   if ( aLocked ) {
     SUIT_MessageBox::warning( app->desktop(),
-			      QObject::tr( "WRN_WARNING" ),
+                              QObject::tr( "WRN_WARNING" ),
-			      QObject::tr( "WRN_STUDY_LOCKED" ) );
+                              QObject::tr( "WRN_STUDY_LOCKED" ) );
     return;
   } 
   

src/GEOMToolsGUI/GEOMToolsGUI_MarkerDlg.cxx

@@ -15,16 +15,17 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 // File   : GEOMToolsGUI_MarkerDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
-//
+
 #include "GEOMToolsGUI_MarkerDlg.h"
 
 #include <GeometryGUI.h>
 #include <GEOM_Displayer.h>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <QtxComboBox.h>
 #include <SUIT_ResourceMgr.h>
 #include <SUIT_Session.h>
@@ -212,33 +213,33 @@ void GEOMToolsGUI_MarkerDlg::accept()
     if (window && window->getViewManager()) {
       int mgrId = window->getViewManager()->getGlobalId();
       if ( selMgr ) {
-	SALOME_ListIO selected;
+        SALOME_ListIO selected;
-	selMgr->selectedObjects( selected );
+        selMgr->selectedObjects( selected );
-	if ( !selected.IsEmpty() ) {
+        if ( !selected.IsEmpty() ) {
-	  _PTR(Study) study = getStudy()->studyDS();
+          _PTR(Study) study = getStudy()->studyDS();
-	  for ( SALOME_ListIteratorOfListIO it( selected ); it.More(); it.Next() ) {
+          for ( SALOME_ListIteratorOfListIO it( selected ); it.More(); it.Next() ) {
-	    _PTR(SObject) aSObject( study->FindObjectID( it.Value()->getEntry() ) );
+            _PTR(SObject) aSObject( study->FindObjectID( it.Value()->getEntry() ) );
-	    GEOM::GEOM_Object_var anObject =
+            GEOM::GEOM_Object_var anObject =
-	      GEOM::GEOM_Object::_narrow( GeometryGUI::ClientSObjectToObject( aSObject ) );
+              GEOM::GEOM_Object::_narrow( GeometryGUI::ClientSObjectToObject( aSObject ) );
-	    if ( !anObject->_is_nil() ) {
+            if ( !anObject->_is_nil() ) {
-	      if ( myWGStack->currentIndex() == 0 ) {
+              if ( myWGStack->currentIndex() == 0 ) {
-		anObject->SetMarkerStd( getMarkerType(), getStandardMarkerScale() );
+                anObject->SetMarkerStd( getMarkerType(), getStandardMarkerScale() );
-		QString aMarker = "%1%2%3";
+                QString aMarker = "%1%2%3";
-		aMarker = aMarker.arg(getMarkerType());
+                aMarker = aMarker.arg(getMarkerType());
-		aMarker = aMarker.arg(DIGIT_SEPARATOR);
+                aMarker = aMarker.arg(DIGIT_SEPARATOR);
-		aMarker = aMarker.arg(getStandardMarkerScale());
+                aMarker = aMarker.arg(getStandardMarkerScale());
-		getStudy()->setObjectProperty(mgrId ,it.Value()->getEntry(),MARKER_TYPE_PROP, aMarker);
+                getStudy()->setObjectProperty(mgrId ,it.Value()->getEntry(),MARKER_TYPE_PROP, aMarker);
-	      }
+              }
-	      else if ( getCustomMarkerID() > 0 ) {
+              else if ( getCustomMarkerID() > 0 ) {
-		anObject->SetMarkerTexture( getCustomMarkerID() );
+                anObject->SetMarkerTexture( getCustomMarkerID() );
-		getStudy()->setObjectProperty(mgrId ,it.Value()->getEntry(),MARKER_TYPE_PROP, QString::number(getCustomMarkerID()));
+                getStudy()->setObjectProperty(mgrId ,it.Value()->getEntry(),MARKER_TYPE_PROP, QString::number(getCustomMarkerID()));
-	      }
+              }
-	    }
+            }
-	  }
+          }
-	  GEOM_Displayer displayer( getStudy() );
+          GEOM_Displayer displayer( getStudy() );
-	  displayer.Redisplay( selected, true );
+          displayer.Redisplay( selected, true );
-	  selMgr->setSelectedObjects( selected );
+          selMgr->setSelectedObjects( selected );
-	}
+        }
       }
     }
   }
@@ -336,7 +337,13 @@ void GEOMToolsGUI_MarkerDlg::addTexture( int id, bool select ) const
 {
   if ( id > 0 && myCustomTypeCombo->index( id ) == -1 ) {
     int tWidth, tHeight;
-    Handle(Graphic3d_HArray1OfBytes) texture = GeometryGUI::getTexture( getStudy(), id, tWidth, tHeight );
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+    Handle(TColStd_HArray1OfByte) texture = GeometryGUI::getTexture(getStudy(), id, tWidth, tHeight);
+#else
+    Handle(Graphic3d_HArray1OfBytes) texture = GeometryGUI::getTexture(getStudy(), id, tWidth, tHeight);
+#endif
+
     if ( !texture.IsNull() && texture->Length() == tWidth*tHeight/8 ) {
       QImage image( tWidth, tHeight, QImage::Format_Mono );
       image.setColor( 0, qRgba( 0, 0, 0, 0   ) );

src/GEOM_I/GEOM_IInsertOperations_i.cc

@@ -18,7 +18,6 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -35,8 +34,15 @@
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <TColStd_HSequenceOfAsciiString.hxx>
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+#include <TColStd_HArray1OfByte.hxx>
+#else
 #include <TDataStd_HArray1OfByte.hxx>
+#endif
 
 //=============================================================================
 /*!
@@ -228,9 +234,20 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo
                                                  const SALOMEDS::TMPFile& theTexture)
 {
   GetOperations()->SetNotDone();
+
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) aTexture;
+#else
   Handle(TDataStd_HArray1OfByte) aTexture;
+#endif
+
   if ( theTexture.length() > 0 ) {
-    aTexture = new TDataStd_HArray1OfByte( 1, theTexture.length() );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+    aTexture = new TColStd_HArray1OfByte (1, theTexture.length());
+#else
+    aTexture = new TDataStd_HArray1OfByte (1, theTexture.length());
+#endif
+
     for ( int i = 0; i < theTexture.length(); i++ )
       aTexture->SetValue( i+1, (Standard_Byte)theTexture[i] );
   }
@@ -242,7 +259,12 @@ SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID,
                                                         CORBA::Long& theHeight)
 {
   int aWidth, aHeight;
-  Handle(TDataStd_HArray1OfByte) aTextureImpl = GetOperations()->GetTexture( theID, aWidth, aHeight );
+#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+  Handle(TColStd_HArray1OfByte) aTextureImpl =
+#else
+  Handle(TDataStd_HArray1OfByte) aTextureImpl =
+#endif
+    GetOperations()->GetTexture(theID, aWidth, aHeight);
   theWidth  = aWidth;
   theHeight = aHeight;
   SALOMEDS::TMPFile_var aTexture;

src/GEOM_I/GEOM_IInsertOperations_i.hh

@@ -18,7 +18,6 @@
 // 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_IInsertOperations_i_HeaderFile
 #define _GEOM_IInsertOperations_i_HeaderFile

src/GEOM_I/Makefile.am

@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  GEOM GEOM : implementaion of GEOM_Gen.idl
 #  File   : Makefile.in
@@ -23,7 +22,7 @@
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
@@ -76,6 +75,7 @@ libGEOMEngine_la_CPPFLAGS =		\
 	$(CAS_CPPFLAGS)			\
 	$(BOOST_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)		\
+	$(GUI_CXXFLAGS)			\
 	-I$(srcdir)/../SKETCHER		\
 	-I$(srcdir)/../ARCHIMEDE	\
 	-I$(srcdir)/../GEOMImpl		\

src/GEOM_I_Superv/Makefile.am

@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  GEOM GEOM : implementaion of GEOM_Superv.idl
 #  File   : Makefile.in
@@ -23,8 +22,8 @@
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
 #  $Header$
+
 # Libraries targets
-#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -44,6 +43,7 @@ libGEOM_SupervEngine_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)			\
 	$(QT_INCLUDES)			\
 	$(KERNEL_CXXFLAGS)		\
+	$(GUI_CXXFLAGS)		\
 	$(BOOST_CPPFLAGS)		\
 	$(CORBA_CXXFLAGS)		\
 	$(CORBA_INCLUDES)		\

src/MeasureGUI/MeasureGUI_AngleDlg.cxx

@@ -15,12 +15,11 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
 // GEOM GEOMGUI : GUI for Geometry component
-//  File   : MeasureGUI_AngleDlg.cxx
+// File   : MeasureGUI_AngleDlg.cxx
-//  Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
+// Author : Julia DOROVSKIKH, Open CASCADE S.A.S.
-//
+
 #include "MeasureGUI_AngleDlg.h"
 #include "MeasureGUI_Widgets.h"
 
@@ -28,6 +27,8 @@
 #include <GEOMBase.h>
 #include <GeometryGUI.h>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <SUIT_Session.h>
 #include <SUIT_Desktop.h>
 #include <SUIT_ResourceMgr.h>
@@ -307,7 +308,7 @@ SALOME_Prs* MeasureGUI_AngleDlg::buildPrs()
 
   if (anAngle > Precision::Angular()) {
     try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
       OCC_CATCH_SIGNALS;
 #endif
       TopoDS_Shape S1, S2;

src/NMTTools/Makefile.am

@@ -15,7 +15,6 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  GEOM NMTTools : partition algorithm
 #  File   : Makefile.in
@@ -139,6 +138,7 @@ dist_libNMTTools_la_SOURCES = \
 libNMTTools_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)	\
+	$(GUI_CXXFLAGS)		\
 	-I$(srcdir)/../NMTDS
 
 libNMTTools_la_LDFLAGS  =		\

src/NMTTools/NMTTools_PaveFiller_2.cxx

@@ -18,18 +18,17 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
 
-//  File:        NMTTools_PaveFiller_2.cxx
+// File:        NMTTools_PaveFiller_2.cxx
-//  Created:     Mon Dec  8 12:02:56 2003
+// Created:     Mon Dec  8 12:02:56 2003
-//  Author:      Peter KURNEV
+// Author:      Peter KURNEV
-//               <pkv@irinox>
-//
 
 #include <Standard_Version.hxx>
 
 #include <NMTTools_PaveFiller.ixx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <Precision.hxx>
 
 #include <gp_Pnt.hxx>
@@ -68,13 +67,6 @@ static
                             const TopoDS_Vertex& aV);
 // Contribution of Samtech www.samcef.com END
 
-// In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
-#ifdef OCC_VERSION_SERVICEPACK
-#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8 | OCC_VERSION_SERVICEPACK)
-#else
-#define OCC_VERSION_LARGE (OCC_VERSION_MAJOR << 24 | OCC_VERSION_MINOR << 16 | OCC_VERSION_MAINTENANCE << 8)
-#endif
-
 //=======================================================================
 // function: PerformVE
 // purpose:
@@ -88,6 +80,7 @@ void NMTTools_PaveFiller::PerformVE()
   Standard_Integer aWith, aNbVEs, aBlockLength, iSDV, nV1;
   Standard_Real aT;
 #if OCC_VERSION_LARGE > 0x06030008
+  // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
   Standard_Boolean bToUpdateVertex;
   Standard_Real aDist;
 #endif
@@ -162,9 +155,10 @@ void NMTTools_PaveFiller::PerformVE()
       //
       //modified by NIZNHY-PKV Mon Dec 28 08:58:05 2009f
 #if OCC_VERSION_LARGE > 0x06030008
-      aFlag=myContext.ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist);
+      // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
+      aFlag = myContext.ComputeVE (aV1, aE2, aT, bToUpdateVertex, aDist);
 #else
-      aFlag=myContext.ComputeVE (aV1, aE2, aT);
+      aFlag = myContext.ComputeVE (aV1, aE2, aT);
 #endif
       //modified by NIZNHY-PKV Mon Dec 28 08:58:13 2009t
       //
@@ -194,6 +188,7 @@ void NMTTools_PaveFiller::PerformVE()
         //
         //modified by NIZNHY-PKV Mon Dec 28 09:00:54 2009f
 #if OCC_VERSION_LARGE > 0x06030008
+        // In OCCT6.3.0sp9 is changed a signature of IntTools_Context::ComputeVE() method
         if (bToUpdateVertex) {
           BRep_Builder aBB;
           //

src/STEPImport/Makefile.am

@@ -15,14 +15,12 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  File   : Makefile.in
 #  Author : Pavel TELKOV
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : GEOM
-#  $Header$
+
-#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -38,7 +36,8 @@ dist_libSTEPImport_la_SOURCES =	\
 
 libSTEPImport_la_CPPFLAGS =	\
 	$(CAS_CPPFLAGS)		\
-	$(KERNEL_CXXFLAGS)
+	$(KERNEL_CXXFLAGS)	\
+	$(GUI_CXXFLAGS)
 
 libSTEPImport_la_LDFLAGS  =			\
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics \

src/STEPImport/STEPImport.cxx

@@ -18,7 +18,7 @@
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
+
 //  File:        STEPImport.cxx
 //  Created:     Wed May 19 14:41:10 2004
 //  Author:      Pavel TELKOV
@@ -27,6 +27,8 @@
 
 #include <Basics_Utils.hxx>
 
+#include <CASCatch_OCCTVersion.hxx>
+
 #include <BRep_Builder.hxx>
 
 #include <IFSelect_ReturnStatus.hxx>
@@ -107,7 +109,7 @@ extern "C"
     BRep_Builder B;
     B.MakeCompound(compound);
     try {
-#if (OCC_VERSION_MAJOR << 16 | OCC_VERSION_MINOR << 8 | OCC_VERSION_MAINTENANCE) > 0x060100
+#if OCC_VERSION_LARGE > 0x06010000
       OCC_CATCH_SIGNALS;
 #endif
       IFSelect_ReturnStatus status = aReader.ReadFile(theFileName.ToCString());