ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-19 00:20:36 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021811: EDF BLSURFPLUGIN GHS3DPLUGIN: If dump is not historical, dump of hypothesis is incomplete

Browse Source 
read and take into account methods (<accumulative-methods>) that don't
change a value of a meshing parameter but add one more value
This commit is contained in:
eap 2012-08-24 11:46:38 +00:00
parent 98b5f502a9
commit b32dca0dad
1 changed files with 47 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -2356,7 +2356,7 @@ void _pyHypothesis::Assign( const Handle(_pyHypothesis)& theOther,
myGeom = theOther->myGeom; myGeom = theOther->myGeom;
myMesh = theMesh; myMesh = theMesh;
myAlgoType2CreationMethod = theOther->myAlgoType2CreationMethod; myAlgoType2CreationMethod = theOther->myAlgoType2CreationMethod;
//myArgCommands = theOther->myArgCommands; myAccumulativeMethods = theOther->myAccumulativeMethods;
//myUnusedCommands = theOther->myUnusedCommands; //myUnusedCommands = theOther->myUnusedCommands;
// init myCurCrMethod // init myCurCrMethod
GetCreationMethod( theOther->GetAlgoType() ); GetCreationMethod( theOther->GetAlgoType() );
@ -2485,7 +2485,9 @@ bool _pyHypothesis::GetReferredMeshesAndGeom( list< Handle(_pyMesh) >& meshes )
void _pyHypothesis::rememberCmdOfParameter( const Handle(_pyCommand) & theCommand ) void _pyHypothesis::rememberCmdOfParameter( const Handle(_pyCommand) & theCommand )
{ {
// parameters are discriminated by method name // parameters are discriminated by method name
TCollection_AsciiString method = theCommand->GetMethod(); _AString method = theCommand->GetMethod();
if ( myAccumulativeMethods.count( method ))
return; // this method adds values and not override the previus value
// discriminate commands setting different parameters via one method // discriminate commands setting different parameters via one method
// by passing parameter names like e.g. SetOption("size", "0.2") // by passing parameter names like e.g. SetOption("size", "0.2")
@ -2503,7 +2505,7 @@ void _pyHypothesis::rememberCmdOfParameter( const Handle(_pyCommand) & theComman
} }
} }
// parameters are discriminated by method name // parameters are discriminated by method name
list< Handle(_pyCommand)>& cmds = myMeth2Commands[ theCommand->GetMethod() ]; list< Handle(_pyCommand)>& cmds = myMeth2Commands[ method /*theCommand->GetMethod()*/ ];
if ( !cmds.empty() && !isCmdUsedForCompute( cmds.back() )) if ( !cmds.empty() && !isCmdUsedForCompute( cmds.back() ))
{ {
cmds.back()->Clear(); // previous parameter value has not been used cmds.back()->Clear(); // previous parameter value has not been used
@ -3304,7 +3306,7 @@ static inline bool isWord(const char c, const bool dotIsWord)
*/ */
//================================================================================ //================================================================================
TCollection_AsciiString _pyCommand::GetWord( const TCollection_AsciiString & theString, TCollection_AsciiString _pyCommand::GetWord( const _AString & theString,
int & theStartPos, int & theStartPos,
const bool theForward, const bool theForward,
const bool dotIsWord ) const bool dotIsWord )
@ -4173,7 +4175,43 @@ _pyHypothesisReader::_pyHypothesisReader()
} }
} }
} }
// <hypothesis type="BLSURF_Parameters"
// ...
// dim="2">
// <python-wrap>
// <accumulative-methods>
// SetEnforcedVertex,
// SetEnforcedVertexNamed
// </accumulative-methods>
// </python-wrap>
// </hypothesis>
//
LDOM_NodeList hypNodeList = xmlDoc.getElementsByTagName( "hypothesis" );
for ( int i = 0; i < hypNodeList.getLength(); ++i )
{
LDOM_Node hypNode = hypNodeList.item( i );
LDOM_Element& hypElem = (LDOM_Element&) hypNode;
_AString hypType = hypElem.getAttribute("type");
LDOM_NodeList methNodeList = hypElem.getElementsByTagName( "accumulative-methods" );
if ( methNodeList.getLength() != 1 || hypType.IsEmpty() ) continue;
map<_AString, Handle(_pyHypothesis)>::const_iterator type2hyp = myType2Hyp.find( hypType );
if ( type2hyp == myType2Hyp.end() ) continue;
LDOM_Node methNode = methNodeList.item( 0 );
LDOM_Node textNode = methNode.getFirstChild();
_AString text = textNode.getNodeValue();
_AString method;
int pos = 1;
do {
method = _pyCommand::GetWord( text, pos, /*forward= */true );
pos += method.Length();
type2hyp->second->AddAccumulativeMethod( method );
} }
while ( !method.IsEmpty() );
}
} // loop on xmlPaths
} }
//================================================================================ //================================================================================