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=96460dd6fd324357d9bdcad702d288b19936fb86;hp=b677e647b13c6dca7222d71f0206c2be16008342;hb=52d825495306f72048c8754aa5c86c6a390f8262;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070 diff --git a/src/SMESH_I/SMESH_Hypothesis_i.cxx b/src/SMESH_I/SMESH_Hypothesis_i.cxx index b677e647b..96460dd6f 100644 --- a/src/SMESH_I/SMESH_Hypothesis_i.cxx +++ b/src/SMESH_I/SMESH_Hypothesis_i.cxx @@ -1,35 +1,38 @@ -// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2014 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 +// 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. +// 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, 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 -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // File : SMESH_Hypothesis_i.cxx // Author : Paul RASCLE, EDF // Module : SMESH -// $Header$ // -#include -#include #include "SMESH_Hypothesis_i.hxx" #include "SMESH_Gen_i.hxx" -#include "utilities.h" + +#include +#include + +#include +#include using namespace std; @@ -42,12 +45,9 @@ 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; - - MESSAGE( "SMESH_Hypothesis_i::SMESH_Hypothesis_i / Fin" ); }; //============================================================================= @@ -75,7 +75,6 @@ SMESH_Hypothesis_i::~SMESH_Hypothesis_i() char* SMESH_Hypothesis_i::GetName() { - //MESSAGE( "SMESH_Hypothesis_i::GetName" ); return CORBA::string_dup( myBaseImpl->GetName() ); }; @@ -89,7 +88,6 @@ char* SMESH_Hypothesis_i::GetName() char* SMESH_Hypothesis_i::GetLibName() { - MESSAGE( "SMESH_Hypothesis_i::GetLibName" ); return CORBA::string_dup( myBaseImpl->GetLibName() ); }; @@ -103,7 +101,6 @@ char* SMESH_Hypothesis_i::GetLibName() void SMESH_Hypothesis_i::SetLibName(const char* theLibName) { - MESSAGE( "SMESH_Hypothesis_i::SetLibName" ); myBaseImpl->SetLibName( theLibName ); }; @@ -117,7 +114,6 @@ void SMESH_Hypothesis_i::SetLibName(const char* theLibName) CORBA::Long SMESH_Hypothesis_i::GetId() { - MESSAGE( "SMESH_Hypothesis_i::GetId" ); return myBaseImpl->GetID(); } @@ -127,111 +123,104 @@ 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; } -//============================================================================= +//================================================================================ /*! - * SMESH_Hypothesis_i::SetParameters() - * + * \brief Set the pramIndex-th parameter */ -//============================================================================= -void SMESH_Hypothesis_i::SetParameters(const char* theParameters) -{ - SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen(); - 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)); - } - } -} +//================================================================================ -//============================================================================= -/*! - * SMESH_Hypothesis_i::GetParameters() - * - */ -//============================================================================= -char* SMESH_Hypothesis_i::GetParameters() +void SMESH_Hypothesis_i::SetVarParameter (const char* theParameter, + const char* theMethod) { - 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(); + if ( SMESH_Gen_i *gen = SMESH_Gen_i::GetSMESHGen() ) + { + 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() ) + myMethod2VarParams[ theMethod ] = pars[0]; } - return CORBA::string_dup(aResult); } -//============================================================================= +//================================================================================ /*! - * SMESH_Hypothesis_i::GetLastParameters() - * + * \brief Return the pramIndex-th variable parameter used for Hypothesis creation */ -//============================================================================= -SMESH::ListOfParameters* SMESH_Hypothesis_i::GetLastParameters() +//================================================================================ + +char* SMESH_Hypothesis_i::GetVarParameter (const char* theMethod) { - 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]); - } + 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() ); } } - return aResult._retn(); + 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(""); } -//============================================================================= +//================================================================================ /*! - * SMESH_Hypothesis_i::SetLastParameters() + * \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::SetLastParameters(const char* theParameters) +//================================================================================ + +void SMESH_Hypothesis_i::SetHolderHypothesis(const SMESH::SMESH_Hypothesis_ptr hyp) { - if(!IsPublished()) { - myBaseImpl->SetLastParameters(theParameters); - } + myHolder = SMESH::SMESH_Hypothesis::_duplicate( hyp ); } -//============================================================================= + +//================================================================================ /*! - * SMESH_Hypothesis_i::ClearParameters() - * + * \brief Restore myMethod2VarParams by parameters stored in an old study */ -//============================================================================= -void SMESH_Hypothesis_i::ClearParameters() +//================================================================================ + +void SMESH_Hypothesis_i::setOldParameters (const char* theParameters) { - if(!IsPublished()) { - myBaseImpl->ClearParameters(); + 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( CORBA::Object_var( _this() ).in(), 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( CORBA::Object_var( _this() ).in(), "" ); // clear params } } @@ -245,7 +234,6 @@ void SMESH_Hypothesis_i::ClearParameters() ::SMESH_Hypothesis* SMESH_Hypothesis_i::GetImpl() { - //MESSAGE( "SMESH_Hypothesis_i::GetImpl" ); return myBaseImpl; } @@ -259,8 +247,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() ); } @@ -275,7 +273,44 @@ 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(); +} + +//================================================================================ +/*! + * \brief This mesthod is called after completion of loading a study + */ +//================================================================================ + +void SMESH_Hypothesis_i::UpdateAsMeshesRestored() +{ + // for hyps needing full data restored }