-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 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.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
SMESH_Hypothesis_i::SMESH_Hypothesis_i( PortableServer::POA_ptr thePOA )
: SALOME::GenericObj_i( thePOA )
{
- MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Début" );
myBaseImpl = 0;
-
- MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Fin" );
};
//=============================================================================
char* SMESH_Hypothesis_i::GetName()
{
- //MESSAGE( "SMESH_Hypothesis_i::GetName" );
return CORBA::string_dup( myBaseImpl->GetName() );
};
char* SMESH_Hypothesis_i::GetLibName()
{
- MESSAGE( "SMESH_Hypothesis_i::GetLibName" );
return CORBA::string_dup( myBaseImpl->GetLibName() );
};
void SMESH_Hypothesis_i::SetLibName(const char* theLibName)
{
- MESSAGE( "SMESH_Hypothesis_i::SetLibName" );
myBaseImpl->SetLibName( theLibName );
};
CORBA::Long SMESH_Hypothesis_i::GetId()
{
- MESSAGE( "SMESH_Hypothesis_i::GetId" );
return myBaseImpl->GetID();
}
{
if ( SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen() )
{
- gen->UpdateParameters(theParameter);
+ SMESH::SMESH_Hypothesis_var varHolder;
+ if ( myHolder->_is_nil() ) varHolder = _this();
+ else varHolder = myHolder;
+ gen->UpdateParameters( varHolder, theParameter );
const std::vector< std::string >& pars = gen->GetLastParameters();
if ( !pars.empty() )
return CORBA::string_dup("");
}
+//================================================================================
+/*!
+ * \brief Store a hypothesis wrapping this not published one.
+ *
+ * This hyp, which has no own parameters but is published, is used to store variables
+ * defining parameters of this hypothesis.
+ */
+//================================================================================
+
+void SMESH_Hypothesis_i::SetHolderHypothesis(const SMESH::SMESH_Hypothesis_ptr hyp)
+{
+ myHolder = SMESH::SMESH_Hypothesis::_duplicate( hyp );
+}
+
//================================================================================
/*!
* \brief Restore myMethod2VarParams by parameters stored in an old study
if ( pos >= 0 ) aOldParameters = aOldParameters.Split(pos);
pos = aOldParameters.SearchFromEnd(";*=");
if ( pos >= 0 ) aOldParameters.Split(pos-1);
- gen->UpdateParameters( aOldParameters.ToCString() );
+ gen->UpdateParameters( CORBA::Object_var( _this() ).in(), aOldParameters.ToCString() );
myMethod2VarParams.clear();
const std::vector< std::string >& pars = gen->GetLastParameters();
std::string meth = getMethodOfParameter( i, pars.size() );
myMethod2VarParams[ meth ] = pars[i];
}
- gen->UpdateParameters(""); // clear params
+ gen->UpdateParameters( CORBA::Object_var( _this() ).in(), "" ); // clear params
}
}