X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGEOMImpl%2FGEOMImpl_IInsertOperations.hxx;h=9341c2b8da8a4edf542cb3feb123b85e79bea207;hb=ed87a1f7c81ec39992aff1f463d73dc81e5791e0;hp=e60c22b32847068753773b50edabd11a5e42523c;hpb=73555c78ebf12a1fdb85157b8e7934ad566ae90a;p=modules%2Fgeom.git

diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
index e60c22b32..9341c2b8d 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
@@ -6,7 +6,7 @@
 // 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.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,6 +26,7 @@
 #include "GEOM_IOperations.hxx"
 #include "GEOM_Engine.hxx"
 #include "GEOM_Object.hxx"
+#include "GEOM_Field.hxx"
 
 #include <Basics_OCCTVersion.hxx>
 
@@ -34,15 +35,17 @@
 #include <TDocStd_Document.hxx>
 #include <TColStd_HSequenceOfAsciiString.hxx>
 #include <TCollection_HAsciiString.hxx>
+#include <NCollection_DataMap.hxx>
+#include <NCollection_List.hxx>
 #include <Resource_Manager.hxx>
 
 #include <list>
 
-#if OCC_VERSION_LARGE > 0x06040000 // Porting to OCCT6.5.1
+class GEOMImpl_IShapesOperations;
+class GEOMImpl_IGroupOperations;
+class GEOMImpl_IFieldOperations;
+
 class Handle_TColStd_HArray1OfByte;
-#else
-class Handle_TDataStd_HArray1OfByte;
-#endif
 
 class GEOMImpl_IInsertOperations : public GEOM_IOperations {
  public:
@@ -51,48 +54,36 @@ class GEOMImpl_IInsertOperations : public GEOM_IOperations {
 
 
   Standard_EXPORT Handle(GEOM_Object) MakeCopy (Handle(GEOM_Object) theOriginal);
-
-  Standard_EXPORT Handle(GEOM_Object) Import (const TCollection_AsciiString& theFileName,
-                                              const TCollection_AsciiString& theFormatType);
+  
+  Standard_EXPORT Handle(TColStd_HSequenceOfTransient) Import
+                         (const TCollection_AsciiString& theFileName,
+                          const TCollection_AsciiString& theFormatType);
+  
+  Standard_EXPORT TCollection_AsciiString ReadValue (const TCollection_AsciiString& theFileName,
+                                                     const TCollection_AsciiString& theFormatType,
+                                                     const TCollection_AsciiString& theParameterName);
 
   Standard_EXPORT void Export (const Handle(GEOM_Object)      theOriginal,
                                const TCollection_AsciiString& theFileName,
                                const TCollection_AsciiString& theFormatType);
-
-  Standard_EXPORT Standard_Boolean ImportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats,
-                                                      Handle(TColStd_HSequenceOfAsciiString)& thePatterns);
-
-  Standard_EXPORT Standard_Boolean ExportTranslators (Handle(TColStd_HSequenceOfAsciiString)& theFormats,
-                                                      Handle(TColStd_HSequenceOfAsciiString)& thePatterns);
-
-  Standard_EXPORT Standard_Boolean IsSupported (const Standard_Boolean isImport,
-                                                const TCollection_AsciiString& theFormat,
-                                                Handle(TCollection_HAsciiString)& theLibName);
-
+  
+  Standard_EXPORT Handle(GEOM_Object) RestoreShape (std::istringstream& theStream);
+  
   Standard_EXPORT int LoadTexture(const TCollection_AsciiString& theTextureFile);
-
+  
   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);
+							                               int& theWidth, int& theHeight);
 
   Standard_EXPORT std::list<int> GetAllTextures();
 
  private:
-  Standard_Boolean InitResMgr ();
-
- private:
-  Handle(Resource_Manager) myResMgr;
-  Handle(Resource_Manager) myResMgrUser;
+  std::vector<Handle(Resource_Manager)> myResMgrList;
+  GEOMImpl_IShapesOperations* myShapesOperations;
+  GEOMImpl_IGroupOperations* myGroupOperations;
+  GEOMImpl_IFieldOperations* myFieldOperations;
 };
 
 #endif