X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_Hypothesis_i.cxx;h=c6d837f4932f7e2d3c1c237a2061281ed699912b;hb=5d01c143dfe3dd142d2209c418a37de148096e06;hp=96131044beb93cb8c40a7c0687703a91cca6e87a;hpb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx
index 96131044b..c6d837f49 100644
--- a/src/SMESH_I/SMESH_Hypothesis_i.cxx
+++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx
@@ -25,11 +25,14 @@
 //  Author : Paul RASCLE, EDF
 //  Module : SMESH
 //
-#include <iostream>
-#include <sstream>
 #include "SMESH_Hypothesis_i.hxx"
 #include "SMESH_Gen_i.hxx"
-#include "utilities.h"
+
+#include <utilities.h>
+#include <SALOMEDS_wrap.hxx>
+
+#include <iostream>
+#include <sstream>
 
 using namespace std;
 
@@ -42,7 +45,7 @@ using namespace std;
 //=============================================================================
 
 SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA )
-     : SALOME::GenericObj_i( thePOA )
+  : SALOME::GenericObj_i( thePOA )
 {
   MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Début" );
   myBaseImpl = 0;
@@ -127,12 +130,13 @@ CORBA::Long SMESH_Hypothesis_i::GetId()
  *
  */
 //=============================================================================
-bool SMESH_Hypothesis_i::IsPublished(){
+bool SMESH_Hypothesis_i::IsPublished()
+{
   bool res = false;
-  SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen();
-  if(gen){
-    SALOMEDS::SObject_var SO = 
-      SMESH_Gen_i::ObjectToSObject(gen->GetCurrentStudy() , SMESH::SMESH_Hypothesis::_narrow(_this()));
+  if ( SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen())
+  {
+    SALOMEDS::Study_var study = gen->GetCurrentStudy();
+    SALOMEDS::SObject_wrap SO = SMESH_Gen_i::ObjectToSObject( study, _this());
     res = !SO->_is_nil();
   }
   return res;
@@ -210,105 +214,6 @@ void SMESH_Hypothesis_i::setOldParameters (const char* theParameters)
   }
 }
 
-//=============================================================================
-/*!
- *  SMESH_Hypothesis_i::SetParameters()
- *
- */
-//=============================================================================
-void SMESH_Hypothesis_i::SetParameters(const char* theParameters)
-{
-  SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen();
-  //char * aParameters = CORBA::string_dup(theParameters);
-  if(gen){
-    gen->UpdateParameters(theParameters);
-    // if(IsPublished()) {
-    //   SMESH_Gen_i::GetSMESHGen()->UpdateParameters(SMESH::SMESH_Hypothesis::_narrow(_this()),aParameters);
-    // }
-    // else {
-    //   myBaseImpl->SetParameters(gen->ParseParameters(aParameters));
-    // }
-  }
-}
-
-//=============================================================================
-/*!
- *  SMESH_Hypothesis_i::GetParameters()
- *
- */
-//=============================================================================
-char* SMESH_Hypothesis_i::GetParameters()
-{
-  SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen();
-  char* aResult;
-  if(IsPublished()) {
-    MESSAGE("SMESH_Hypothesis_i::GetParameters() : Get Parameters from SObject");
-    aResult = gen->GetParameters(SMESH::SMESH_Hypothesis::_narrow(_this()));
-  }
-  else {
-    MESSAGE("SMESH_Hypothesis_i::GetParameters() : Get local parameters");
-    aResult = myBaseImpl->GetParameters(); 
-  }
-  return CORBA::string_dup(aResult);
-}
-
-//=============================================================================
-/*!
- *  SMESH_Hypothesis_i::GetLastParameters()
- *
- */
-//=============================================================================
-SMESH::ListOfParameters* SMESH_Hypothesis_i::GetLastParameters()
-{
-  SMESH::ListOfParameters_var aResult = new SMESH::ListOfParameters();
-  SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen();
-  if(gen) {
-    char *aParameters;
-    if(IsPublished())
-     aParameters = GetParameters();
-    else
-      aParameters = myBaseImpl->GetLastParameters();
-
-    SALOMEDS::Study_ptr aStudy = gen->GetCurrentStudy();
-    if(!aStudy->_is_nil()) {
-      SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters); 
-      if(aSections->length() > 0) {
-        SALOMEDS::ListOfStrings aVars = aSections[aSections->length()-1];
-        aResult->length(aVars.length());
-        for(int i = 0;i < aVars.length();i++)
-          aResult[i] = CORBA::string_dup( aVars[i]);
-      }
-    }
-  }
-  return aResult._retn();
-}
-
-//=============================================================================
-/*!
- *  SMESH_Hypothesis_i::SetLastParameters()
- *
- */
-//=============================================================================
-void SMESH_Hypothesis_i::SetLastParameters(const char* theParameters)
-{
-  if(!IsPublished()) {
-    myBaseImpl->SetLastParameters(theParameters);
-  }
-}
-//=============================================================================
-/*!
- *  SMESH_Hypothesis_i::ClearParameters()
- *
- */
-//=============================================================================
-void SMESH_Hypothesis_i::ClearParameters()
-{
-  myMethod2VarParams.clear();
-  // if(!IsPublished()) {
-  //   myBaseImpl->ClearParameters();
-  // }
-}
-
 //=============================================================================
 /*!
  *  SMESH_Hypothesis_i::GetImpl