ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-19 04:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021308: Remove hard-coded dependency of the external mesh plugins from the SMESH module

Browse Source 
Map names of variables set via SetVarParameter() to the method name setting them

+  void SetVarParameter (const char* parameter, const char* method);
+  char* GetVarParameter (const char* methodName);

+  std::map< std::string, std::string > myMethod2VarParams; // variable parameters
+
+ public:
+  // Methods for backward compatibility of notebook variables
+  virtual void setOldParameters (const char* theParameters);
+  virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const { return ""; }
+  virtual int getParamIndex(const TCollection_AsciiString& method, int nbVars) const { return -1; }
 };

 // ======================================================
This commit is contained in:
eap 2012-03-07 14:58:06 +00:00
parent f5efe8066b
commit b0d8fa70d6
2 changed files with 151 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
src/SMESH_I/SMESH_Hypothesis_i.cxx
View File

@ -24,7 +24,6 @@
// File : SMESH_Hypothesis_i.cxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
//
#include <iostream>
#include <sstream>
@ -139,6 +138,78 @@ bool SMESH_Hypothesis_i::IsPublished(){
return res;
}
//================================================================================
/*!
* \brief Set the pramIndex-th parameter
*/
//================================================================================
void SMESH_Hypothesis_i::SetVarParameter (const char* theParameter,
const char* theMethod)
{
if ( SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen() )
{
gen->UpdateParameters(theParameter);
const std::vector< std::string >& pars = gen->GetLastParameters();
if ( !pars.empty() )
myMethod2VarParams[ theMethod ] = pars[0];
}
}
//================================================================================
/*!
* \brief Return the pramIndex-th variable parameter used for Hypothesis creation
*/
//================================================================================
char* SMESH_Hypothesis_i::GetVarParameter (const char* theMethod)
{
if ( myMethod2VarParams.count("needs update by old study"))
{
// restore myMethod2VarParams by old study
myMethod2VarParams.clear();
if ( SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen() )
{
CORBA::String_var oldparVar = gen->GetParameters( _this() );
setOldParameters( oldparVar.in() );
}
}
std::map< std::string, std::string >::iterator meth_param = myMethod2VarParams.find( theMethod );
if ( meth_param != myMethod2VarParams.end() )
return CORBA::string_dup( meth_param->second.c_str() );
return CORBA::string_dup("");
}
//================================================================================
/*!
* \brief Restore myMethod2VarParams by parameters stored in an old study
*/
//================================================================================
void SMESH_Hypothesis_i::setOldParameters (const char* theParameters)
{
if ( SMESH_Gen_i* gen = SMESH_Gen_i::GetSMESHGen() )
{
TCollection_AsciiString aOldParameters(theParameters);
int pos = aOldParameters.SearchFromEnd("|");
if ( pos >= 0 ) aOldParameters = aOldParameters.Split(pos);
pos = aOldParameters.SearchFromEnd(";*=");
if ( pos >= 0 ) aOldParameters.Split(pos-1);
gen->UpdateParameters( aOldParameters.ToCString() );
myMethod2VarParams.clear();
const std::vector< std::string >& pars = gen->GetLastParameters();
for ( size_t i = 0; i < pars.size(); ++i )
{
std::string meth = getMethodOfParameter( i, pars.size() );
myMethod2VarParams[ meth ] = pars[i];
}
gen->UpdateParameters(""); // clear params
}
}
//=============================================================================
/*!
* SMESH_Hypothesis_i::SetParameters()
@ -148,14 +219,15 @@ bool SMESH_Hypothesis_i::IsPublished(){
void SMESH_Hypothesis_i::SetParameters(const char* theParameters)
{
SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen();
char * aParameters = CORBA::string_dup(theParameters);
//char * aParameters = CORBA::string_dup(theParameters);
if(gen){
if(IsPublished()) {
SMESH_Gen_i::GetSMESHGen()->UpdateParameters(SMESH::SMESH_Hypothesis::_narrow(_this()),aParameters);
}
else {
myBaseImpl->SetParameters(gen->ParseParameters(aParameters));
}
gen->UpdateParameters(theParameters);
// if(IsPublished()) {
// SMESH_Gen_i::GetSMESHGen()->UpdateParameters(SMESH::SMESH_Hypothesis::_narrow(_this()),aParameters);
// }
// else {
// myBaseImpl->SetParameters(gen->ParseParameters(aParameters));
// }
}
}
@ -231,9 +303,10 @@ void SMESH_Hypothesis_i::SetLastParameters(const char* theParameters)
//=============================================================================
void SMESH_Hypothesis_i::ClearParameters()
{
if(!IsPublished()) {
myBaseImpl->ClearParameters();
}
myMethod2VarParams.clear();
// if(!IsPublished()) {
// myBaseImpl->ClearParameters();
// }
}
//=============================================================================
@ -246,7 +319,6 @@ void SMESH_Hypothesis_i::ClearParameters()
::SMESH_Hypothesis* SMESH_Hypothesis_i::GetImpl()
{
//MESSAGE( "SMESH_Hypothesis_i::GetImpl" );
return myBaseImpl;
}
@ -260,8 +332,18 @@ void SMESH_Hypothesis_i::ClearParameters()
char* SMESH_Hypothesis_i::SaveTo()
{
MESSAGE( "SMESH_Hypothesis_i::SaveTo" );
std::ostringstream os;
// assure that parameters are loaded from an old study
CORBA::String_var p = GetVarParameter("");
os << "VARS " << myMethod2VarParams.size() << " ";
std::map< std::string, std::string >::iterator meth_param = myMethod2VarParams.begin();
for ( ; meth_param != myMethod2VarParams.end(); ++meth_param )
os << meth_param->first << " "
<< meth_param->second.size() << " "
<< meth_param->second << " ";
myBaseImpl->SaveTo( os );
return CORBA::string_dup( os.str().c_str() );
}
@ -276,9 +358,33 @@ char* SMESH_Hypothesis_i::SaveTo()
void SMESH_Hypothesis_i::LoadFrom( const char* theStream )
{
MESSAGE( "SMESH_Hypothesis_i::LoadFrom" );
std::istringstream is( theStream );
if ( strncmp( theStream, "VARS", 4 ) == 0 )
{
int nbVars, len;
char str[256];
std::string meth;
is >> str >> nbVars;
for ( int i = 0; i < nbVars; ++i )
{
is >> meth >> len;
if ( len < 256 )
{
is.get( str, len + 2 ); // 2 - to read at least 1 white space
if ( len > 0 )
myMethod2VarParams[ meth ] = std::string( str+1, len );
}
}
}
else
{
// we can't restore myMethod2VarParams by old study here because SObject
// isn't yet bound to _this()
myMethod2VarParams["needs update by old study"] = "yes";
}
myBaseImpl->LoadFrom( is );
// let listeners know about loading (issue 0020918)
myBaseImpl->NotifySubMeshesHypothesisModification();
}

33
src/SMESH_I/SMESH_Hypothesis_i.hxx
View File

@ -24,7 +24,6 @@
// File : SMESH_Hypothesis_i.hxx
// Author : Paul RASCLE, EDF
// Module : SMESH
// $Header$
//
#ifndef _SMESH_HYPOTHESIS_I_HXX_
#define _SMESH_HYPOTHESIS_I_HXX_
@ -39,6 +38,11 @@
#include "SMESH_Gen.hxx"
#include <map>
#include <string>
class TCollection_AsciiString;
// ======================================================
// Generic hypothesis
// ======================================================
@ -66,6 +70,14 @@ public:
// Get unique id of hypothesis
CORBA::Long GetId();
// Set the variable parameter; method is a name of method setting this parameter.
// This method must be called by the hypothesis creator just before calling hyp->method()
void SetVarParameter (const char* parameter, const char* method);
// Return the variable parameter used for Hypothesis creation by name of method
// setting this parameter
char* GetVarParameter (const char* methodName);
// Set list of parameters separated by ":" symbol, used for Hypothesis creation
void SetParameters (const char* theParameters);
@ -94,7 +106,24 @@ public:
virtual void UpdateAsMeshesRestored(); // for hyps needing full data restored
protected:
::SMESH_Hypothesis* myBaseImpl; // base hypothesis implementation
::SMESH_Hypothesis* myBaseImpl; // base hypothesis implementation
std::map< std::string, std::string > myMethod2VarParams; // variable parameters
public:
// Methods for backward compatibility of notebook variables
// restore myMethod2VarParams by parameters stored in an old study
virtual void setOldParameters (const char* theParameters);
// method used to convert variable parameters stored in an old study
// into myMethod2VarParams. It should return a method name for an index of
// variable parameters. Index is countered from zero
virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const { return ""; }
// method intended to remove explicit treatment of Netgen hypotheses from SMESH_NoteBook
virtual int getParamIndex(const TCollection_AsciiString& method, int nbVars) const { return -1; }
};
// ======================================================