return true;
}
-//=======================================================================
-//function : UpdateParameters
-//purpose :
-//=======================================================================
-void SMESH_Gen_i::UpdateParameters(/*CORBA::Object_ptr theObject,*/ const char* theParameters)
+//================================================================================
+/*!
+ * \brief Stores names of variables that WILL be passes as parameters when calling
+ * some method of a given object.
+ * \param [in] theObject - the object whose a method WILL be called with \a theParameters.
+ * \param [in] theParameters - a string contating parameters separated by ':'.
+ */
+//================================================================================
+
+void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theParameters)
{
SALOMEDS::Study_var aStudy = GetCurrentStudy();
if ( aStudy->_is_nil() )
return;
+
+ // find variable names within theParameters
+
myLastParameters.clear();
+ myLastParamIndex.clear(); /* vector holding indices of virables within the string
+ of all varibles used for theObject */
+ int nbVars = 0;
int pos = 0, prevPos = 0, len = strlen( theParameters );
if ( len == 0 ) return;
while ( pos <= len )
{
if ( prevPos < pos )
{
- string val(theParameters + prevPos, theParameters + pos );
+ string val( theParameters + prevPos, theParameters + pos );
if ( !aStudy->IsVariable( val.c_str() ))
val.clear();
myLastParameters.push_back( val );
+ nbVars += (! myLastParameters.back().empty() );
}
else
{
}
++pos;
}
- return;
-
- // OLD VARIANT
-
- // if(VARIABLE_DEBUG)
- // cout<<"UpdateParameters : "<<theParameters<<endl;
- // //SALOMEDS::Study_var aStudy = GetCurrentStudy();
- // if(aStudy->_is_nil() || CORBA::is_nil(theObject))
- // return;
-
- // SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
- // if(aSObj->_is_nil())
- // return;
-
- // SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
-
- // SALOMEDS::GenericAttribute_var aFindAttr;
- // bool hasAttr = aSObj->FindAttribute(aFindAttr, "AttributeString");
- // if(VARIABLE_DEBUG)
- // cout<<"Find Attribute "<<hasAttr<<endl;
-
- // SALOMEDS::GenericAttribute_var anAttr;
- // anAttr = aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString");
- // SALOMEDS::AttributeString_var aStringAttr = SALOMEDS::AttributeString::_narrow(anAttr);
-
- // CORBA::String_var oldparVar = aStringAttr->Value();
- // CORBA::String_var inpparVar = ParseParameters(theParameters);
- // TCollection_AsciiString aNewParams;
- // TCollection_AsciiString aOldParameters(oldparVar.inout());
- // TCollection_AsciiString anInputParams(inpparVar.inout());
- // if(!hasAttr)
- // aNewParams = anInputParams;
- // else
- // {
- // int pos = aOldParameters.SearchFromEnd("|");
- // if(pos==-1) pos = 0;
- // TCollection_AsciiString previousParamFull(aOldParameters.Split(pos));
- // TCollection_AsciiString previousParam(previousParamFull);
- // TCollection_AsciiString theRepet("1");
- // pos = previousParam.SearchFromEnd(";*=");
- // if(pos >= 0)
- // {
- // theRepet = previousParam.Split(pos+2);
- // pos = pos-1;
- // if(pos==-1) pos = 0;
- // previousParam.Split(pos);
- // }
- // if(previousParam == anInputParams)
- // {
- // theRepet = theRepet.IntegerValue()+1;
- // aNewParams = aOldParameters + previousParam + ";*=" + theRepet;
- // }
- // else
- // {
- // aNewParams = aOldParameters + previousParamFull + "|" + anInputParams;
- // }
- // }
-
- // if(VARIABLE_DEBUG)
- // {
- // cout<<"Input Parameters : "<<anInputParams<<endl;
- // cout<<"Old Parameters : "<<aOldParameters<<endl;
- // cout<<"New Parameters : "<<aNewParams<<endl;
- // }
-
- // aStringAttr->SetValue( aNewParams.ToCString() );
-}
-//=======================================================================
-//function : ParseParameters
-//purpose : Replace variables by their values
-//=======================================================================
-char* SMESH_Gen_i::ParseParameters(const char* theParameters)
-{
- //const char* aParameters = theParameters;
-// const char* aParameters = CORBA::string_dup(theParameters);
- TCollection_AsciiString anInputParams;
- SALOMEDS::Study_var aStudy = GetCurrentStudy();
- if( !aStudy->_is_nil() ) {
-// SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
-// for(int j=0;j<aSections->length();j++) {
-// SALOMEDS::ListOfStrings aVars= aSections[j];
-// for(int i=0;i<aVars.length();i++ ) {
-// anInputParams += aStudy->IsVariable(aVars[i].in()) ?
-// TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
-// if(i != aVars.length()-1)
-// anInputParams+=":";
-// }
-// if(j!=aSections->length()-1)
-// anInputParams+="|";
-// }
- TCollection_AsciiString paramStr( theParameters );
- static TCollection_AsciiString separators(":|");
- int beg = 0, end;
- char sep, *pParams = (char*)paramStr.ToCString();
- while ( beg < paramStr.Length() )
+ if ( nbVars < 1 )
+ return;
+
+ // store
+ // (1) variable names in the string of all varibles used for theObject and
+ // (2) indices of found variables in myLastParamIndex.
+
+ SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
+ if ( aSObj->_is_nil() )
+ return;
+
+ // get a string of variable names
+ SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // add new variables and find indices of variables
+ for ( size_t i = 0; i < myLastParameters.size(); ++i )
+ {
+ int varIndex = -1;
+ if ( !myLastParameters[i].empty() )
{
- end = beg-1;
- while ( ++end < paramStr.Length() )
- if ( pParams[end] == ':' || pParams[end] == '|')
- break;
- if ( end < paramStr.Length())
+ // find index of myLastParameters[i] in varStr
+ int curIndex = 0;
+ bool varFound = false;
+ size_t pos = 0;
+ // varStr can be "A|B::C;*=2|D"
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() && !varFound )
{
- sep = pParams[end];
- pParams[end] = '\0';
+ // skip separators
+ while ( separators.find( varStr[ pos ]) != std::string::npos )
+ if ( ++pos >= varStr.size() )
+ break;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // compare variable name
+ if ( pos < varStr.size() )
+ {
+ varFound = ( varStr.compare( pos, myLastParameters[i].size(), myLastParameters[i] ) == 0 &&
+ // same string begining but is length same?
+ ( pos + myLastParameters[i].size() >= varStr.size() ||
+ separators.find( varStr[ pos+1 ]) != std::string::npos ));
+ if ( varFound )
+ varIndex = curIndex;
+ else
+ pos = varStr.find_first_of( separators, pos ); // goto the next separator
+ ++curIndex;
+ }
}
- if ( aStudy->IsVariable( pParams+beg ))
- anInputParams += pParams+beg;
- if ( end < paramStr.Length() )
- anInputParams += sep;
- else
+ // add new variable
+ if ( !varFound )
+ {
+ varStr += ":" + myLastParameters[i];
+ varIndex = curIndex;
+ }
+ }
+ myLastParamIndex.push_back( varIndex );
+ }
+ aStringAttr->SetValue( varStr.c_str() );
+}
+
+//================================================================================
+/*!
+ * \brief Return all variables used to create an object
+ * \param [in] theObjectEntry - an object entry in the current study
+ * \return std::vector< std::string > - all variable names (or values of removed variables)
+ */
+//================================================================================
+
+std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theObjectEntry) const
+{
+ std::vector< std::string > varNames;
+ if ( myCurrentStudy->_is_nil() )
+ return varNames;
+
+ SALOMEDS::SObject_wrap aSObj = myCurrentStudy->FindObjectID( theObjectEntry.c_str() );
+ if ( myCurrentStudy->_is_nil() )
+ return varNames;
+
+ // get a string of variable names
+ SALOMEDS::StudyBuilder_var aStudyBuilder = myCurrentStudy->NewBuilder();
+ SALOMEDS::GenericAttribute_wrap anAttr =
+ aStudyBuilder->FindOrCreateAttribute( aSObj, "AttributeString" );
+ SALOMEDS::AttributeString_wrap aStringAttr = anAttr;
+ CORBA::String_var oldVars = aStringAttr->Value();
+ std::string varStr = oldVars.in();
+
+ // separate variables within varStr;
+ // varStr can be "A|B::C;*=2|D"
+ size_t pos = 0;
+ const std::string separators(":|;*=");
+ while ( pos < varStr.size() )
+ {
+ // skip separators
+ while ( separators.find( varStr[ pos ]) != std::string::npos )
+ if ( ++pos >= varStr.size() )
break;
- beg = end + 1;
+ // skip repetition number following '='
+ if ( varStr[ pos-1 ] == '=' )
+ {
+ while ( '0' <= varStr[ pos ] && varStr[ pos ] <= '9' )
+ ++pos;
+ continue; // to skip next separator
+ }
+ // store variable name
+ if ( pos < varStr.size() )
+ {
+ size_t pos2 = varStr.find_first_of( separators, pos );
+ varNames.push_back( varStr.substr( pos, pos2-1 ));
+ pos = pos2;
}
}
- return CORBA::string_dup(anInputParams.ToCString());
+ return varNames;
}
+//=======================================================================
+//function : ParseParameters
+//purpose : Replace variables by their values
+//=======================================================================
+// char* SMESH_Gen_i::ParseParameters(const char* theParameters)
+// {
+// //const char* aParameters = theParameters;
+// // const char* aParameters = CORBA::string_dup(theParameters);
+// TCollection_AsciiString anInputParams;
+// SALOMEDS::Study_var aStudy = GetCurrentStudy();
+// if( !aStudy->_is_nil() ) {
+// // SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(theParameters);
+// // for(int j=0;j<aSections->length();j++) {
+// // SALOMEDS::ListOfStrings aVars= aSections[j];
+// // for(int i=0;i<aVars.length();i++ ) {
+// // anInputParams += aStudy->IsVariable(aVars[i].in()) ?
+// // TCollection_AsciiString(aVars[i].in()) : TCollection_AsciiString("");
+// // if(i != aVars.length()-1)
+// // anInputParams+=":";
+// // }
+// // if(j!=aSections->length()-1)
+// // anInputParams+="|";
+// // }
+// TCollection_AsciiString paramStr( theParameters );
+// int beg = 0, end;
+// char sep, *pParams = (char*)paramStr.ToCString();
+// while ( beg < paramStr.Length() )
+// {
+// end = beg-1;
+// while ( ++end < paramStr.Length() )
+// if ( pParams[end] == ':' || pParams[end] == '|')
+// break;
+// if ( end < paramStr.Length())
+// {
+// sep = pParams[end];
+// pParams[end] = '\0';
+// }
+// if ( aStudy->IsVariable( pParams+beg ))
+// anInputParams += pParams+beg;
+// if ( end < paramStr.Length() )
+// anInputParams += sep;
+// else
+// break;
+// beg = end + 1;
+// }
+// }
+// return CORBA::string_dup(anInputParams.ToCString());
+// }
+
//=======================================================================
//function : GetParameters
//purpose :
//================================================================================
void SMESH_NoteBook::ReplaceVariables()
{
- for(int i=0;i<_commands.size();i++) {
+ for(int i=0;i<_commands.size();i++)
+ {
Handle(_pyCommand) aCmd = _commands[i];
- TCollection_AsciiString aMethod = aCmd->GetMethod();
- TCollection_AsciiString aObject = aCmd->GetObject();
+ TCollection_AsciiString aMethod = aCmd->GetMethod();
+ TCollection_AsciiString aObject = aCmd->GetObject();
TCollection_AsciiString aResultValue = aCmd->GetResultValue();
if(MYDEBUG) {
cout<<"Command before : "<< aCmd->GetString()<<endl;
cout<<"Result : "<< aResultValue<<endl;
}
+ // NEW APPROACH
+
+ TEntry2VarVecMap::iterator ent2varVec = _entry2VarsMap.find( aObject );
+ if ( ent2varVec != _entry2VarsMap.end() && !ent2varVec->second.empty() )
+ {
+ TCollection_AsciiString & cmdStr = aCmd->GetString();
+ const std::vector< std::string >& vars = ent2varVec->second;
+ int pos = 1, pos2;
+ // look for '$VarIndex$' in cmdStr. TVar::Quote() == '$'
+ while (( pos = cmdStr.Location( 1, SMESH::TVar::Quote(), pos, cmdStr.Length() )) &&
+ ( pos2 = cmdStr.Location( 1, SMESH::TVar::Quote(), pos+1, cmdStr.Length() )) )
+ {
+ size_t varIndex = std::string::npos;
+ const char* varIndexPtr = cmdStr.ToCString() + pos;
+ if ( '0' <= *varIndexPtr && *varIndexPtr <= '9' )
+ varIndex = atoi( varIndexPtr );
+ if ( 0 <= varIndex && varIndex < vars.size() && !vars[varIndex].empty() )
+ {
+ // replace '$VarIndex$' either by var name of var value
+ const char var0 = vars[varIndex][0];
+ const bool isValue = (( '0' <= var0 && var0 <= '9' ) || var0 == '-');
+ if ( isValue ) // remove TVar::Quote() as well
+ pos2 += 2; // pos still points to '$'
+ int indexLen = pos2 - pos - 1;
+ int lenDiff = int( vars[varIndex].size() ) - indexLen;
+ if ( lenDiff > 0 )
+ cmdStr.InsertBefore( pos2, vars[varIndex].c_str() + vars[varIndex].size() - lenDiff );
+ else if ( lenDiff < 0 )
+ cmdStr.Remove( pos+1, -lenDiff );
+ cmdStr.SetValue( pos+(!isValue), vars[varIndex].c_str() );
+ }
+ pos = pos2 + 1;
+ if ( pos + 2 >= cmdStr.Length() )
+ break;
+ }
+ }
+
+ // OLD APPROACH
+
// check if method modifies the object itself
TVariablesMap::const_iterator it = _objectMap.find(aObject);
if(it == _objectMap.end()) // check if method returns a new object
it = _objectMap.find(aResultValue);
if(it == _objectMap.end()) { // check if method modifies a mesh using mesh editor
- TMeshEditorMap::const_iterator meIt = myMeshEditors.find(aObject);
- if(meIt != myMeshEditors.end()) {
+ TMeshEditorMap::const_iterator meIt = _meshEditors.find(aObject);
+ if(meIt != _meshEditors.end()) {
TCollection_AsciiString aMesh = (*meIt).second;
it = _objectMap.find(aMesh);
}
return;
SALOMEDS::ChildIterator_wrap Itr = aStudy->NewChildIterator(aSO);
- CORBA::String_var aParameters;
for( Itr->InitEx(true); Itr->More(); Itr->Next())
{
SALOMEDS::SObject_wrap aSObject = Itr->Value();
if ( aSObject->FindAttribute( anAttr.inout(), "AttributeString"))
{
SALOMEDS::AttributeString_wrap strAttr = anAttr;
- aParameters = strAttr->Value();
+ CORBA::String_var aParameters = strAttr->Value();
+ CORBA::String_var anID = aSObject->GetID();
+ std::vector< std::string > allVars = aGen->GetAllParameters( anID.in() );
SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in());
+ _entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars;
if(MYDEBUG) {
- cout<<"Entry : "<< aSObject->GetID()<<endl;
+ cout<<"Entry : "<< anID<<endl;
cout<<"aParameters : "<<aParameters<<endl;
- }
+ }
TCollection_AsciiString anObjType;
CORBA::Object_var anObject = SMESH_Gen_i::SObjectToObject(aSObject);
SMESH::SMESH_Hypothesis_var aHyp = SMESH::SMESH_Hypothesis::_narrow(anObject);
_commands.push_back(aCommand);
if ( aCommand->GetMethod() == "GetMeshEditor" ) { // MeshEditor creation
- myMeshEditors.insert( make_pair( aCommand->GetResultValue(),
- aCommand->GetObject() ) );
+ _meshEditors.insert( make_pair( aCommand->GetResultValue(),
+ aCommand->GetObject() ) );
}
}
