- 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() );
+
+ 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.
+
+ // remember theObject
+ SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
+ if ( aSObj->_is_nil() )
+ return;
+ CORBA::String_var anObjEntry = aSObj->GetID();
+ myLastObj = anObjEntry.in();
+
+ // 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() )
+ {
+ // 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 )
+ {
+ // 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;
+ }
+ }
+ // 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
+ pos = varStr.find_first_not_of( separators, pos );
+ // 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
+ }
+ // store variable name
+ if ( pos < varStr.size() )
+ {
+ size_t pos2 = varStr.find_first_of( separators, pos );
+ varNames.push_back( varStr.substr( pos, pos2 - pos));
+ pos = pos2;
+ }
+ }
+ return varNames;
