X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_2smeshpy.cxx;h=287c228ff884eef2999f0817dab988e4489cf215;hp=a3041761100ad5f38ffd3c5a961ead1d68dc3d08;hb=765c100cd07fbb5b9e56047ef56be691b01fecf6;hpb=31ca0b3e3be91c2e0e9ea2ec70c828f373bfb086 diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index a30417611..287c228ff 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -285,6 +285,8 @@ namespace { // - FT_BallDiameter = 37 // v 6.7.1: FT_Undefined == 45, new items: // - FT_EntityType = 36 + // v 7.3.0: FT_Undefined == 46, new items: + // - FT_ConnectedElements = 39 // // It's necessary to continue recording this history and to fill // undef2newItems (see below) accordingly. @@ -302,10 +304,9 @@ namespace { undef2newItems[ 39 ].assign( items, items+6 ); } { int items[] = { 14, 15, 16, 17 }; undef2newItems[ 43 ].assign( items, items+4 ); } - { int items[] = { 37 }; - undef2newItems[ 44 ].assign( items, items+1 ); } - { int items[] = { 36 }; - undef2newItems[ 45 ].assign( items, items+1 ); } + undef2newItems[ 44 ].push_back( 37 ); + undef2newItems[ 45 ].push_back( 36 ); + undef2newItems[ 46 ].push_back( 39 ); } int iType = Type.IntegerValue(); @@ -345,7 +346,7 @@ namespace { //================================================================================ /*! - * \brief Convert a python script using commands of smesh.py + * \brief Convert a python script using commands of smeshBuilder.py * \param theScript - Input script * \param theEntry2AccessorMethod - returns method names to access to * objects wrapped with python class @@ -498,7 +499,7 @@ _pyGen::_pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod //================================================================================ /*! - * \brief name of SMESH_Gen in smesh.py + * \brief name of SMESH_Gen in smeshBuilder.py */ //================================================================================ @@ -700,7 +701,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand // 1 2 3 4 5 6 7 8 9 10 // in order to avoid the problem of type mismatch of long and FunctorType const TCollection_AsciiString - SMESH("SMESH."), dfltFunctor("SMESH.FT_Undefined"), dftlTol("1e-07"), dftlPreci("-1"); + SMESH("SMESH."), dfltFunctor("SMESH.FT_Undefined"), dfltTol("1e-07"), dfltPreci("-1"); TCollection_AsciiString Type = aCommand->GetArg(1), // long Compare = aCommand->GetArg(2), // long @@ -744,7 +745,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand // set SMESH.EntityType instead of a numerical Threshold const char* types[SMESH::Entity_Ball+1] = { "Entity_Node", "Entity_0D", "Entity_Edge", "Entity_Quad_Edge", - "Entity_Triangle", "Entity_Quad_Triangle", + "Entity_Triangle", "Entity_Quad_Triangle", "Entity_BiQuad_Triangle", "Entity_Quadrangle", "Entity_Quad_Quadrangle", "Entity_BiQuad_Quadrangle", "Entity_Polygon", "Entity_Quad_Polygon", "Entity_Tetra", "Entity_Quad_Tetra", "Entity_Pyramid", "Entity_Quad_Pyramid", @@ -755,7 +756,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand Threshold = SMESH + types[ iGeom ]; } } - if ( ThresholdID.Length() != 2 && ThresholdStr.Length() != 2) // not '' or "" + if ( ThresholdID.Length() != 2 ) // neither '' nor "" aCommand->SetArg( 4, ThresholdID.SubString( 2, ThresholdID.Length()-1 )); // shape entry else if ( ThresholdStr.Length() != 2 ) aCommand->SetArg( 4, ThresholdStr ); @@ -765,7 +766,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand aCommand->SetArg( 4, Threshold ); // find the last not default arg int lastDefault = 8; - if ( Tolerance == dftlTol ) { + if ( Tolerance == dfltTol ) { lastDefault = 7; if ( BinaryOp == dfltFunctor ) { lastDefault = 6; @@ -776,7 +777,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand if ( 5 < lastDefault ) aCommand->SetArg( 5, UnaryOp ); if ( 6 < lastDefault ) aCommand->SetArg( 6, BinaryOp ); if ( 7 < lastDefault ) aCommand->SetArg( 7, Tolerance ); - if ( Precision != dftlPreci ) + if ( Precision != dfltPreci ) { TCollection_AsciiString crit = aCommand->GetResultValue(); aCommand->GetString() += "; "; @@ -812,8 +813,7 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) } if ( method == "CreateMeshesFromUNV" || method == "CreateMeshesFromSTL" || - method == "CreateMeshesFromCGNS" || - method == "CopyMesh" ) + method == "CopyMesh" ) // command result is a mesh { Handle(_pyMesh) mesh = new _pyMesh( theCommand, theCommand->GetResultValue() ); myMeshes.insert( make_pair( mesh->GetID(), mesh )); @@ -821,7 +821,8 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) } if( method == "CreateMeshesFromMED" || method == "CreateMeshesFromSAUV"|| - method == "CreateMeshesFromGMF" ) + method == "CreateMeshesFromCGNS" || + method == "CreateMeshesFromGMF" ) // command result is ( [mesh1,mesh2], status ) { for ( int ind = 0; ind < theCommand->GetNbResultValues(); ind++ ) { @@ -916,7 +917,7 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) // Replace name of SMESH_Gen - // names of SMESH_Gen methods fully equal to methods defined in smesh.py + // names of SMESH_Gen methods fully equal to methods defined in smeshBuilder.py static TStringSet smeshpyMethods; if ( smeshpyMethods.empty() ) { const char * names[] = @@ -929,7 +930,7 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) // smeshgen.Method() --> smesh.Method() theCommand->SetObject( SMESH_2smeshpy::SmeshpyName() ); else - // smeshgen.Method() --> smesh.smesh.Method() + // smeshgen.Method() --> smesh.Method() theCommand->SetObject( SMESH_2smeshpy::GenName() ); } @@ -982,7 +983,7 @@ void _pyGen::Flush() for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) if ( !hyp->IsNull() ) { (*hyp)->Flush(); - // smeshgen.CreateHypothesis() --> smesh.smesh.CreateHypothesis() + // smeshgen.CreateHypothesis() --> smesh.CreateHypothesis() if ( !(*hyp)->IsWrapped() ) (*hyp)->GetCreationCmd()->SetObject( SMESH_2smeshpy::GenName() ); } @@ -2011,7 +2012,7 @@ void _pyMesh::ClearCommands() void _pyMesh::addFatherMesh( const _pyID& meshID ) { - if ( !meshID.IsEmpty() ) + if ( !meshID.IsEmpty() && meshID != GetID() ) addFatherMesh( Handle(_pyMesh)::DownCast( theGen->FindObject( meshID ))); } @@ -2023,7 +2024,7 @@ void _pyMesh::addFatherMesh( const _pyID& meshID ) void _pyMesh::addFatherMesh( const Handle(_pyMesh)& mesh ) { - if ( !mesh.IsNull() ) + if ( !mesh.IsNull() && mesh->GetID() != GetID() ) { //myFatherMeshes.push_back( mesh ); mesh->myChildMeshes.push_back( this ); @@ -3051,18 +3052,23 @@ void _pyNumberOfSegmentsHyp::Flush() list::reverse_iterator cmd = myUnusedCommands.rbegin(); int distrTypeNb = 0; for ( ; !distrTypeNb && cmd != myUnusedCommands.rend(); ++cmd ) - if ( (*cmd)->GetMethod() == "SetDistrType" ) - distrTypeNb = (*cmd)->GetOrderNb(); - else if (IsWrapped() && (*cmd)->GetMethod() == "SetObjectEntry" ) + if ( (*cmd)->GetMethod() == "SetDistrType" ) { + if ( cmd != myUnusedCommands.rbegin() ) + distrTypeNb = (*cmd)->GetOrderNb(); + } + else if (IsWrapped() && (*cmd)->GetMethod() == "SetObjectEntry" ) { (*cmd)->Clear(); - + } // clear commands before the last SetDistrType() list * cmds[2] = { &myArgCommands, &myUnusedCommands }; + set< int > treatedCmdNbs; // avoid treating same cmd twice for ( int i = 0; i < 2; ++i ) { set uniqueMethods; list & cmdList = *cmds[i]; for ( cmd = cmdList.rbegin(); cmd != cmdList.rend(); ++cmd ) { + if ( !treatedCmdNbs.insert( (*cmd)->GetOrderNb() ).second ) + continue;// avoid treating same cmd twice bool clear = ( (*cmd)->GetOrderNb() < distrTypeNb ); const TCollection_AsciiString& method = (*cmd)->GetMethod(); if ( !clear || method == "SetNumberOfSegments" ) { @@ -3310,19 +3316,22 @@ const TCollection_AsciiString & _pyCommand::GetObject() begPos = 1; } myObj = GetWord( myString, begPos, true ); - // check if object is complex, - // so far consider case like "smesh.smesh.Method()" - if ( int bracketPos = myString.Location( "(", begPos, Length() )) { - //if ( bracketPos==0 ) bracketPos = Length(); - int dotPos = begPos+myObj.Length(); - while ( dotPos+1 < bracketPos ) { - if ( int pos = myString.Location( ".", dotPos+1, bracketPos )) - dotPos = pos; - else - break; + if ( begPos != EMPTY ) + { + // check if object is complex, + // so far consider case like "smesh.Method()" + if ( int bracketPos = myString.Location( "(", begPos, Length() )) { + //if ( bracketPos==0 ) bracketPos = Length(); + int dotPos = begPos+myObj.Length(); + while ( dotPos+1 < bracketPos ) { + if ( int pos = myString.Location( ".", dotPos+1, bracketPos )) + dotPos = pos; + else + break; + } + if ( dotPos > begPos+myObj.Length() ) + myObj = myString.SubString( begPos, dotPos-1 ); } - if ( dotPos > begPos+myObj.Length() ) - myObj = myString.SubString( begPos, dotPos-1 ); } // 1st word after '=' is an object // else // no method -> no object @@ -3710,9 +3719,9 @@ void _pyCommand::Comment() myString.Insert( i, "#" ); for ( int iPart = 0; iPart < myBegPos.Length(); ++iPart ) { - int begPos = GetBegPos( iPart ); + int begPos = GetBegPos( iPart + 1 ); if ( begPos != UNKNOWN ) - SetBegPos( iPart, begPos + 1 ); + SetBegPos( iPart + 1, begPos + 1 ); } } } @@ -3858,7 +3867,16 @@ _pyID _pyObject::FatherID(const _pyID & childID) void _pySelfEraser::Flush() { - if ( GetNbCalls() == 0 ) + int nbCalls = GetNbCalls(); + if ( nbCalls > 0 ) + { + // ignore cleared commands + std::list< Handle(_pyCommand) >& cmds = GetProcessedCmds(); + std::list< Handle(_pyCommand) >::const_iterator cmd = cmds.begin(); + for ( ; cmd != cmds.end(); ++cmd ) + nbCalls -= (*cmd)->IsEmpty(); + } + if ( nbCalls < 1 ) GetCreationCmd()->Clear(); }