ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-15 10:08:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

021374: EDF 1898 SMESH: Extrusion of a node to have an edge

Browse Source 
and win32 compatibility ( replace isblank() -> isspace() )
This commit is contained in:
ana 2012-02-16 14:52:20 +00:00
parent e1a3f42b5c
commit e911ec9c1f
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/SMESH_I/SMESH_2smeshpy.cxx
View File

@ -1808,19 +1808,36 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand)
if( pos != -1) if( pos != -1)
{ {
isPyMeshMethod = true; isPyMeshMethod = true;
bool is0DmethId = ( method == "ExtrusionSweepMakeGroups0D" ),
is0DmethObj =( method == "ExtrusionSweepObject0DMakeGroups");
// 1. Remove "MakeGroups" from the Command // 1. Remove "MakeGroups" from the Command
TCollection_AsciiString aMethod = theCommand->GetMethod(); TCollection_AsciiString aMethod = theCommand->GetMethod();
int nbArgsToAdd = diffLastTwoArgsMethods.Contains(aMethod) ? 2 : 1; int nbArgsToAdd = diffLastTwoArgsMethods.Contains(aMethod) ? 2 : 1;
if(is0DmethObj)
pos = pos-2; //Remove "0D" from the Command too
aMethod.Trunc(pos-1); aMethod.Trunc(pos-1);
theCommand->SetMethod(aMethod); theCommand->SetMethod(aMethod);
// 2. And add last "True" argument(s) // 2. And add last "True" argument(s)
while(nbArgsToAdd--) while(nbArgsToAdd--)
theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); theCommand->SetArg(theCommand->GetNbArgs()+1,"True");
if( is0DmethId || is0DmethObj )
theCommand->SetArg(theCommand->GetNbArgs()+1,"True");
} }
} }
// ExtrusionSweep0D() -> ExtrusionSweep()
// ExtrusionSweepObject0D() -> ExtrusionSweepObject()
if ( !isPyMeshMethod && ( method == "ExtrusionSweep0D" ||
method == "ExtrusionSweepObject0D" ))
{
isPyMeshMethod=true;
theCommand->SetMethod( method.SubString( 1, method.Length()-2));
theCommand->SetArg(theCommand->GetNbArgs()+1,"False"); //sets flag "MakeGroups = False"
theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); //sets flag "IsNode = True"
}
// set "ExtrusionAlongPathX()" instead of "ExtrusionAlongPathObjX()" // set "ExtrusionAlongPathX()" instead of "ExtrusionAlongPathObjX()"
if ( !isPyMeshMethod && method == "ExtrusionAlongPathObjX") if ( !isPyMeshMethod && method == "ExtrusionAlongPathObjX")
{ {
@ -2973,12 +2990,12 @@ const TCollection_AsciiString & _pyCommand::GetResultValue()
if ( endPos ) if ( endPos )
{ {
begPos = 1; begPos = 1;
while ( begPos < endPos && isblank( myString.Value( begPos ))) ++begPos; while ( begPos < endPos && isspace( myString.Value( begPos ))) ++begPos;
if ( begPos < endPos ) if ( begPos < endPos )
{ {
SetBegPos( RESULT_IND, begPos ); SetBegPos( RESULT_IND, begPos );
--endPos; --endPos;
while ( begPos < endPos && isblank( myString.Value( endPos ))) --endPos; while ( begPos < endPos && isspace( myString.Value( endPos ))) --endPos;
myRes = myString.SubString( begPos, endPos ); myRes = myString.SubString( begPos, endPos );
} }
} }
@ -3450,7 +3467,7 @@ void _pyCommand::Comment()
if ( IsEmpty() ) return; if ( IsEmpty() ) return;
int i = 1; int i = 1;
while ( i <= Length() && isblank( myString.Value(i) )) ++i; while ( i <= Length() && isspace( myString.Value(i) )) ++i;
if ( i <= Length() ) if ( i <= Length() )
{ {
myString.Insert( i, "#" ); myString.Insert( i, "#" );