MPV: Merge V1_2d

[modules/visu.git] / src / VISU_I / VISU_Vectors_i.hh

diff --git a/src/VISU_I/VISU_Vectors_i.hh b/src/VISU_I/VISU_Vectors_i.hh
index 1a2322d283803e3f45c97ae4b51c25a05d7f101a..fce5d7b01821c362c991c781911f928340162e8e 100644 (file)
--- a/src/VISU_I/VISU_Vectors_i.hh
+++ b/src/VISU_I/VISU_Vectors_i.hh
@@ -39,10 +39,10 @@ namespace VISU{
     Vectors_i();
     Vectors_i(const Vectors_i&);
   public:
-    Vectors_i(Result_i* theResult, bool theAddToStudy = true);
+    Vectors_i(Result_i* theResult, bool theAddToStudy = true,
+             SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil());
     virtual void SameAs(const Vectors_i* theOrigin);
     virtual ~Vectors_i();
-    virtual void Destroy();
 
     virtual VISU::VISUType GetType() { return VISU::TVECTORS;};
 
@@ -67,7 +67,7 @@ namespace VISU{
 
   public:
     static int IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, 
-                         const char* theFieldName, int theIteration);
+                         const char* theFieldName, int theIteration, int isMemoryCheck = true);
     virtual Storable* Create(const char* theMeshName, VISU::Entity theEntity, 
                             const char* theFieldName, int theIteration);
 
@@ -75,10 +75,6 @@ namespace VISU{
 
     virtual Storable* Restore(const Storable::TRestoringMap& theMap)
       throw(std::logic_error&);
-    static Storable* Restore(SALOMEDS::SObject_ptr theSObject, 
-                            const string& thePrefix, const Storable::TRestoringMap& theMap)
-      throw(std::logic_error&);
-
 
     static const string myComment;
     virtual const char* GetComment() const;
@@ -86,7 +82,7 @@ namespace VISU{
 
     virtual VISU_Actor* CreateActor(const Handle(SALOME_InteractiveObject)& theIO = NULL)
       throw (std::runtime_error&);
-    virtual void UpdateActor(VISU_Actor* theActor);
+    virtual void UpdateActor(VISU_Actor* theActor) throw(std::runtime_error&);
   };
 }
 #endif