X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Hypothesis_i.cxx;h=d5cdce9fbc609496ddb130f93bfb02d8e1de9e51;hp=96ddd7e3a58cb2c2989993e001e434895af6c01f;hb=c0562941eac9e5a0a8b36d731f3348fe09bf32d0;hpb=7b70ad87bf8f5c46b2751f94cd196932b9ae7122

diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx
index 96ddd7e3a..d5cdce9fb 100644
--- a/src/SMESH_I/SMESH_Hypothesis_i.cxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx
@@ -27,62 +27,155 @@
 //  $Header$
 
 using namespace std;
-using namespace std;
+#include <iostream>
+#include <sstream>
 #include "SMESH_Hypothesis_i.hxx"
-#include "SMESH_Hypothesis.hxx"
-#include "SMESH_Gen.hxx"
 #include "utilities.h"
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Hypothesis_i::SMESH_Hypothesis_i
+ * 
+ *  Constructor
  */
 //=============================================================================
 
-SMESH_Hypothesis_i::SMESH_Hypothesis_i()
+SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA )
+     : SALOME::GenericObj_i( thePOA )
 {
-  MESSAGE("SMESH_Hypothesis_i");
+  MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Début" );
+  myBaseImpl = 0;
+  // _CS_gbo This instruction fails
+  // thePOA->activate_object( this );
+  // _CS_gbo I keep the POA reference to activate the object in the future.
+  myPOA = thePOA;
+  
+  MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Fin" );
 };
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Hypothesis_i::Activate()
+ *
+ *  Activation of the object
+ */
+//=============================================================================
+void SMESH_Hypothesis_i::Activate() {
+  myPOA->activate_object( this );
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Hypothesis_i::~SMESH_Hypothesis_i
+ *
+ *  Destructor
  */
 //=============================================================================
 
 SMESH_Hypothesis_i::~SMESH_Hypothesis_i()
 {
-  MESSAGE("~SMESH_Hypothesis_i");
+  MESSAGE( "SMESH_Hypothesis_i::~SMESH_Hypothesis_i" );
+  if ( myBaseImpl )
+    delete myBaseImpl;
 };
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Hypothesis_i::GetName
+ *
+ *  Get type name of hypothesis
  */
 //=============================================================================
 
 char* SMESH_Hypothesis_i::GetName()
 {
-  MESSAGE("GetName");
-  return CORBA::string_dup(_baseImpl->GetName());
-//   const char* name = _baseImpl->GetName();
-//   SCRUTE(name);
-//   return CORBA::string_dup(name);
+  MESSAGE( "SMESH_Hypothesis_i::GetName" );
+  return CORBA::string_dup( myBaseImpl->GetName() );
+};
+
+//=============================================================================
+/*!
+ *  SMESH_Hypothesis_i::GetLibName
+ *
+ *  Get plugin library name of hypothesis (required by persistency mechanism)
+ */
+//=============================================================================
+
+char* SMESH_Hypothesis_i::GetLibName()
+{
+  MESSAGE( "SMESH_Hypothesis_i::GetLibName" );
+  return CORBA::string_dup( myBaseImpl->GetLibName() );
+};
+
+//=============================================================================
+/*!
+ *  SMESH_Hypothesis_i::SetLibName
+ *
+ *  Set plugin library name of hypothesis (required by persistency mechanism)
+ */
+//=============================================================================
+
+void SMESH_Hypothesis_i::SetLibName(const char* theLibName)
+{
+  MESSAGE( "SMESH_Hypothesis_i::SetLibName" );
+  myBaseImpl->SetLibName( theLibName );
 };
 
 //=============================================================================
 /*!
- *  
+ *  SMESH_Hypothesis_i::GetId
+ *
+ *  Get unique id of hypothesis
  */
 //=============================================================================
 
 CORBA::Long SMESH_Hypothesis_i::GetId()
 {
-  MESSAGE("GetId");
-  return _baseImpl->GetID();
+  MESSAGE( "SMESH_Hypothesis_i::GetId" );
+  return myBaseImpl->GetID();
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Hypothesis_i::GetImpl
+ *
+ *  Get implementation
+ */
+//=============================================================================
+
+::SMESH_Hypothesis* SMESH_Hypothesis_i::GetImpl()
+{
+  MESSAGE( "SMESH_Hypothesis_i::GetImpl" );
+  return myBaseImpl;
+}
+
+//=============================================================================
+/*!
+ *  SMESH_Hypothesis_i::SaveTo
+ *
+ *  Persistence: Dumps parameters to the string stream
+ */
+//=============================================================================
+
+char* SMESH_Hypothesis_i::SaveTo()
+{
+  MESSAGE( "SMESH_Hypothesis_i::SaveTo" );
+  std::ostringstream os;
+  myBaseImpl->SaveTo( os );
+  return CORBA::string_dup( os.str().c_str() );
 }
 
-::SMESH_Hypothesis* SMESH_Hypothesis_i::getImpl()
+//=============================================================================
+/*!
+*  SMESH_Hypothesis_i::LoadFrom
+*
+*  Persistence: Restores parameters from string
+*/
+//=============================================================================
+
+void SMESH_Hypothesis_i::LoadFrom( const char* theStream )
 {
-	return _baseImpl;
-}
\ No newline at end of file
+  MESSAGE( "SMESH_Hypothesis_i::LoadFrom" );
+  std::istringstream is( theStream );
+  myBaseImpl->LoadFrom( is );
+}