Fix on Bug PAL7927

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

diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh
index 163231ec64ff0f86731c3896cc54d932d167dd7f..d172f3f94ec1442b9c41b865635cd200b93b8d31 100644 (file)
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -28,61 +28,75 @@
 #define __VISU_RESULT_I_H__
 
 #include "VISUConfig.hh"
+#include "SALOME_GenericObj_i.hh"
 
 class VISU_Convertor;
 
 namespace VISU{
   class Result_i : public virtual POA_VISU::Result,
-                   public virtual Storable
+                   public virtual Storable,
+                  public virtual SALOME::GenericObj_i
   {
     Result_i();
     Result_i(const Result_i &);
+
   public:
-    Result_i(SALOMEDS::Study_ptr theStudy);
+    enum TSourceId {eRestoredComponent = -2, eRestoredFile = -1, eFile = 1, eComponent = 2};
+    Result_i(SALOMEDS::Study_ptr theStudy, const TSourceId& aSourceId = eFile);
     virtual ~Result_i();
+    virtual void RemoveFromStudy();
 
     virtual VISU::VISUType GetType() { return VISU::TRESULT;}
     virtual CORBA::Boolean BuildAll();
 
     typedef VISU_Convertor TInput;
-    enum TSourceId {eRestoredComponent = -2, eRestoredFile = -1, eFile = 1, eComponent = 2};
+
   private:
     TSourceId mySourceId;
     TInput *myInput;
     CORBA::Boolean myIsDone;
-    string myName;
+    std::string myName, myInitFileName;
     QFileInfo myFileInfo;
+
   protected:
-    virtual Storable* Build(SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil()) 
-      throw (std::runtime_error&);
+    virtual Storable* Build(SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil()) ;
+
   public:
+    virtual int IsPossible();
+
     virtual Storable* Create(const char* theFileName);
     virtual Storable* Create(SALOMEDS::SObject_ptr theMedSObject);
     virtual Storable* Create(SALOME_MED::FIELD_ptr theField);
     virtual Storable* Restore(SALOMEDS::SObject_ptr theSObject, 
-                             const Storable::TRestoringMap& theMap, const string& thePrefix)
-      throw(std::logic_error&);
+                             const Storable::TRestoringMap& theMap, const std::string& thePrefix);
+
     static Storable* Restore(SALOMEDS::SObject_ptr theSObject, 
-                            const string& thePrefix, const Storable::TRestoringMap& theMap)
-      throw(std::logic_error&);
+                            const std::string& thePrefix, const Storable::TRestoringMap& theMap);
+
     virtual void ToStream(std::ostringstream& theStr);
     virtual const char* GetComment() const;
-    static const string myComment;
+    static const std::string myComment;
     TInput* GetInput();
-    const string& GetName() const { return myName;}
+    const std::string& GetName() const { return myName;}
     const QFileInfo& GetFileInfo() const { return myFileInfo;}
-    Result_i::TSourceId GetSourceId() const { return mySourceId;}
+    const Result_i::TSourceId& GetSourceId() const { return mySourceId;}
+
   private:
     SALOMEDS::SObject_var mySObject;
     SALOMEDS::Study_var myStudyDocument;
     SALOMEDS::SComponent_var mySComponent;
+    
   public:
-    string GetRefFatherEntry();
-    string GetEntry();
+    std::string GetRefFatherEntry();
+    std::string GetEntry();
     const SALOMEDS::SObject_var& GetSObject() const;
     const SALOMEDS::Study_var& GetStudyDocument() const;
     const SALOMEDS::SComponent_var& GetSComponent() const;
+    std::string GetEntry(const std::string& theComment);
+
   };
+
   Result_var FindResult(SALOMEDS::SObject_ptr theSObject);
+  void RemoveFromStudy(SALOMEDS::SObject_ptr theSObject, int theIsAttrOnly = true);
 }
 #endif