From b7aaf5fe0eeaa516ab0db6644b57183b44f760ec Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 24 Aug 2012 13:33:22 +0000 Subject: [PATCH] comment out obsolete methods relating to treatment of notebook variables --- idl/SMESH_Hypothesis.idl | 44 ++--- src/SMESH/SMESH_Hypothesis.cxx | 106 +++++----- src/SMESH/SMESH_Hypothesis.hxx | 22 +-- src/SMESH_I/SMESH_Hypothesis_i.cxx | 184 +++++++++--------- src/SMESH_I/SMESH_Hypothesis_i.hxx | 18 +- .../StdMeshersGUI_StdHypothesisCreator.cxx | 2 +- 6 files changed, 187 insertions(+), 189 deletions(-) diff --git a/idl/SMESH_Hypothesis.idl b/idl/SMESH_Hypothesis.idl index 8d18789ba..f2e43788e 100644 --- a/idl/SMESH_Hypothesis.idl +++ b/idl/SMESH_Hypothesis.idl @@ -80,29 +80,29 @@ module SMESH * \param theParameters is a string containing the notebook variables separated by ":" symbol, * used for Hypothesis creation */ - void SetParameters (in string theParameters); - - /*! - * Return list of notebook variables used for Hypothesis creation separated by ":" symbol - */ - string GetParameters(); - - /*! - * Return list of last notebook variables used for Hypothesis creation. - */ - ListOfParameters GetLastParameters(); - - /*! - * Set list of parameters - * \param theParameters is a string containing the last notebook variables separated by ":" symbol, - * used for Hypothesis creation - */ - void SetLastParameters(in string theParameters); + // void SetParameters (in string theParameters); + + // /*! + // * Return list of notebook variables used for Hypothesis creation separated by ":" symbol + // */ + // string GetParameters(); + + // /*! + // * Return list of last notebook variables used for Hypothesis creation. + // */ + // ListOfParameters GetLastParameters(); + + // /*! + // * Set list of parameters + // * \param theParameters is a string containing the last notebook variables separated by ":" symbol, + // * used for Hypothesis creation + // */ + // void SetLastParameters(in string theParameters); - /*! - * Clear parameters list - */ - void ClearParameters(); + // /*! + // * Clear parameters list + // */ + // void ClearParameters(); /*! * Verify whether hypothesis supports given entity type diff --git a/src/SMESH/SMESH_Hypothesis.cxx b/src/SMESH/SMESH_Hypothesis.cxx index fee310f27..711f463c8 100644 --- a/src/SMESH/SMESH_Hypothesis.cxx +++ b/src/SMESH/SMESH_Hypothesis.cxx @@ -43,7 +43,6 @@ SMESH_Hypothesis::SMESH_Hypothesis(int hypId, int studyId, SMESH_Gen* gen) : SMESHDS_Hypothesis(hypId) { - //MESSAGE("SMESH_Hypothesis::SMESH_Hypothesis"); _gen = gen; _studyId = studyId; StudyContextStruct* myStudyContext = _gen->GetStudyContext(_studyId); @@ -51,9 +50,8 @@ SMESH_Hypothesis::SMESH_Hypothesis(int hypId, _type = PARAM_ALGO; _shapeType = 0; // to be set by algo with TopAbs_Enum _param_algo_dim = -1; // to be set by algo parameter - _parameters = string(); - _lastParameters = string(); - _libName = string(); + //_parameters = string(); + //_lastParameters = string(); } //============================================================================= @@ -177,53 +175,53 @@ SMESH_Mesh* SMESH_Hypothesis::GetMeshByPersistentID(int id) * */ //============================================================================= -void SMESH_Hypothesis::SetParameters(const char *theParameters) -{ - string aNewParameters(theParameters); - if(aNewParameters.size()==0 && _parameters.size()==0) - aNewParameters = " "; - if(_parameters.size()>0) - _parameters +="|"; - _parameters +=aNewParameters; - SetLastParameters(theParameters); -} - -//============================================================================= -/*! - * - */ -//============================================================================= -void SMESH_Hypothesis::ClearParameters() -{ - _parameters = string(); -} - -//============================================================================= -/*! - * - */ -//============================================================================= -char* SMESH_Hypothesis::GetParameters() const -{ - return (char*)_parameters.c_str(); -} - -//============================================================================= -/*! - * - */ -//============================================================================= -char* SMESH_Hypothesis::GetLastParameters() const -{ - return (char*)_lastParameters.c_str(); -} - -//============================================================================= -/*! - * - */ -//============================================================================= -void SMESH_Hypothesis::SetLastParameters(const char* theParameters) -{ - _lastParameters = string(theParameters); -} +// void SMESH_Hypothesis::SetParameters(const char *theParameters) +// { +// string aNewParameters(theParameters); +// if(aNewParameters.size()==0 && _parameters.size()==0) +// aNewParameters = " "; +// if(_parameters.size()>0) +// _parameters +="|"; +// _parameters +=aNewParameters; +// SetLastParameters(theParameters); +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= +// void SMESH_Hypothesis::ClearParameters() +// { +// _parameters = string(); +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= +// char* SMESH_Hypothesis::GetParameters() const +// { +// return (char*)_parameters.c_str(); +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= +// char* SMESH_Hypothesis::GetLastParameters() const +// { +// return (char*)_lastParameters.c_str(); +// } + +// //============================================================================= +// /*! +// * +// */ +// //============================================================================= +// void SMESH_Hypothesis::SetLastParameters(const char* theParameters) +// { +// _lastParameters = string(theParameters); +// } diff --git a/src/SMESH/SMESH_Hypothesis.hxx b/src/SMESH/SMESH_Hypothesis.hxx index 0c81caac7..f6caba16e 100644 --- a/src/SMESH/SMESH_Hypothesis.hxx +++ b/src/SMESH/SMESH_Hypothesis.hxx @@ -77,12 +77,12 @@ public: virtual const char* GetLibName() const; void SetLibName(const char* theLibName); - void SetParameters(const char *theParameters); - char* GetParameters() const; + //void SetParameters(const char *theParameters); + //char* GetParameters() const; - void SetLastParameters(const char* theParameters); - char* GetLastParameters() const; - void ClearParameters(); + // void SetLastParameters(const char* theParameters); + // char* GetLastParameters() const; + // void ClearParameters(); /*! * \brief Initialize my parameter values by the mesh built on the geometry @@ -122,14 +122,14 @@ public: protected: SMESH_Gen* _gen; - int _studyId; - int _shapeType; - int _param_algo_dim; // to be set at descendant hypothesis constructor + int _studyId; + int _shapeType; + int _param_algo_dim; // to be set at descendant hypothesis constructor private: - std::string _libName; - std::string _parameters; - std::string _lastParameters; + std::string _libName; // name of library of plug-in Engine + //std::string _parameters; + //std::string _lastParameters; }; #endif diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index 96131044b..f0fed2964 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -216,98 +216,98 @@ void SMESH_Hypothesis_i::setOldParameters (const char* theParameters) * */ //============================================================================= -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(); - // } -} +// 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(); +// // } +// } //============================================================================= /*! diff --git a/src/SMESH_I/SMESH_Hypothesis_i.hxx b/src/SMESH_I/SMESH_Hypothesis_i.hxx index 593ed85ca..c8ff51ab3 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.hxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.hxx @@ -79,20 +79,20 @@ public: char* GetVarParameter (const char* methodName); // Set list of parameters separated by ":" symbol, used for Hypothesis creation - void SetParameters (const char* theParameters); + // void SetParameters (const char* theParameters); - // Return list of notebook variables used for Hypothesis creation separated by ":" symbol - char* GetParameters(); + // // Return list of notebook variables used for Hypothesis creation separated by ":" symbol + // char* GetParameters(); - //Return list of last notebook variables used for Hypothesis creation. - SMESH::ListOfParameters* GetLastParameters(); + // //Return list of last notebook variables used for Hypothesis creation. + // SMESH::ListOfParameters* GetLastParameters(); - //Set last parameters for not published hypothesis + // //Set last parameters for not published hypothesis - void SetLastParameters(const char* theParameters); + // void SetLastParameters(const char* theParameters); - // Clear parameters list - void ClearParameters(); + // // Clear parameters list + // void ClearParameters(); //Return true if hypothesis was published in study bool IsPublished(); diff --git a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx index 6e902a7f1..87727c20d 100644 --- a/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx +++ b/src/StdMeshersGUI/StdMeshersGUI_StdHypothesisCreator.cxx @@ -747,7 +747,7 @@ bool StdMeshersGUI_StdHypothesisCreator::stdParams( ListOfStdParams& p ) const } SMESH::SMESH_Hypothesis_var hyp = initParamsHypothesis(); - SMESH::ListOfParameters_var aParameters = hyp->GetLastParameters(); + //SMESH::ListOfParameters_var aParameters = hyp->GetLastParameters(); if( hypType()=="LocalLength" ) { -- 2.39.2