NRI : merge from 1.2c

[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 d796d86c3abeb57492396080a17ab39705162893..163231ec64ff0f86731c3896cc54d932d167dd7f 100644 (file)
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -1,5 +1,23 @@
-//  Copyright (C) 2003  CEA/DEN, EDF R&D
+//  VISU OBJECT : interactive object for VISU entities implementation
 //
+//  Copyright (C) 2003  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 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 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
 //
 //
 //  File   : VISU_Result_i.hh
@@ -11,11 +29,7 @@
 
 #include "VISUConfig.hh"
 
-class vtkUnstructuredGridReader;
-class vtkUnstructuredGrid;
 class VISU_Convertor;
-class FieldInfo;
-class QAD_Study;
 
 namespace VISU{
   class Result_i : public virtual POA_VISU::Result,
@@ -27,30 +41,34 @@ namespace VISU{
     Result_i(SALOMEDS::Study_ptr theStudy);
     virtual ~Result_i();
 
-    virtual VISU::VISUType GetType() { return VISU::TRESULT;};
+    virtual VISU::VISUType GetType() { return VISU::TRESULT;}
+    virtual CORBA::Boolean BuildAll();
 
-    typedef VISU_Convertor InputType;
-    typedef vtkUnstructuredGridReader OutputType;
+    typedef VISU_Convertor TInput;
     enum TSourceId {eRestoredComponent = -2, eRestoredFile = -1, eFile = 1, eComponent = 2};
   private:
     TSourceId mySourceId;
-    InputType *myInput;
+    TInput *myInput;
+    CORBA::Boolean myIsDone;
     string myName;
     QFileInfo myFileInfo;
   protected:
-    virtual Storable* Build(SALOMEDS::SObject_ptr theSObject = NULL) 
+    virtual Storable* Build(SALOMEDS::SObject_ptr theSObject = SALOMEDS::SObject::_nil()) 
       throw (std::runtime_error&);
   public:
     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 string& thePrefix, const Storable::TRestoringMap& theMap)
+                             const Storable::TRestoringMap& theMap, const string& thePrefix)
+      throw(std::logic_error&);
+    static Storable* Restore(SALOMEDS::SObject_ptr theSObject, 
+                            const string& thePrefix, const Storable::TRestoringMap& theMap)
       throw(std::logic_error&);
     virtual void ToStream(std::ostringstream& theStr);
     virtual const char* GetComment() const;
     static const string myComment;
-    InputType* GetInput();
+    TInput* GetInput();
     const string& GetName() const { return myName;}
     const QFileInfo& GetFileInfo() const { return myFileInfo;}
     Result_i::TSourceId GetSourceId() const { return mySourceId;}
@@ -65,11 +83,6 @@ namespace VISU{
     const SALOMEDS::Study_var& GetStudyDocument() const;
     const SALOMEDS::SComponent_var& GetSComponent() const;
   };
-  Storable* ResultRestore(SALOMEDS::SObject_ptr theSObject, 
-                          const string& thePrefix, const Storable::TRestoringMap& theMap)
-    throw(std::logic_error&);
   Result_var FindResult(SALOMEDS::SObject_ptr theSObject);
-  QString GenerateName(const string& theFmt, int theId);
-  void WriteToFile(vtkUnstructuredGrid* theDataSet, const string& theFileName);
 }
 #endif