ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-30 19:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

0051789: TC7.2.0: NoteBook cannot update study

Browse Source 
Fix for "LayerDistribution" hypothesis

+  const std::string & GetLastObjEntry() const { return myLastObj; }

+  std::string  myLastObj;
This commit is contained in:
eap 2013-03-29 13:34:37 +00:00
parent cdff506eaf
commit b72983c0ad
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/SMESH_I/SMESH_Gen_i.hxx
View File

@ -576,6 +576,7 @@ public:
//char* ParseParameters(const char* theParameters); //char* ParseParameters(const char* theParameters);
const std::vector< int >& GetLastParamIndices() const { return myLastParamIndex; } const std::vector< int >& GetLastParamIndices() const { return myLastParamIndex; }
const std::vector< std::string >& GetLastParameters() const { return myLastParameters; } const std::vector< std::string >& GetLastParameters() const { return myLastParameters; }
const std::string & GetLastObjEntry() const { return myLastObj; }
std::vector< std::string > GetAllParameters(const std::string& theObjectEntry) const; std::vector< std::string > GetAllParameters(const std::string& theObjectEntry) const;
private: private:
@ -624,6 +625,7 @@ private:
bool myIsHistoricalPythonDump; bool myIsHistoricalPythonDump;
std::vector< int > myLastParamIndex; std::vector< int > myLastParamIndex;
std::vector< std::string > myLastParameters; std::vector< std::string > myLastParameters;
std::string myLastObj;
}; };

13
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -952,6 +952,7 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
// find variable names within theParameters // find variable names within theParameters
myLastObj.clear();
myLastParameters.clear(); myLastParameters.clear();
myLastParamIndex.clear(); /* vector holding indices of virables within the string myLastParamIndex.clear(); /* vector holding indices of virables within the string
of all varibles used for theObject */ of all varibles used for theObject */
@ -986,9 +987,12 @@ void SMESH_Gen_i::UpdateParameters(CORBA::Object_ptr theObject, const char* theP
// (1) variable names in the string of all varibles used for theObject and // (1) variable names in the string of all varibles used for theObject and
// (2) indices of found variables in myLastParamIndex. // (2) indices of found variables in myLastParamIndex.
// remember theObject
SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject); SALOMEDS::SObject_wrap aSObj = ObjectToSObject(aStudy,theObject);
if ( aSObj->_is_nil() ) if ( aSObj->_is_nil() )
return; return;
CORBA::String_var anObjEntry = aSObj->GetID();
myLastObj = anObjEntry.in();
// get a string of variable names // get a string of variable names
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
@ -1082,9 +1086,10 @@ std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theO
while ( pos < varStr.size() ) while ( pos < varStr.size() )
{ {
// skip separators // skip separators
while ( separators.find( varStr[ pos ]) != std::string::npos ) pos = varStr.find_first_not_of( separators, pos );
if ( ++pos >= varStr.size() ) // while ( separators.find( varStr[ pos ]) != std::string::npos )
break; // if ( ++pos >= varStr.size() )
// break;
// skip repetition number following '=' // skip repetition number following '='
if ( varStr[ pos-1 ] == '=' ) if ( varStr[ pos-1 ] == '=' )
{ {
@ -1096,7 +1101,7 @@ std::vector< std::string > SMESH_Gen_i::GetAllParameters(const std::string& theO
if ( pos < varStr.size() ) if ( pos < varStr.size() )
{ {
size_t pos2 = varStr.find_first_of( separators, pos ); size_t pos2 = varStr.find_first_of( separators, pos );
varNames.push_back( varStr.substr( pos, pos2-1 )); varNames.push_back( varStr.substr( pos, pos2 - pos));
pos = pos2; pos = pos2;
} }
} }