EDF 2281: Added the possibility to choose the orientation of the divided disk

[modules/geom.git] / src / GEOM_I / GEOM_IInsertOperations_i.cc

diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc
index c5570650e29f0f78075416215f28ca22b108d241..e27a6876b0fd5a114ef3f703d58c395d3c9303bb 100644 (file)
--- a/src/GEOM_I/GEOM_IInsertOperations_i.cc
+++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc
@@ -1,23 +1,24 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
 //
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License.
 //
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
 //
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 
 #ifdef WNT
 #pragma warning( disable:4786 )
@@ -34,8 +35,15 @@
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
 
+#include <Basics_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
 
 //=============================================================================
 /*!
@@ -114,10 +122,10 @@ void GEOM_IInsertOperations_i::Export
 
 //=============================================================================
 /*!
- *  Import
+ *  ImportFile
  */
 //=============================================================================
-GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::Import
+GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::ImportFile
                    (const char* theFileName,
                     const char* theFormatName)
 {
@@ -224,24 +232,40 @@ CORBA::Long GEOM_IInsertOperations_i::LoadTexture(const char* theTextureFile)
 }
 
 CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Long theHeight,
-                                                const SALOMEDS::TMPFile& theTexture)
+                                                 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] );
   }
   return GetOperations()->AddTexture( theWidth, theHeight, aTexture );
 }
 
-SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID, 
-                                                       CORBA::Long& theWidth,
-                                                       CORBA::Long& theHeight)
+SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID,
+                                                        CORBA::Long& theWidth,
+                                                        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;