X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_2smeshpy.cxx;h=57a076883f6fa04f107a99bd22e86be21a89fd85;hp=20d18e144fc92ca3017931be2012da3277c1bd7b;hb=20c126bc220757c06b5576f71ed6f34ae85e3e40;hpb=9a55aad5baecc367244bea15905641496d36e1af diff --git a/src/SMESH_I/SMESH_2smeshpy.cxx b/src/SMESH_I/SMESH_2smeshpy.cxx index 20d18e144..57a076883 100644 --- a/src/SMESH_I/SMESH_2smeshpy.cxx +++ b/src/SMESH_I/SMESH_2smeshpy.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 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 @@ -20,19 +20,21 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses // File : SMESH_2smeshpy.cxx // Created : Fri Nov 18 13:20:10 2005 // Author : Edward AGAPOV (eap) // #include "SMESH_2smeshpy.hxx" -#include "utilities.h" #include "SMESH_PythonDump.hxx" #include "SMESH_NoteBook.hxx" #include "SMESH_Filter_i.hxx" +#include +#include + #include +#include #include "SMESH_Gen_i.hxx" /* SALOME headers that include CORBA headers that include windows.h @@ -40,8 +42,18 @@ * that declare methods named GetObject - to apply the same rules of GetObject renaming * and thus to avoid mess with GetObject symbol on Windows */ +#include + +#ifdef WNT +#include +#else +#include +#endif + + IMPLEMENT_STANDARD_HANDLE (_pyObject ,Standard_Transient); IMPLEMENT_STANDARD_HANDLE (_pyCommand ,Standard_Transient); +IMPLEMENT_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient); IMPLEMENT_STANDARD_HANDLE (_pyGen ,_pyObject); IMPLEMENT_STANDARD_HANDLE (_pyMesh ,_pyObject); IMPLEMENT_STANDARD_HANDLE (_pySubMesh ,_pyObject); @@ -56,6 +68,7 @@ IMPLEMENT_STANDARD_HANDLE (_pyNumberOfSegmentsHyp,_pyHypothesis); IMPLEMENT_STANDARD_RTTIEXT(_pyObject ,Standard_Transient); IMPLEMENT_STANDARD_RTTIEXT(_pyCommand ,Standard_Transient); +IMPLEMENT_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient); IMPLEMENT_STANDARD_RTTIEXT(_pyGen ,_pyObject); IMPLEMENT_STANDARD_RTTIEXT(_pyMesh ,_pyObject); IMPLEMENT_STANDARD_RTTIEXT(_pySubMesh ,_pyObject); @@ -112,6 +125,191 @@ namespace { return find( name ) != end(); } }; + + //================================================================================ + /*! + * \brief Map of TCollection_AsciiString initialized by C array of C strings. + * Odd items of the C array are map keys, and even items are values + */ + //================================================================================ + + struct TStringMap: public map + { + /*! + * \brief Filling. The last string must be "" + */ + void Insert(const char* names_values[]) { + for ( int i = 0; names_values[i][0] ; i += 2 ) + insert( make_pair( (char*) names_values[i], names_values[i+1] )); + } + /*! + * \brief Check if a string is in + */ + TCollection_AsciiString Value(const TCollection_AsciiString& name ) { + map< _AString, _AString >::iterator it = find( name ); + return it == end() ? "" : it->second; + } + }; + + //================================================================================ + /*! + * \brief Returns a mesh by object + */ + //================================================================================ + + Handle(_pyMesh) ObjectToMesh( const Handle( _pyObject )& obj ) + { + if ( !obj.IsNull() ) + { + if ( obj->IsKind( STANDARD_TYPE( _pyMesh ))) + return Handle(_pyMesh)::DownCast( obj ); + else if ( obj->IsKind( STANDARD_TYPE( _pySubMesh ))) + return Handle(_pySubMesh)::DownCast( obj )->GetMesh(); + else if ( obj->IsKind( STANDARD_TYPE( _pyGroup ))) + return Handle(_pyGroup)::DownCast( obj )->GetMesh(); + } + return Handle(_pyMesh)(); + } + + //================================================================================ + /*! + * \brief Check if objects used as args have been created by previous commands + */ + //================================================================================ + + void CheckObjectPresence( const Handle(_pyCommand)& cmd, set<_pyID> & presentObjects) + { + for ( int iArg = cmd->GetNbArgs(); iArg; --iArg ) + { + const _pyID& arg = cmd->GetArg( iArg ); + if ( arg.IsEmpty() || arg.Value( 1 ) == '"' || arg.Value( 1 ) == '\'' ) + continue; + list< _pyID > idList = cmd->GetStudyEntries( arg ); + list< _pyID >::iterator id = idList.begin(); + for ( ; id != idList.end(); ++id ) + if ( !theGen->IsGeomObject( *id ) && !presentObjects.count( *id )) + { + cmd->Comment(); + cmd->GetString() += " ### " ; + cmd->GetString() += *id + " has not been yet created"; + return; + } + } + const _pyID& obj = cmd->GetObject(); + if ( !obj.IsEmpty() && cmd->IsStudyEntry( obj ) && !presentObjects.count( obj )) + { + cmd->Comment(); + cmd->GetString() += " ### not created object" ; + } + const _pyID& result = cmd->GetResultValue(); + if ( result.IsEmpty() || result.Value( 1 ) == '"' || result.Value( 1 ) == '\'' ) + return; + list< _pyID > idList = cmd->GetStudyEntries( result ); + list< _pyID >::iterator id = idList.begin(); + for ( ; id != idList.end(); ++id ) + presentObjects.insert( *id ); + } + + //================================================================================ + /*! + * \brief Fix SMESH::FunctorType arguments of SMESH::Filter::Criterion() + */ + //================================================================================ + + void fixFunctorType( TCollection_AsciiString& Type, + TCollection_AsciiString& Compare, + TCollection_AsciiString& UnaryOp, + TCollection_AsciiString& BinaryOp ) + { + // The problem is that dumps of old studies created using filters becomes invalid + // when new items are inserted in the enum SMESH::FunctorType since values + // of this enum are dumped as integer values. + // This function corrects enum values of old studies given as args (Type,Compare,...) + // We can find out how to correct them by value of BinaryOp which can have only two + // values: FT_Undefined or FT_LogicalNOT. + // Hereafter is the history of the enum SMESH::FunctorType since v3.0.0 + // where PythonDump appeared + // v 3.0.0: FT_Undefined == 25 + // v 3.1.0: FT_Undefined == 26, new items: + // - FT_Volume3D = 7 + // v 4.1.2: FT_Undefined == 27, new items: + // - FT_BelongToGenSurface = 17 + // v 5.1.1: FT_Undefined == 32, new items: + // - FT_FreeNodes = 10 + // - FT_FreeFaces = 11 + // - FT_LinearOrQuadratic = 23 + // - FT_GroupColor = 24 + // - FT_ElemGeomType = 25 + // v 5.1.5: FT_Undefined == 33, new items: + // - FT_CoplanarFaces = 26 + // v 6.2.0: FT_Undefined == 39, new items: + // - FT_MaxElementLength2D = 8 + // - FT_MaxElementLength3D = 9 + // - FT_BareBorderVolume = 25 + // - FT_BareBorderFace = 26 + // - FT_OverConstrainedVolume = 27 + // - FT_OverConstrainedFace = 28 + // v 6.5.0: FT_Undefined == 43, new items: + // - FT_EqualNodes = 14 + // - FT_EqualEdges = 15 + // - FT_EqualFaces = 16 + // - FT_EqualVolumes = 17 + // v 6.6.0: FT_Undefined == 44, new items: + // - FT_BallDiameter = 37 + // + // It's necessary to continue recording this history and to fill + // undef2newItems (see below) accordingly. + + typedef map< int, vector< int > > TUndef2newItems; + static TUndef2newItems undef2newItems; + if ( undef2newItems.empty() ) + { + undef2newItems[ 26 ].push_back( 7 ); + undef2newItems[ 27 ].push_back( 17 ); + { int items[] = { 10, 11, 23, 24, 25 }; + undef2newItems[ 32 ].assign( items, items+5 ); } + undef2newItems[ 33 ].push_back( 26 ); + { int items[] = { 8, 9, 25, 26, 27, 28 }; + 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 iType = Type.IntegerValue(); + int iCompare = Compare.IntegerValue(); + int iUnaryOp = UnaryOp.IntegerValue(); + int iBinaryOp = BinaryOp.IntegerValue(); + + // find out integer value of FT_Undefined at the moment of dump + int oldUndefined = iBinaryOp; + if ( iBinaryOp < iUnaryOp ) // BinaryOp was FT_LogicalNOT + oldUndefined += 3; + + // apply history to args + TUndef2newItems::const_iterator undef_items = + undef2newItems.upper_bound( oldUndefined ); + if ( undef_items != undef2newItems.end() ) + { + int* pArg[4] = { &iType, &iCompare, &iUnaryOp, &iBinaryOp }; + for ( ; undef_items != undef2newItems.end(); ++undef_items ) + { + const vector< int > & addedItems = undef_items->second; + for ( size_t i = 0; i < addedItems.size(); ++i ) + for ( int iArg = 0; iArg < 4; ++iArg ) + { + int& arg = *pArg[iArg]; + if ( arg >= addedItems[i] ) + arg++; + } + } + Type = TCollection_AsciiString( iType ); + Compare = TCollection_AsciiString( iCompare ); + UnaryOp = TCollection_AsciiString( iUnaryOp ); + BinaryOp = TCollection_AsciiString( iBinaryOp ); + } + } } //================================================================================ @@ -119,17 +317,21 @@ namespace { * \brief Convert python script using commands of smesh.py * \param theScript - Input script * \retval TCollection_AsciiString - Convertion result + * \param theToKeepAllCommands - to keep all commands or + * to exclude commands relating to objects removed from study * * Class SMESH_2smeshpy declared in SMESH_PythonDump.hxx */ //================================================================================ TCollection_AsciiString -SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript, +SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript, Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod, - Resource_DataMapOfAsciiStringAsciiString& theObjectNames) + Resource_DataMapOfAsciiStringAsciiString& theObjectNames, + SALOMEDS::Study_ptr& theStudy, + const bool theToKeepAllCommands) { - theGen = new _pyGen( theEntry2AccessorMethod, theObjectNames ); + theGen = new _pyGen( theEntry2AccessorMethod, theObjectNames, theStudy, theToKeepAllCommands ); // split theScript into separate commands @@ -166,6 +368,9 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript, MESSAGE_BEGIN ( std::endl << " ######## RESULT ######## " << std::endl<< std::endl ); #endif + // clean commmands of removed objects depending on myIsPublished flag + theGen->ClearCommands(); + // reorder commands after conversion list< Handle(_pyCommand) >::iterator cmd; bool orderChanges; @@ -177,19 +382,23 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript, } while ( orderChanges ); // concat commands back into a script - TCollection_AsciiString aScript; + TCollection_AsciiString aScript, aPrevCmd; + set<_pyID> createdObjects; for ( cmd = theGen->GetCommands().begin(); cmd != theGen->GetCommands().end(); ++cmd ) { #ifdef DUMP_CONVERSION MESSAGE_ADD ( "## COM " << (*cmd)->GetOrderNb() << ": "<< (*cmd)->GetString() << std::endl ); #endif - if ( !(*cmd)->IsEmpty() ) { + if ( !(*cmd)->IsEmpty() && aPrevCmd != (*cmd)->GetString()) { + CheckObjectPresence( *cmd, createdObjects ); + aPrevCmd = (*cmd)->GetString(); aScript += "\n"; - aScript += (*cmd)->GetString(); + aScript += aPrevCmd; } } aScript += "\n"; + theGen->Free(); theGen.Nullify(); return aScript; @@ -202,17 +411,49 @@ SMESH_2smeshpy::ConvertScript(const TCollection_AsciiString& theScript, //================================================================================ _pyGen::_pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod, - Resource_DataMapOfAsciiStringAsciiString& theObjectNames) + Resource_DataMapOfAsciiStringAsciiString& theObjectNames, + SALOMEDS::Study_ptr& theStudy, + const bool theToKeepAllCommands) : _pyObject( new _pyCommand( "", 0 )), myNbCommands( 0 ), myID2AccessorMethod( theEntry2AccessorMethod ), myObjectNames( theObjectNames ), - myNbFilters( 0 ) + myNbFilters( 0 ), + myToKeepAllCommands( theToKeepAllCommands ), + myStudy( SALOMEDS::Study::_duplicate( theStudy )), + myGeomIDNb(0), myGeomIDIndex(-1) { // make that GetID() to return TPythonDump::SMESHGenName() GetCreationCmd()->Clear(); GetCreationCmd()->GetString() = TPythonDump::SMESHGenName(); GetCreationCmd()->GetString() += "="; + + // Find 1st digit of study entry by which a GEOM object differs from a SMESH object + if ( !theObjectNames.IsEmpty() && !CORBA::is_nil( theStudy )) + { + // find a GEOM entry + _pyID geomID; + SALOMEDS::SComponent_wrap geomComp = theStudy->FindComponent("GEOM"); + if ( geomComp->_is_nil() ) return; + CORBA::String_var entry = geomComp->GetID(); + geomID = entry.in(); + + // find a SMESH entry + _pyID smeshID; + Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString e2n( theObjectNames ); + for ( ; e2n.More() && smeshID.IsEmpty(); e2n.Next() ) + if ( _pyCommand::IsStudyEntry( e2n.Key() )) + smeshID = e2n.Key(); + + // find 1st difference between smeshID and geomID + if ( !geomID.IsEmpty() && !smeshID.IsEmpty() ) + for ( int i = 1; i <= geomID.Length() && i <= smeshID.Length(); ++i ) + if ( geomID.Value( i ) != smeshID.Value( i )) + { + myGeomIDNb = geomID.Value( i ); + myGeomIDIndex = i; + } + } } //================================================================================ @@ -248,6 +489,13 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand if ( objID.IsEmpty() ) return aCommand; + // Prevent moving a command creating a sub-mesh to the end of the script + // if the sub-mesh is used in theCommand as argument + if ( _pySubMesh::CanBeArgOfMethod( aCommand->GetMethod() )) + { + PlaceSubmeshAfterItsCreation( aCommand ); + } + // Find an object to process theCommand // SMESH_Gen method? @@ -261,7 +509,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.find( objID ); if ( id_mesh != myMeshes.end() ) { - id_mesh->second->AddProcessedCmd( aCommand ); + //id_mesh->second->AddProcessedCmd( aCommand ); // check for mesh editor object if ( aCommand->GetMethod() == "GetMeshEditor" ) { // MeshEditor creation @@ -278,6 +526,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand } id_mesh->second->Process( aCommand ); + id_mesh->second->AddProcessedCmd( aCommand ); return aCommand; } @@ -285,28 +534,70 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand map< _pyID, Handle(_pyMeshEditor) >::iterator id_editor = myMeshEditors.find( objID ); if ( id_editor != myMeshEditors.end() ) { + const TCollection_AsciiString& method = aCommand->GetMethod(); + + // some commands of SMESH_MeshEditor create meshes and groups + _pyID meshID, groups; + if ( method.Search("MakeMesh") != -1 ) + meshID = aCommand->GetResultValue(); + else if ( method == "MakeBoundaryMesh") + meshID = aCommand->GetResultValue(1); + else if ( method == "MakeBoundaryElements") + meshID = aCommand->GetResultValue(2); + + if ( method.Search("MakeGroups") != -1 || + method == "ExtrusionAlongPathX" || + method == "ExtrusionAlongPathObjX" || + method == "DoubleNodeGroupNew" || + method == "DoubleNodeGroupsNew" || + method == "DoubleNodeElemGroupNew" || + method == "DoubleNodeElemGroupsNew"|| + method == "DoubleNodeElemGroup2New"|| + method == "DoubleNodeElemGroups2New" + ) + groups = aCommand->GetResultValue(); + else if ( method == "MakeBoundaryMesh" ) + groups = aCommand->GetResultValue(2); + else if ( method == "MakeBoundaryElements") + groups = aCommand->GetResultValue(3); + else if ( method == "Create0DElementsOnAllNodes" && + aCommand->GetArg(2).Length() > 2 ) // group name != '' + groups = aCommand->GetResultValue(); + id_editor->second->Process( aCommand ); id_editor->second->AddProcessedCmd( aCommand ); - TCollection_AsciiString processedCommand = aCommand->GetString(); - // some commands of SMESH_MeshEditor create meshes - if ( aCommand->GetMethod().Search("MakeMesh") != -1 ) { - _pyID meshID = aCommand->GetResultValue(); + // create meshes + if ( !meshID.IsEmpty() && + !myMeshes.count( meshID ) && + aCommand->IsStudyEntry( meshID )) + { + TCollection_AsciiString processedCommand = aCommand->GetString(); Handle(_pyMesh) mesh = new _pyMesh( aCommand, meshID ); - aCommand->GetString() = processedCommand; // discard changes made by _pyMesh myMeshes.insert( make_pair( meshID, mesh )); + aCommand->Clear(); + aCommand->GetString() = processedCommand; // discard changes made by _pyMesh } - if ( aCommand->GetMethod() == "MakeBoundaryMesh") { - _pyID meshID = aCommand->GetResultValue(0); - if ( !myMeshes.count( meshID ) ) - { - Handle(_pyMesh) mesh = new _pyMesh( aCommand, meshID ); - aCommand->GetString() = processedCommand; // discard changes made by _pyMesh - myMeshes.insert( make_pair( meshID, mesh )); - } + // create groups + if ( !groups.IsEmpty() ) + { + if ( !aCommand->IsStudyEntry( meshID )) + meshID = id_editor->second->GetMesh(); + Handle(_pyMesh) mesh = myMeshes[ meshID ]; + + list< _pyID > idList = aCommand->GetStudyEntries( groups ); + list< _pyID >::iterator grID = idList.begin(); + for ( ; grID != idList.end(); ++grID ) + if ( !myObjects.count( *grID )) + { + Handle(_pyGroup) group = new _pyGroup( aCommand, *grID ); + AddObject( group ); + if ( !mesh.IsNull() ) mesh->AddGroup( group ); + } } return aCommand; - } + } // SMESH_MeshEditor methods + // SMESH_Hypothesis method? list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); for ( ; hyp != myHypos.end(); ++hyp ) @@ -381,6 +672,7 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand Tolerance = aCommand->GetArg(8), // double TypeOfElement = aCommand->GetArg(9), // ElementType Precision = aCommand->GetArg(10); // long + fixFunctorType( Type, Compare, UnaryOp, BinaryOp ); Type = SMESH + SMESH::FunctorTypeToString( SMESH::FunctorType( Type.IntegerValue() )); Compare = SMESH + SMESH::FunctorTypeToString( SMESH::FunctorType( Compare.IntegerValue() )); UnaryOp = SMESH + SMESH::FunctorTypeToString( SMESH::FunctorType( UnaryOp.IntegerValue() )); @@ -397,16 +689,18 @@ Handle(_pyCommand) _pyGen::AddCommand( const TCollection_AsciiString& theCommand if ( Type == "SMESH.FT_ElemGeomType" && Threshold.IsIntegerValue() ) { // set SMESH.GeometryType instead of a numerical Threshold - const char* types[SMESH::Geom_POLYHEDRA+1] = { + const char* types[SMESH::Geom_BALL+1] = { "Geom_POINT", "Geom_EDGE", "Geom_TRIANGLE", "Geom_QUADRANGLE", "Geom_POLYGON", "Geom_TETRA", "Geom_PYRAMID", "Geom_HEXA", "Geom_PENTA", "Geom_HEXAGONAL_PRISM", - "Geom_POLYHEDRA" + "Geom_POLYHEDRA", "Geom_BALL" }; int iGeom = Threshold.IntegerValue(); if ( -1 < iGeom && iGeom < SMESH::Geom_POLYHEDRA+1 ) Threshold = SMESH + types[ iGeom ]; } - if ( ThresholdStr.Length() != 2 ) // not '' or "" + if ( ThresholdID.Length() != 2 && ThresholdStr.Length() != 2) // not '' or "" + aCommand->SetArg( 4, ThresholdID.SubString( 2, ThresholdID.Length()-1 )); // shape entry + else if ( ThresholdStr.Length() != 2 ) aCommand->SetArg( 4, ThresholdStr ); else if ( ThresholdID.Length() != 2 ) aCommand->SetArg( 4, ThresholdID ); @@ -468,12 +762,16 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) myMeshes.insert( make_pair( mesh->GetID(), mesh )); return; } - if( method == "CreateMeshesFromMED" || method == "CreateMeshesFromSAUV") + if( method == "CreateMeshesFromMED" || + method == "CreateMeshesFromSAUV"|| + method == "CreateMeshesFromGMF" ) { for(int ind = 0;indGetNbResultValues();ind++) { - Handle(_pyMesh) mesh = new _pyMesh( theCommand, theCommand->GetResultValue(ind)); - myMeshes.insert( make_pair( theCommand->GetResultValue(ind), mesh )); + _pyID meshID = theCommand->GetResultValue(ind+1); + if ( !theCommand->IsStudyEntry( meshID ) ) continue; + Handle(_pyMesh) mesh = new _pyMesh( theCommand, theCommand->GetResultValue(ind+1)); + myMeshes.insert( make_pair( mesh->GetID(), mesh )); } } @@ -501,7 +799,8 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) if ( id_mesh != myMeshes.end() ) { theCommand->SetObject( meshID ); theCommand->RemoveArgs(); - id_mesh->second->Flush(); + id_mesh->second->Process( theCommand ); + id_mesh->second->AddProcessedCmd( theCommand ); return; } } @@ -516,11 +815,12 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) _pyID geom = theCommand->GetArg( 2 ); theCommand->RemoveArgs(); theCommand->SetArg( 1, geom ); + id_mesh->second->AddProcessedCmd( theCommand ); return; } } - // objects erasing creation command if no more it's commands invoked: + // objects erasing creation command if no more its commands invoked: // SMESH_Pattern, FilterManager if ( method == "GetPattern" || method == "CreateFilterManager" || @@ -529,9 +829,8 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) if ( !myObjects.insert( make_pair( obj->GetID(), obj )).second ) theCommand->Clear(); // already created } - // Concatenate( [mesh1, ...], ... ) - if ( method == "Concatenate" || method == "ConcatenateWithGroups") + else if ( method == "Concatenate" || method == "ConcatenateWithGroups") { if ( method == "ConcatenateWithGroups" ) { theCommand->SetMethod( "Concatenate" ); @@ -541,6 +840,14 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) myMeshes.insert( make_pair( mesh->GetID(), mesh )); AddMeshAccessorMethod( theCommand ); } + else if ( method == "SetName" ) // SetName(obj,name) + { + // store theCommand as one of object commands to erase it along with the object + const _pyID& objID = theCommand->GetArg( 1 ); + Handle(_pyObject) obj = FindObject( objID ); + if ( !obj.IsNull() ) + obj->AddProcessedCmd( theCommand ); + } // Replace name of SMESH_Gen @@ -569,16 +876,45 @@ void _pyGen::Process( const Handle(_pyCommand)& theCommand ) void _pyGen::Flush() { - // create empty command + // create an empty command myLastCommand = new _pyCommand(); - map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.begin(); - for ( ; id_mesh != myMeshes.end(); ++id_mesh ) + map< _pyID, Handle(_pyMesh) >::iterator id_mesh; + map< _pyID, Handle(_pyObject) >::iterator id_obj; + list< Handle(_pyHypothesis) >::iterator hyp; + + if ( IsToKeepAllCommands() ) // historical dump + { + // set myIsPublished = true to all objects + for ( id_mesh = myMeshes.begin(); id_mesh != myMeshes.end(); ++id_mesh ) + id_mesh->second->SetRemovedFromStudy( false ); + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) + (*hyp)->SetRemovedFromStudy( false ); + for ( id_obj = myObjects.begin(); id_obj != myObjects.end(); ++id_obj ) + id_obj->second->SetRemovedFromStudy( false ); + } + else + { + // let hypotheses find referred objects in order to prevent clearing + // not published referred hyps (it's needed for hyps like "LayerDistribution") + list< Handle(_pyMesh) > fatherMeshes; + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) + if ( !hyp->IsNull() ) + (*hyp)->GetReferredMeshesAndGeom( fatherMeshes ); + } + // set myIsPublished = false to all objects depending on + // meshes built on a removed geometry + for ( id_mesh = myMeshes.begin(); id_mesh != myMeshes.end(); ++id_mesh ) + if ( id_mesh->second->IsNotGeomPublished() ) + id_mesh->second->SetRemovedFromStudy( true ); + + // Flush meshes + for ( id_mesh = myMeshes.begin(); id_mesh != myMeshes.end(); ++id_mesh ) if ( ! id_mesh->second.IsNull() ) id_mesh->second->Flush(); - list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); - for ( ; hyp != myHypos.end(); ++hyp ) + // Flush hyps + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) if ( !hyp->IsNull() ) { (*hyp)->Flush(); // smeshgen.CreateHypothesis() --> smesh.smesh.CreateHypothesis() @@ -586,8 +922,8 @@ void _pyGen::Flush() (*hyp)->GetCreationCmd()->SetObject( SMESH_2smeshpy::GenName() ); } - map< _pyID, Handle(_pyObject) >::iterator id_obj = myObjects.begin(); - for ( ; id_obj != myObjects.end(); ++id_obj ) + // Flush other objects + for ( id_obj = myObjects.begin(); id_obj != myObjects.end(); ++id_obj ) if ( ! id_obj->second.IsNull() ) id_obj->second->Flush(); @@ -595,6 +931,88 @@ void _pyGen::Flush() myCommands.push_back( myLastCommand ); } +//================================================================================ +/*! + * \brief Prevent moving a command creating a sub-mesh to the end of the script + * if the sub-mesh is used in theCmdUsingSubmesh as argument + */ +//================================================================================ + +void _pyGen::PlaceSubmeshAfterItsCreation( Handle(_pyCommand) theCmdUsingSubmesh ) const +{ + map< _pyID, Handle(_pyObject) >::const_iterator id_obj = myObjects.begin(); + for ( ; id_obj != myObjects.end(); ++id_obj ) + { + if ( !id_obj->second->IsKind( STANDARD_TYPE( _pySubMesh ))) continue; + for ( int iArg = theCmdUsingSubmesh->GetNbArgs(); iArg; --iArg ) + { + const _pyID& arg = theCmdUsingSubmesh->GetArg( iArg ); + if ( arg.IsEmpty() || arg.Value( 1 ) == '"' || arg.Value( 1 ) == '\'' ) + continue; + list< _pyID > idList = theCmdUsingSubmesh->GetStudyEntries( arg ); + list< _pyID >::iterator id = idList.begin(); + for ( ; id != idList.end(); ++id ) + if ( id_obj->first == *id ) + // _pySubMesh::Process() does what we need + Handle(_pySubMesh)::DownCast( id_obj->second )->Process( theCmdUsingSubmesh ); + } + } +} + +//================================================================================ +/*! + * \brief Clean commmands of removed objects depending on myIsPublished flag + */ +//================================================================================ + +void _pyGen::ClearCommands() +{ + map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.begin(); + for ( ; id_mesh != myMeshes.end(); ++id_mesh ) + id_mesh->second->ClearCommands(); + + list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); + for ( ; hyp != myHypos.end(); ++hyp ) + if ( !hyp->IsNull() ) + (*hyp)->ClearCommands(); + + map< _pyID, Handle(_pyObject) >::iterator id_obj = myObjects.begin(); + for ( ; id_obj != myObjects.end(); ++id_obj ) + id_obj->second->ClearCommands(); +} + +//================================================================================ +/*! + * \brief Release mutual handles of objects + */ +//================================================================================ + +void _pyGen::Free() +{ + map< _pyID, Handle(_pyMesh) >::iterator id_mesh = myMeshes.begin(); + for ( ; id_mesh != myMeshes.end(); ++id_mesh ) + id_mesh->second->Free(); + myMeshes.clear(); + + map< _pyID, Handle(_pyMeshEditor) >::iterator id_ed = myMeshEditors.begin(); + for ( ; id_ed != myMeshEditors.end(); ++id_ed ) + id_ed->second->Free(); + myMeshEditors.clear(); + + map< _pyID, Handle(_pyObject) >::iterator id_obj = myObjects.begin(); + for ( ; id_obj != myObjects.end(); ++id_obj ) + id_obj->second->Free(); + myObjects.clear(); + + list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); + for ( ; hyp != myHypos.end(); ++hyp ) + if ( !hyp->IsNull() ) + (*hyp)->Free(); + myHypos.clear(); + + myFile2ExportedMesh.clear(); +} + //================================================================================ /*! * \brief Add access method to mesh that is an argument @@ -821,7 +1239,37 @@ _pyID _pyGen::GenerateNewID( const _pyID& theID ) void _pyGen::AddObject( Handle(_pyObject)& theObj ) { - myObjects.insert( make_pair( theObj->GetID(), theObj )); + if ( theObj.IsNull() ) return; + + if ( theObj->IsKind( STANDARD_TYPE( _pyMesh ))) + myMeshes.insert( make_pair( theObj->GetID(), Handle(_pyMesh)::DownCast( theObj ))); + + else if ( theObj->IsKind( STANDARD_TYPE( _pyMeshEditor ))) + myMeshEditors.insert( make_pair( theObj->GetID(), Handle(_pyMeshEditor)::DownCast( theObj ))); + + else + myObjects.insert( make_pair( theObj->GetID(), theObj )); +} + +//================================================================================ +/*! + * \brief Re-register an object with other ID to make it Process() commands of + * other object having this ID + */ +//================================================================================ + +void _pyGen::SetProxyObject( const _pyID& theID, Handle(_pyObject)& theObj ) +{ + if ( theObj.IsNull() ) return; + + if ( theObj->IsKind( STANDARD_TYPE( _pyMesh ))) + myMeshes.insert( make_pair( theID, Handle(_pyMesh)::DownCast( theObj ))); + + else if ( theObj->IsKind( STANDARD_TYPE( _pyMeshEditor ))) + myMeshEditors.insert( make_pair( theID, Handle(_pyMeshEditor)::DownCast( theObj ))); + + else + myObjects.insert( make_pair( theID, theObj )); } //================================================================================ @@ -842,123 +1290,145 @@ Handle(_pyObject) _pyGen::FindObject( const _pyID& theObjID ) const if ( id_obj != myMeshes.end() ) return id_obj->second; } + // { + // map< _pyID, Handle(_pyMeshEditor) >::const_iterator id_obj = myMeshEditors.find( theObjID ); + // if ( id_obj != myMeshEditors.end() ) + // return id_obj->second; + // } + return Handle(_pyObject)(); +} + +//================================================================================ +/*! + * \brief Check if a study entry is under GEOM component + */ +//================================================================================ + +bool _pyGen::IsGeomObject(const _pyID& theObjID) const +{ + if ( myGeomIDNb ) { - map< _pyID, Handle(_pyMeshEditor) >::const_iterator id_obj = myMeshEditors.find( theObjID ); - if ( id_obj != myMeshEditors.end() ) - return id_obj->second; + return ( myGeomIDIndex <= theObjID.Length() && + int( theObjID.Value( myGeomIDIndex )) == myGeomIDNb && + _pyCommand::IsStudyEntry( theObjID )); } - return Handle(_pyObject)(); + return false; } //================================================================================ /*! - * \brief Returns true if an object is removed from study + * \brief Returns true if an object is not present in a study */ //================================================================================ -bool _pyGen::IsDead(const _pyID& theObjID) const +bool _pyGen::IsNotPublished(const _pyID& theObjID) const { if ( theObjID.IsEmpty() ) return false; - const bool hasStudyName = myObjectNames.IsBound( theObjID ); - return !hasStudyName; -} - -//================================================================================ -/*! - * \brief Find out type of geom group - * \param grpID - The geom group entry - * \retval int - The type - */ -//================================================================================ - -// static bool sameGroupType( const _pyID& grpID, -// const TCollection_AsciiString& theType) -// { -// // define group type as smesh.Mesh.Group() does -// int type = -1; -// SALOMEDS::Study_var study = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy(); -// SALOMEDS::SObject_var aSObj = study->FindObjectID( grpID.ToCString() ); -// if ( !aSObj->_is_nil() ) { -// GEOM::GEOM_Object_var aGeomObj = GEOM::GEOM_Object::_narrow( aSObj->GetObject() ); -// if ( !aGeomObj->_is_nil() ) { -// switch ( aGeomObj->GetShapeType() ) { -// case GEOM::VERTEX: type = SMESH::NODE; break; -// case GEOM::EDGE: type = SMESH::EDGE; break; -// case GEOM::FACE: type = SMESH::FACE; break; -// case GEOM::SOLID: -// case GEOM::SHELL: type = SMESH::VOLUME; break; -// case GEOM::COMPOUND: { -// GEOM::GEOM_Gen_ptr aGeomGen = SMESH_Gen_i::GetSMESHGen()->GetGeomEngine(); -// if ( !aGeomGen->_is_nil() ) { -// GEOM::GEOM_IGroupOperations_var aGrpOp = -// aGeomGen->GetIGroupOperations( study->StudyId() ); -// if ( !aGrpOp->_is_nil() ) { -// switch ( aGrpOp->GetType( aGeomObj )) { -// case TopAbs_VERTEX: type = SMESH::NODE; break; -// case TopAbs_EDGE: type = SMESH::EDGE; break; -// case TopAbs_FACE: type = SMESH::FACE; break; -// case TopAbs_SOLID: type = SMESH::VOLUME; break; -// default:; -// } -// } -// } -// } -// default:; -// } -// } -// } -// if ( type < 0 ) { -// MESSAGE("Type of the group " << grpID << " not found"); -// return false; -// } -// if ( theType.IsIntegerValue() ) -// return type == theType.IntegerValue(); - -// switch ( type ) { -// case SMESH::NODE: return theType.Location( "NODE", 1, theType.Length() ); -// case SMESH::EDGE: return theType.Location( "EDGE", 1, theType.Length() ); -// case SMESH::FACE: return theType.Location( "FACE", 1, theType.Length() ); -// case SMESH::VOLUME: return theType.Location( "VOLUME", 1, theType.Length() ); -// default:; -// } -// return false; -// } + + if ( myObjectNames.IsBound( theObjID )) + return false; // SMESH object is in study + + // either the SMESH object is not in study or it is a GEOM object + if ( IsGeomObject( theObjID )) + { + SALOMEDS::SObject_wrap so = myStudy->FindObjectID( theObjID.ToCString() ); + if ( so->_is_nil() ) return true; + CORBA::Object_var obj = so->GetObject(); + return CORBA::is_nil( obj ); + } + return true; // SMESH object not in study +} //================================================================================ /*! - * \brief - * \param theCreationCmd - + * \brief Return reader of hypotheses of plugins + */ +//================================================================================ + +Handle( _pyHypothesisReader ) _pyGen::GetHypothesisReader() const +{ + if (myHypReader.IsNull() ) + ((_pyGen*) this)->myHypReader = new _pyHypothesisReader; + + return myHypReader; +} + + +//================================================================================ +/*! + * \brief Mesh created by SMESH_Gen */ //================================================================================ _pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd) - : _pyObject(theCreationCmd), myHasEditor(false) + : _pyObject( theCreationCmd ), myGeomNotInStudy( false ) { - // convert my creation command + if ( theCreationCmd->GetMethod() == "CreateMesh" && theGen->IsNotPublished( GetGeom() )) + myGeomNotInStudy = true; + + // convert my creation command --> smeshpy.Mesh(...) Handle(_pyCommand) creationCmd = GetCreationCmd(); - //TCollection_AsciiString str = creationCmd->GetMethod(); -// if(str != "CreateMeshesFromUNV" && -// str != "CreateMeshesFromMED" && -// str != "CreateMeshesFromSTL") creationCmd->SetObject( SMESH_2smeshpy::SmeshpyName() ); creationCmd->SetMethod( "Mesh" ); - - theGen->SetAccessorMethod( GetID(), "GetMesh()" ); + theGen->SetAccessorMethod( GetID(), _pyMesh::AccessorMethod() ); } //================================================================================ /*! - * \brief - * \param theCreationCmd - + * \brief Mesh created by SMESH_MeshEditor */ //================================================================================ -_pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd, const TCollection_AsciiString& id): - _pyObject(theCreationCmd), myHasEditor(false) + +_pyMesh::_pyMesh(const Handle(_pyCommand) theCreationCmd, const _pyID& meshId): + _pyObject(theCreationCmd,meshId), myGeomNotInStudy(false ) { + if ( theCreationCmd->MethodStartsFrom( "CreateMeshesFrom" )) + { + // this mesh depends on the exported mesh + const TCollection_AsciiString& file = theCreationCmd->GetArg( 1 ); + if ( !file.IsEmpty() ) + { + ExportedMeshData& exportData = theGen->FindExportedMesh( file ); + addFatherMesh( exportData.myMesh ); + if ( !exportData.myLastComputeCmd.IsNull() ) + { + // restore cleared Compute() by which the exported mesh was generated + exportData.myLastComputeCmd->GetString() = exportData.myLastComputeCmdString; + // protect that Compute() cmd from clearing + if ( exportData.myMesh->myLastComputeCmd == exportData.myLastComputeCmd ) + exportData.myMesh->myLastComputeCmd.Nullify(); + } + } + } + else if ( theCreationCmd->MethodStartsFrom( "Concatenate" )) + { + // this mesh depends on concatenated meshes + const TCollection_AsciiString& meshIDs = theCreationCmd->GetArg( 1 ); + list< _pyID > idList = theCreationCmd->GetStudyEntries( meshIDs ); + list< _pyID >::iterator meshID = idList.begin(); + for ( ; meshID != idList.end(); ++meshID ) + addFatherMesh( *meshID ); + } + else if ( theCreationCmd->GetMethod() == "CopyMesh" ) + { + // this mesh depends on a copied IdSource + const _pyID& objID = theCreationCmd->GetArg( 1 ); + addFatherMesh( objID ); + } + else if ( theCreationCmd->GetMethod().Search("MakeMesh") != -1 || + theCreationCmd->GetMethod() == "MakeBoundaryMesh" || + theCreationCmd->GetMethod() == "MakeBoundaryElements" ) + { + // this mesh depends on a source mesh + // (theCreationCmd is already Process()ed by _pyMeshEditor) + const _pyID& meshID = theCreationCmd->GetObject(); + addFatherMesh( meshID ); + } + // convert my creation command Handle(_pyCommand) creationCmd = GetCreationCmd(); creationCmd->SetObject( SMESH_2smeshpy::SmeshpyName() ); - theGen->SetAccessorMethod( id, "GetMesh()" ); + theGen->SetAccessorMethod( meshId, _pyMesh::AccessorMethod() ); } //================================================================================ @@ -983,9 +1453,63 @@ void _pyMesh::Process( const Handle(_pyCommand)& theCommand ) // --> in Mesh.ExportMED( f, auto_groups, version ) // 5. etc - const TCollection_AsciiString method = theCommand->GetMethod(); + const TCollection_AsciiString& method = theCommand->GetMethod(); + // ---------------------------------------------------------------------- + if ( method == "Compute" ) // in snapshot mode, clear the previous Compute() + { + if ( !theGen->IsToKeepAllCommands() ) // !historical + { + list< Handle(_pyHypothesis) >::iterator hyp; + if ( !myLastComputeCmd.IsNull() ) + { + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) + (*hyp)->ComputeDiscarded( myLastComputeCmd ); + + myLastComputeCmd->Clear(); + } + myLastComputeCmd = theCommand; + + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) + (*hyp)->MeshComputed( myLastComputeCmd ); + } + Flush(); + } + // ---------------------------------------------------------------------- + else if ( method == "Clear" ) // in snapshot mode, clear all previous commands + { + if ( !theGen->IsToKeepAllCommands() ) // !historical + { + int untilCmdNb = + myChildMeshes.empty() ? 0 : myChildMeshes.back()->GetCreationCmd()->GetOrderNb(); + // list< Handle(_pyCommand) >::reverse_iterator cmd = myProcessedCmds.rbegin(); + // for ( ; cmd != myProcessedCmds.rend() && (*cmd)->GetOrderNb() > untilCmdNb; ++cmd ) + // (*cmd)->Clear(); + if ( !myLastComputeCmd.IsNull() ) + { + list< Handle(_pyHypothesis) >::iterator hyp; + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) + (*hyp)->ComputeDiscarded( myLastComputeCmd ); + + myLastComputeCmd->Clear(); + } + + list< Handle(_pyMeshEditor)>::iterator e = myEditors.begin(); + for ( ; e != myEditors.end(); ++e ) + { + list< Handle(_pyCommand)>& cmds = (*e)->GetProcessedCmds(); + list< Handle(_pyCommand) >::reverse_iterator cmd = cmds.rbegin(); + for ( ; cmd != cmds.rend() && (*cmd)->GetOrderNb() > untilCmdNb; ++cmd ) + if ( !(*cmd)->IsEmpty() ) + { + if ( (*cmd)->GetStudyEntries( (*cmd)->GetResultValue() ).empty() ) // no object created + (*cmd)->Clear(); + } + } + myLastComputeCmd = theCommand; // to clear Clear() the same way as Compute() + } + } // ---------------------------------------------------------------------- - if ( method == "GetSubMesh" ) { // collect submeshes of the mesh + else if ( method == "GetSubMesh" ) { // collect submeshes of the mesh Handle(_pySubMesh) subMesh = theGen->FindSubMesh( theCommand->GetResultValue() ); if ( !subMesh.IsNull() ) { subMesh->SetCreator( this ); @@ -1005,107 +1529,115 @@ void _pyMesh::Process( const Handle(_pyCommand)& theCommand ) } } // ---------------------------------------------------------------------- - else if ( method == "CreateGroupFromGEOM" ) {// (type, name, grp) - _pyID grp = theCommand->GetArg( 3 ); - // VSR 24/12/2010. PAL21106: always use GroupOnGeom() function on dump - // next if(){...} section is commented - //if ( sameGroupType( grp, theCommand->GetArg( 1 )) ) { // --> Group(grp) - // theCommand->SetMethod( "Group" ); - // theCommand->RemoveArgs(); - // theCommand->SetArg( 1, grp ); - //} - //else { - // ------------------------->>>>> GroupOnGeom( grp, name, typ ) - _pyID type = theCommand->GetArg( 1 ); - _pyID name = theCommand->GetArg( 2 ); - theCommand->SetMethod( "GroupOnGeom" ); - theCommand->RemoveArgs(); - theCommand->SetArg( 1, grp ); - theCommand->SetArg( 2, name ); - theCommand->SetArg( 3, type ); - //} - } - // ---------------------------------------------------------------------- - else if ( method == "CreateGroupFromFilter" ) // --> GroupOnFilter() + else if ( method == "CreateGroup" || + method == "CreateGroupFromGEOM" || + method == "CreateGroupFromFilter" ) { - theCommand->SetMethod( "GroupOnFilter" ); Handle(_pyGroup) group = new _pyGroup( theCommand ); + myGroups.push_back( group ); theGen->AddObject( group ); - - // GroupOnFilter(typ, name, aFilter0x4743dc0 -> aFilter_1) - _pyID filterID = theCommand->GetArg(3); - Handle(_pyObject) filter = theGen->FindObject( filterID ); - if ( !filter.IsNull() && filter->IsKind(STANDARD_TYPE(_pyFilter))) - filter->Process( theCommand ); } - // ---------------------------------------------------------------------- - else if ( method == "GetIdsFromFilter" ) + // update list of groups + else if ( method == "GetGroups" ) { - // GetIdsFromFilter( aFilter0x4743dc0) -> GetIdsFromFilter( aFilter_1) - _pyID filterID = theCommand->GetArg(1); - Handle(_pyObject) filter = theGen->FindObject( filterID ); - if ( !filter.IsNull() && filter->IsKind(STANDARD_TYPE(_pyFilter))) - filter->Process( theCommand ); + TCollection_AsciiString grIDs = theCommand->GetResultValue(); + list< _pyID > idList = theCommand->GetStudyEntries( grIDs ); + list< _pyID >::iterator grID = idList.begin(); + for ( ; grID != idList.end(); ++grID ) + { + Handle(_pyObject) obj = theGen->FindObject( *grID ); + if ( obj.IsNull() ) + { + Handle(_pyGroup) group = new _pyGroup( theCommand, *grID ); + theGen->AddObject( group ); + myGroups.push_back( group ); + } + } } - // ---------------------------------------------------------------------- - else if ( method == "CreateGroup" ) // CreateGroup() --> CreateEmptyGroup() + // notify a group about full removal + else if ( method == "RemoveGroupWithContents" ) { - theCommand->SetMethod( "CreateEmptyGroup" ); - Handle(_pyGroup) group = new _pyGroup( theCommand ); - theGen->AddObject( group ); + if ( !theGen->IsToKeepAllCommands() ) { // snapshot mode + const _pyID groupID = theCommand->GetArg( 1 ); + Handle(_pyGroup) grp = Handle(_pyGroup)::DownCast( theGen->FindObject( groupID )); + if ( !grp.IsNull() ) + grp->RemovedWithContents(); + } } // ---------------------------------------------------------------------- - else if ( method == "ExportToMED" || // ExportToMED() --> ExportMED() - method == "ExportToMEDX" ) { // ExportToMEDX() --> ExportMED() - theCommand->SetMethod( "ExportMED" ); - } - // ---------------------------------------------------------------------- - else if ( method == "ExportCGNS" ) - { // ExportCGNS(part, ...) -> ExportCGNS(..., part) - _pyID partID = theCommand->GetArg( 1 ); - int nbArgs = theCommand->GetNbArgs(); - for ( int i = 2; i <= nbArgs; ++i ) - theCommand->SetArg( i-1, theCommand->GetArg( i )); - theCommand->SetArg( nbArgs, partID ); - } - // ---------------------------------------------------------------------- - else if ( method.Location( "ExportPartTo", 1, method.Length() ) == 1 ) - { // ExportPartTo*(part, ...) -> Export*(..., part) - // - // remove "PartTo" from the method - TCollection_AsciiString newMethod = method; - newMethod.Remove( 7, 6 ); - theCommand->SetMethod( newMethod ); - // make the 1st arg be the last one - _pyID partID = theCommand->GetArg( 1 ); - int nbArgs = theCommand->GetNbArgs(); - for ( int i = 2; i <= nbArgs; ++i ) - theCommand->SetArg( i-1, theCommand->GetArg( i )); - theCommand->SetArg( nbArgs, partID ); + else if ( theCommand->MethodStartsFrom( "Export" )) + { + if ( method == "ExportToMED" || // ExportToMED() --> ExportMED() + method == "ExportToMEDX" ) { // ExportToMEDX() --> ExportMED() + theCommand->SetMethod( "ExportMED" ); + } + else if ( method == "ExportCGNS" || method == "ExportGMF" ) + { // ExportCGNS(part, ...) -> ExportCGNS(..., part) + _pyID partID = theCommand->GetArg( 1 ); + int nbArgs = theCommand->GetNbArgs(); + for ( int i = 2; i <= nbArgs; ++i ) + theCommand->SetArg( i-1, theCommand->GetArg( i )); + theCommand->SetArg( nbArgs, partID ); + } + else if ( theCommand->MethodStartsFrom( "ExportPartTo" )) + { // ExportPartTo*(part, ...) -> Export*(..., part) + // + // remove "PartTo" from the method + TCollection_AsciiString newMethod = method; + newMethod.Remove( 7, 6 ); + theCommand->SetMethod( newMethod ); + // make the 1st arg be the last one + _pyID partID = theCommand->GetArg( 1 ); + int nbArgs = theCommand->GetNbArgs(); + for ( int i = 2; i <= nbArgs; ++i ) + theCommand->SetArg( i-1, theCommand->GetArg( i )); + theCommand->SetArg( nbArgs, partID ); + } + // remember file name + theGen->AddExportedMesh( theCommand->GetArg( 1 ), + ExportedMeshData( this, myLastComputeCmd )); } // ---------------------------------------------------------------------- else if ( method == "RemoveHypothesis" ) // (geom, hyp) { - _pyID hypID = theCommand->GetArg( 2 ); + _pyID hypID = theCommand->GetArg( 2 ); + _pyID geomID = theCommand->GetArg( 1 ); + bool isLocal = ( geomID != GetGeom() ); // check if this mesh still has corresponding addition command - bool hasAddCmd = false; - list< Handle(_pyCommand) >::iterator cmd = myAddHypCmds.begin(); - while ( cmd != myAddHypCmds.end() ) + Handle(_pyCommand) addCmd; + list< Handle(_pyCommand) >::iterator cmd; + list< Handle(_pyCommand) >* addCmds[2] = { &myAddHypCmds, &myNotConvertedAddHypCmds }; + for ( int i = 0; i < 2; ++i ) { - // AddHypothesis(geom, hyp) - if ( hypID == (*cmd)->GetArg( 2 )) { // erase both (add and remove) commands - theCommand->Clear(); - (*cmd)->Clear(); - cmd = myAddHypCmds.erase( cmd ); - hasAddCmd = true; - } - else { - ++cmd; + list< Handle(_pyCommand )> & addHypCmds = *(addCmds[i]); + for ( cmd = addHypCmds.begin(); cmd != addHypCmds.end(); ) + { + bool sameHyp = true; + if ( hypID != (*cmd)->GetArg( 1 ) && hypID != (*cmd)->GetArg( 2 )) + sameHyp = false; // other hyp + if ( (*cmd)->GetNbArgs() == 2 && + geomID != (*cmd)->GetArg( 1 ) && geomID != (*cmd)->GetArg( 2 )) + sameHyp = false; // other geom + if ( (*cmd)->GetNbArgs() == 1 && isLocal ) + sameHyp = false; // other geom + if ( sameHyp ) + { + addCmd = *cmd; + cmd = addHypCmds.erase( cmd ); + if ( !theGen->IsToKeepAllCommands() ) { + addCmd->Clear(); + theCommand->Clear(); + } + } + else + { + ++cmd; + } } } Handle(_pyHypothesis) hyp = theGen->FindHyp( hypID ); - if ( ! hasAddCmd && hypID.Length() != 0 ) { // hypo addition already wrapped + if ( !theCommand->IsEmpty() && !hypID.IsEmpty() ) { // RemoveHypothesis(geom, hyp) --> RemoveHypothesis( hyp, geom=0 ) _pyID geom = theCommand->GetArg( 1 ); theCommand->RemoveArgs(); @@ -1117,26 +1649,20 @@ void _pyMesh::Process( const Handle(_pyCommand)& theCommand ) myHypos.remove( hyp ); } // check for SubMesh order commands - else if ( theCommand->GetMethod() == "GetMeshOrder" || - theCommand->GetMethod() == "SetMeshOrder" ) + else if ( method == "GetMeshOrder" || method == "SetMeshOrder" ) { // make commands GetSubMesh() returning sub-meshes be before using sub-meshes // by GetMeshOrder() and SetMeshOrder(), since by defalut GetSubMesh() // commands are moved at the end of the script - const bool isArg = theCommand->GetMethod() == "SetMeshOrder"; - const TCollection_AsciiString& cmdStr = theCommand->GetString(); - int begPos = (/*isArg ? cmdStr.Search( "(" ) :*/ cmdStr.Search( "[" )) + 1; - int endPos = (isArg ? cmdStr.Search( ")" ) : cmdStr.Search( "=" )) - 1; - if ( begPos != -1 && begPos < endPos && endPos <= cmdStr.Length() ) { - TCollection_AsciiString aSubStr = cmdStr.SubString( begPos, endPos ); - Standard_Integer index = 1; - TCollection_AsciiString anIDStr = aSubStr.Token("\t ,[]", index++); - while ( !anIDStr.IsEmpty() ) { - Handle(_pySubMesh) subMesh = theGen->FindSubMesh( anIDStr ); - if ( !subMesh.IsNull() ) - subMesh->Process( theCommand ); // it moves GetSubMesh() before theCommand - anIDStr = aSubStr.Token("\t ,[]", index++); - } + TCollection_AsciiString subIDs = + ( method == "SetMeshOrder" ) ? theCommand->GetArg(1) : theCommand->GetResultValue(); + list< _pyID > idList = theCommand->GetStudyEntries( subIDs ); + list< _pyID >::iterator subID = idList.begin(); + for ( ; subID != idList.end(); ++subID ) + { + Handle(_pySubMesh) subMesh = theGen->FindSubMesh( *subID ); + if ( !subMesh.IsNull() ) + subMesh->Process( theCommand ); // it moves GetSubMesh() before theCommand } } // add accessor method if necessary @@ -1189,6 +1715,23 @@ bool _pyMesh::NeedMeshAccess( const Handle(_pyCommand)& theCommand ) void _pyMesh::Flush() { + { + // get the meshes this mesh depends on via hypotheses + list< Handle(_pyMesh) > fatherMeshes; + list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); + for ( ; hyp != myHypos.end(); ++hyp ) + if ( ! (*hyp)->GetReferredMeshesAndGeom( fatherMeshes )) + myGeomNotInStudy = true; + + list< Handle(_pyMesh) >::iterator m = fatherMeshes.begin(); + for ( ; m != fatherMeshes.end(); ++m ) + addFatherMesh( *m ); + // if ( removedGeom ) + // SetRemovedFromStudy(); // as reffered geometry not in study + } + if ( myGeomNotInStudy ) + return; + list < Handle(_pyCommand) >::iterator cmd; // try to convert algo addition like this: @@ -1205,7 +1748,7 @@ void _pyMesh::Flush() // check and create new algorithm instance if it is already wrapped if ( algo->IsWrapped() ) { _pyID localAlgoID = theGen->GenerateNewID( algoID ); - TCollection_AsciiString aNewCmdStr = localAlgoID + + TCollection_AsciiString aNewCmdStr = addCmd->GetIndentation() + localAlgoID + TCollection_AsciiString( " = " ) + theGen->GetID() + TCollection_AsciiString( ".CreateHypothesis( \"" ) + algo->GetAlgoType() + TCollection_AsciiString( "\" )" ); @@ -1218,6 +1761,10 @@ void _pyMesh::Flush() algo = newAlgo; // set algorithm creation theGen->SetCommandBefore( newCmd, addCmd ); + myHypos.push_back( newAlgo ); + if ( !myLastComputeCmd.IsNull() && + newCmd->GetOrderNb() == myLastComputeCmd->GetOrderNb() + 1) + newAlgo->MeshComputed( myLastComputeCmd ); } else newCmd->Clear(); @@ -1255,6 +1802,7 @@ void _pyMesh::Flush() addCmd->SetArg( 1, algoID ); if ( isLocalAlgo ) addCmd->SetArg( 2, geom ); + myNotConvertedAddHypCmds.push_back( addCmd ); } } @@ -1275,24 +1823,130 @@ void _pyMesh::Flush() addCmd->SetArg( 1, hypID ); if ( geom != GetGeom() ) addCmd->SetArg( 2, geom ); + myNotConvertedAddHypCmds.push_back( addCmd ); } } - // sm = mesh.GetSubMesh(geom, name) --> sm = mesh.GetMesh().GetSubMesh(geom, name) -// for ( cmd = mySubmeshes.begin(); cmd != mySubmeshes.end(); ++cmd ) { -// Handle(_pyCommand) subCmd = *cmd; -// if ( subCmd->GetNbArgs() > 0 ) -// AddMeshAccess( subCmd ); -// } myAddHypCmds.clear(); mySubmeshes.clear(); // flush hypotheses list< Handle(_pyHypothesis) >::iterator hyp = myHypos.begin(); - for ( ; hyp != myHypos.end(); ++hyp ) + for ( hyp = myHypos.begin(); hyp != myHypos.end(); ++hyp ) (*hyp)->Flush(); } +//================================================================================ +/*! + * \brief Sets myIsPublished of me and of all objects depending on me. + */ +//================================================================================ + +void _pyMesh::SetRemovedFromStudy(const bool isRemoved) +{ + _pyObject::SetRemovedFromStudy(isRemoved); + + list< Handle(_pySubMesh) >::iterator sm = mySubmeshes.begin(); + for ( ; sm != mySubmeshes.end(); ++sm ) + (*sm)->SetRemovedFromStudy(isRemoved); + + list< Handle(_pyGroup) >::iterator gr = myGroups.begin(); + for ( ; gr != myGroups.end(); ++gr ) + (*gr)->SetRemovedFromStudy(isRemoved); + + list< Handle(_pyMesh) >::iterator m = myChildMeshes.begin(); + for ( ; m != myChildMeshes.end(); ++m ) + (*m)->SetRemovedFromStudy(isRemoved); + + list< Handle(_pyMeshEditor)>::iterator e = myEditors.begin(); + for ( ; e != myEditors.end(); ++e ) + (*e)->SetRemovedFromStudy(isRemoved); +} + +//================================================================================ +/*! + * \brief Return true if none of myChildMeshes is in study + */ +//================================================================================ + +bool _pyMesh::CanClear() +{ + if ( IsInStudy() ) + return false; + + list< Handle(_pyMesh) >::iterator m = myChildMeshes.begin(); + for ( ; m != myChildMeshes.end(); ++m ) + if ( !(*m)->CanClear() ) + return false; + + return true; +} + +//================================================================================ +/*! + * \brief Clear my commands and commands of mesh editor + */ +//================================================================================ + +void _pyMesh::ClearCommands() +{ + if ( !CanClear() ) + { + if ( !IsInStudy() ) + { + // mark all sub-objects as not removed, except child meshes + list< Handle(_pyMesh) > children; + children.swap( myChildMeshes ); + SetRemovedFromStudy( false ); + children.swap( myChildMeshes ); + } + return; + } + _pyObject::ClearCommands(); + + list< Handle(_pySubMesh) >::iterator sm = mySubmeshes.begin(); + for ( ; sm != mySubmeshes.end(); ++sm ) + (*sm)->ClearCommands(); + + list< Handle(_pyGroup) >::iterator gr = myGroups.begin(); + for ( ; gr != myGroups.end(); ++gr ) + (*gr)->ClearCommands(); + + list< Handle(_pyMeshEditor)>::iterator e = myEditors.begin(); + for ( ; e != myEditors.end(); ++e ) + (*e)->ClearCommands(); +} + +//================================================================================ +/*! + * \brief Add a father mesh by ID + */ +//================================================================================ + +void _pyMesh::addFatherMesh( const _pyID& meshID ) +{ + if ( !meshID.IsEmpty() ) + addFatherMesh( Handle(_pyMesh)::DownCast( theGen->FindObject( meshID ))); +} + +//================================================================================ +/*! + * \brief Add a father mesh + */ +//================================================================================ + +void _pyMesh::addFatherMesh( const Handle(_pyMesh)& mesh ) +{ + if ( !mesh.IsNull() ) + { + //myFatherMeshes.push_back( mesh ); + mesh->myChildMeshes.push_back( this ); + + // protect last Compute() from clearing by the next Compute() + mesh->myLastComputeCmd.Nullify(); + } +} + //================================================================================ /*! * \brief MeshEditor convert its commands to ones of mesh @@ -1305,6 +1959,10 @@ _pyMeshEditor::_pyMeshEditor(const Handle(_pyCommand)& theCreationCmd): myMesh = theCreationCmd->GetObject(); myCreationCmdStr = theCreationCmd->GetString(); theCreationCmd->Clear(); + + Handle(_pyMesh) mesh = ObjectToMesh( theGen->FindObject( myMesh )); + if ( !mesh.IsNull() ) + mesh->AddEditor( this ); } //================================================================================ @@ -1315,14 +1973,15 @@ _pyMeshEditor::_pyMeshEditor(const Handle(_pyCommand)& theCreationCmd): void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) { - // names of SMESH_MeshEditor methods fully equal to methods of python class Mesh, so - // commands calling this methods are converted to calls of methods of Mesh + // names of SMESH_MeshEditor methods fully equal to methods of the python class Mesh, so + // commands calling this methods are converted to calls of Mesh methods static TStringSet sameMethods; if ( sameMethods.empty() ) { const char * names[] = { - "RemoveElements","RemoveNodes","RemoveOrphanNodes","AddNode","Add0DElement","AddEdge","AddFace","AddPolygonalFace", + "RemoveElements","RemoveNodes","RemoveOrphanNodes","AddNode","Add0DElement","AddEdge","AddFace","AddPolygonalFace","AddBall", "AddVolume","AddPolyhedralVolume","AddPolyhedralVolumeByFaces","MoveNode", "MoveClosestNodeToPoint", - "InverseDiag","DeleteDiag","Reorient","ReorientObject","TriToQuad","SplitQuad","SplitQuadObject", + "InverseDiag","DeleteDiag","Reorient","ReorientObject", + "TriToQuad","TriToQuadObject", "SplitQuad","SplitQuadObject", "BestSplit","Smooth","SmoothObject","SmoothParametric","SmoothParametricObject", "ConvertToQuadratic","ConvertFromQuadratic","RenumberNodes","RenumberElements", "RotationSweep","RotationSweepObject","RotationSweepObject1D","RotationSweepObject2D", @@ -1336,12 +1995,26 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) "GetLastCreatedElems", "MirrorMakeMesh","MirrorObjectMakeMesh","TranslateMakeMesh", "TranslateObjectMakeMesh","RotateMakeMesh","RotateObjectMakeMesh","MakeBoundaryMesh", - "MakeBoundaryElements" + "MakeBoundaryElements", "SplitVolumesIntoTetra" ,"" }; // <- mark of the end sameMethods.Insert( names ); } - // names of SMESH_MeshEditor methods which differ from methods of class Mesh + // names of SMESH_MeshEditor commands in which only a method name must be replaced + TStringMap diffMethods; + if ( diffMethods.empty() ) { + const char * orig2newName[] = { + // original name --------------> new name + "ExtrusionAlongPathObjX" , "ExtrusionAlongPathX", + "FindCoincidentNodesOnPartBut", "FindCoincidentNodesOnPart", + "ConvertToQuadraticObject" , "ConvertToQuadratic", + "ConvertFromQuadraticObject" , "ConvertFromQuadratic", + "Create0DElementsOnAllNodes" , "Add0DElementsToAllNodes", + ""};// <- mark of the end + diffMethods.Insert( orig2newName ); + } + + // names of SMESH_MeshEditor methods which differ from methods of Mesh class // only by last two arguments static TStringSet diffLastTwoArgsMethods; if (diffLastTwoArgsMethods.empty() ) { @@ -1353,74 +2026,85 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) diffLastTwoArgsMethods.Insert( names ); } + // only a method name is to change? const TCollection_AsciiString & method = theCommand->GetMethod(); bool isPyMeshMethod = sameMethods.Contains( method ); if ( !isPyMeshMethod ) { - //Replace SMESH_MeshEditor "MakeGroups" functions by the Mesh - //functions with the flag "theMakeGroups = True" like: - //SMESH_MeshEditor.CmdMakeGroups => Mesh.Cmd(...,True) + TCollection_AsciiString newMethod = diffMethods.Value( method ); + if (( isPyMeshMethod = ( newMethod.Length() > 0 ))) + theCommand->SetMethod( newMethod ); + } + + if ( !isPyMeshMethod ) + { + // Replace SMESH_MeshEditor "*MakeGroups" functions by the Mesh + // functions with the flag "theMakeGroups = True" like: + // SMESH_MeshEditor.CmdMakeGroups => Mesh.Cmd(...,True) int pos = method.Search("MakeGroups"); if( pos != -1) { isPyMeshMethod = true; + bool is0DmethId = ( method == "ExtrusionSweepMakeGroups0D" ); + bool is0DmethObj = ( method == "ExtrusionSweepObject0DMakeGroups"); // 1. Remove "MakeGroups" from the Command TCollection_AsciiString aMethod = theCommand->GetMethod(); int nbArgsToAdd = diffLastTwoArgsMethods.Contains(aMethod) ? 2 : 1; + + if(is0DmethObj) + pos = pos-2; //Remove "0D" from the Command too aMethod.Trunc(pos-1); theCommand->SetMethod(aMethod); // 2. And add last "True" argument(s) while(nbArgsToAdd--) theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); + if( is0DmethId || is0DmethObj ) + theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); } } - // set "ExtrusionAlongPathX()" instead of "ExtrusionAlongPathObjX()" - if ( !isPyMeshMethod && method == "ExtrusionAlongPathObjX") + // ExtrusionSweep0D() -> ExtrusionSweep() + // ExtrusionSweepObject0D() -> ExtrusionSweepObject() + if ( !isPyMeshMethod && ( method == "ExtrusionSweep0D" || + method == "ExtrusionSweepObject0D" )) { - isPyMeshMethod=true; - theCommand->SetMethod("ExtrusionAlongPathX"); + 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 "FindCoincidentNodesOnPart()" instead of "FindCoincidentNodesOnPartBut()" - if ( !isPyMeshMethod && method == "FindCoincidentNodesOnPartBut") - { - isPyMeshMethod=true; - theCommand->SetMethod("FindCoincidentNodesOnPart"); - } - // DoubleNodeElemGroupNew() -> DoubleNodeElemGroup() - // DoubleNodeGroupNew() -> DoubleNodeGroup() - // DoubleNodeGroupsNew() -> DoubleNodeGroups() - // DoubleNodeElemGroupsNew() -> DoubleNodeElemGroups() + // DoubleNode...New(...) -> DoubleNode...(...,True) if ( !isPyMeshMethod && ( method == "DoubleNodeElemGroupNew" || method == "DoubleNodeElemGroupsNew" || method == "DoubleNodeGroupNew" || - method == "DoubleNodeGroupsNew")) + method == "DoubleNodeGroupsNew" || + method == "DoubleNodeElemGroup2New" || + method == "DoubleNodeElemGroups2New")) { - isPyMeshMethod=true; - theCommand->SetMethod( method.SubString( 1, method.Length()-3)); - theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); - } - // ConvertToQuadraticObject(bool,obj) -> ConvertToQuadratic(bool,obj) - // ConvertFromQuadraticObject(obj) -> ConvertFromQuadratic(obj) - if ( !isPyMeshMethod && ( method == "ConvertToQuadraticObject" || - method == "ConvertFromQuadraticObject" )) - { - isPyMeshMethod=true; - theCommand->SetMethod( method.SubString( 1, method.Length()-6)); - // prevent moving creation of the converted sub-mesh to the end of the script - bool isFromQua = ( method.Value( 8 ) == 'F' ); - Handle(_pySubMesh) sm = theGen->FindSubMesh( theCommand->GetArg( isFromQua ? 1 : 2 )); - if ( !sm.IsNull() ) - sm->Process( theCommand ); + isPyMeshMethod = true; + const int excessLen = 3 + int( method.Value( method.Length()-3 ) == '2' ); + theCommand->SetMethod( method.SubString( 1, method.Length()-excessLen)); + if ( excessLen == 3 ) + { + theCommand->SetArg(theCommand->GetNbArgs()+1,"True"); + } + else if ( theCommand->GetArg(4) == "0" || + theCommand->GetArg(5) == "0" ) + { + // [ nothing, Group ] = DoubleNodeGroup2New(,,,False, True) -> + // Group = DoubleNodeGroup2New(,,,False, True) + _pyID groupID = theCommand->GetResultValue( 1 + int( theCommand->GetArg(4) == "0")); + theCommand->SetResultValue( groupID ); + } } // FindAmongElementsByPoint(meshPart, x, y, z, elementType) -> // FindElementsByPoint(x, y, z, elementType, meshPart) if ( !isPyMeshMethod && method == "FindAmongElementsByPoint" ) { - isPyMeshMethod=true; + isPyMeshMethod = true; theCommand->SetMethod( "FindElementsByPoint" ); // make the 1st arg be the last one _pyID partID = theCommand->GetArg( 1 ); @@ -1429,11 +2113,32 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) theCommand->SetArg( i-1, theCommand->GetArg( i )); theCommand->SetArg( nbArgs, partID ); } + // Reorient2D( mesh, dir, face, point ) -> Reorient2D( mesh, dir, faceORpoint ) + if ( !isPyMeshMethod && method == "Reorient2D" ) + { + isPyMeshMethod = true; + _AString mesh = theCommand->GetArg( 1 ); + _AString dir = theCommand->GetArg( 2 ); + _AString face = theCommand->GetArg( 3 ); + _AString point = theCommand->GetArg( 4 ); + theCommand->RemoveArgs(); + theCommand->SetArg( 1, mesh ); + theCommand->SetArg( 2, dir ); + if ( face.Value(1) == '-' || face.Value(1) == '0' ) // invalid: face <= 0 + theCommand->SetArg( 3, point ); + else + theCommand->SetArg( 3, face ); + } + + if ( method == "QuadToTri" || method == "QuadToTriObject" ) + { + isPyMeshMethod = true; + int crit_arg = theCommand->GetNbArgs(); + const _AString& crit = theCommand->GetArg(crit_arg); + if (crit.Search("MaxElementLength2D") != -1) + theCommand->SetArg(crit_arg, ""); + } - // meshes made by *MakeMesh() methods are not wrapped by _pyMesh, - // so let _pyMesh care of it (TMP?) - // if ( theCommand->GetMethod().Search("MakeMesh") != -1 ) - // _pyMesh( new _pyCommand( theCommand->GetString(), 0 )); // for theGen->SetAccessorMethod() if ( isPyMeshMethod ) { theCommand->SetObject( myMesh ); @@ -1441,7 +2146,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) else { // editor creation command is needed only if any editor function is called - theGen->AddMeshAccessorMethod( theCommand ); // for *Object() + theGen->AddMeshAccessorMethod( theCommand ); // for *Object() methods if ( !myCreationCmdStr.IsEmpty() ) { GetCreationCmd()->GetString() = myCreationCmdStr; myCreationCmdStr.Clear(); @@ -1449,6 +2154,18 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) } } +//================================================================================ +/*! + * \brief Return true if my mesh can be removed + */ +//================================================================================ + +bool _pyMeshEditor::CanClear() +{ + Handle(_pyMesh) mesh = ObjectToMesh( theGen->FindObject( myMesh )); + return mesh.IsNull() ? true : mesh->CanClear(); +} + //================================================================================ /*! * \brief _pyHypothesis constructor @@ -1457,7 +2174,7 @@ void _pyMeshEditor::Process( const Handle(_pyCommand)& theCommand) //================================================================================ _pyHypothesis::_pyHypothesis(const Handle(_pyCommand)& theCreationCmd): - _pyObject( theCreationCmd ) + _pyObject( theCreationCmd ), myCurCrMethod(0) { myIsAlgo = myIsWrapped = /*myIsConverted = myIsLocal = myDim = */false; } @@ -1488,32 +2205,7 @@ Handle(_pyHypothesis) _pyHypothesis::NewHypothesis( const Handle(_pyCommand)& th algo = new _pyAlgorithm( theCreationCmd ); hyp = new _pyHypothesis( theCreationCmd ); - // 1D Regular_1D ---------- - if ( hypType == "Regular_1D" ) { - // set mesh's method creating algo, - // i.e. convertion result will be "regular1d = Mesh.Segment()", - // and set hypType by which algo creating a hypothesis is searched for - algo->SetConvMethodAndType("Segment", hypType.ToCString()); - } - else if ( hypType == "CompositeSegment_1D" ) { - algo->SetConvMethodAndType("Segment", "Regular_1D"); - algo->myArgs.Append( "algo=smesh.COMPOSITE"); - } - else if ( hypType == "LocalLength" ) { - // set algo's method creating hyp, and algo type - hyp->SetConvMethodAndType( "LocalLength", "Regular_1D"); - // set method whose 1 arg will become the 1-st arg of hyp creation command - // i.e. convertion result will be "locallength = regular1d.LocalLength()" - hyp->AddArgMethod( "SetLength" ); - } - else if ( hypType == "MaxLength" ) { - // set algo's method creating hyp, and algo type - hyp->SetConvMethodAndType( "MaxSize", "Regular_1D"); - // set method whose 1 arg will become the 1-st arg of hyp creation command - // i.e. convertion result will be "maxsize = regular1d.MaxSize()" - hyp->AddArgMethod( "SetLength" ); - } - else if ( hypType == "NumberOfSegments" ) { + if ( hypType == "NumberOfSegments" ) { hyp = new _pyNumberOfSegmentsHyp( theCreationCmd ); hyp->SetConvMethodAndType( "NumberOfSegments", "Regular_1D"); // arg of SetNumberOfSegments() will become the 1-st arg of hyp creation command @@ -1521,201 +2213,37 @@ Handle(_pyHypothesis) _pyHypothesis::NewHypothesis( const Handle(_pyCommand)& th // arg of SetScaleFactor() will become the 2-nd arg of hyp creation command hyp->AddArgMethod( "SetScaleFactor" ); hyp->AddArgMethod( "SetReversedEdges" ); - } - else if ( hypType == "Arithmetic1D" ) { - hyp = new _pyComplexParamHypo( theCreationCmd ); - hyp->SetConvMethodAndType( "Arithmetic1D", "Regular_1D"); - hyp->AddArgMethod( "SetStartLength" ); - hyp->AddArgMethod( "SetEndLength" ); - hyp->AddArgMethod( "SetReversedEdges" ); - } - else if ( hypType == "StartEndLength" ) { - hyp = new _pyComplexParamHypo( theCreationCmd ); - hyp->SetConvMethodAndType( "StartEndLength", "Regular_1D"); - hyp->AddArgMethod( "SetStartLength" ); - hyp->AddArgMethod( "SetEndLength" ); + // same for ""CompositeSegment_1D: + hyp->SetConvMethodAndType( "NumberOfSegments", "CompositeSegment_1D"); + hyp->AddArgMethod( "SetNumberOfSegments" ); + hyp->AddArgMethod( "SetScaleFactor" ); hyp->AddArgMethod( "SetReversedEdges" ); } - else if ( hypType == "Deflection1D" ) { - hyp->SetConvMethodAndType( "Deflection1D", "Regular_1D"); - hyp->AddArgMethod( "SetDeflection" ); - } - else if ( hypType == "Propagation" ) { - hyp->SetConvMethodAndType( "Propagation", "Regular_1D"); - } - else if ( hypType == "QuadraticMesh" ) { - hyp->SetConvMethodAndType( "QuadraticMesh", "Regular_1D"); - } - else if ( hypType == "AutomaticLength" ) { - hyp->SetConvMethodAndType( "AutomaticLength", "Regular_1D"); - hyp->AddArgMethod( "SetFineness"); - } else if ( hypType == "SegmentLengthAroundVertex" ) { hyp = new _pySegmentLengthAroundVertexHyp( theCreationCmd ); hyp->SetConvMethodAndType( "LengthNearVertex", "Regular_1D" ); hyp->AddArgMethod( "SetLength" ); - } - // 1D Python_1D ---------- - else if ( hypType == "Python_1D" ) { - algo->SetConvMethodAndType( "Segment", hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.PYTHON"); - } - else if ( hypType == "PythonSplit1D" ) { - hyp->SetConvMethodAndType( "PythonSplit1D", "Python_1D"); - hyp->AddArgMethod( "SetNumberOfSegments"); - hyp->AddArgMethod( "SetPythonLog10RatioFunction"); - } - // MEFISTO_2D ---------- - else if ( hypType == "MEFISTO_2D" ) { // MEFISTO_2D - algo->SetConvMethodAndType( "Triangle", hypType.ToCString()); - } - else if ( hypType == "MaxElementArea" ) { - hyp->SetConvMethodAndType( "MaxElementArea", "MEFISTO_2D"); - hyp->SetConvMethodAndType( "MaxElementArea", "NETGEN_2D_ONLY"); - hyp->AddArgMethod( "SetMaxElementArea"); - } - else if ( hypType == "LengthFromEdges" ) { - hyp->SetConvMethodAndType( "LengthFromEdges", "MEFISTO_2D"); - hyp->SetConvMethodAndType( "LengthFromEdges", "NETGEN_2D_ONLY"); - } - // Quadrangle_2D ---------- - else if ( hypType == "Quadrangle_2D" ) { - algo->SetConvMethodAndType( "Quadrangle" , hypType.ToCString()); - } - else if ( hypType == "QuadranglePreference" ) { - hyp->SetConvMethodAndType( "QuadranglePreference", "Quadrangle_2D"); - hyp->SetConvMethodAndType( "SetQuadAllowed", "NETGEN_2D_ONLY"); - } - else if ( hypType == "TrianglePreference" ) { - hyp->SetConvMethodAndType( "TrianglePreference", "Quadrangle_2D"); - } - // RadialQuadrangle_1D2D ---------- - else if ( hypType == "RadialQuadrangle_1D2D" ) { - algo->SetConvMethodAndType( "Quadrangle" , hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.RADIAL_QUAD" ); - } - else if ( hypType == "NumberOfLayers2D" ) { - hyp->SetConvMethodAndType( "NumberOfLayers", "RadialQuadrangle_1D2D"); - hyp->AddArgMethod( "SetNumberOfLayers" ); + // same for ""CompositeSegment_1D: + hyp->SetConvMethodAndType( "LengthNearVertex", "CompositeSegment_1D"); + hyp->AddArgMethod( "SetLength" ); } else if ( hypType == "LayerDistribution2D" ) { hyp = new _pyLayerDistributionHypo( theCreationCmd, "Get2DHypothesis" ); hyp->SetConvMethodAndType( "LayerDistribution", "RadialQuadrangle_1D2D"); } - // BLSURF ---------- - else if ( hypType == "BLSURF" ) { - algo->SetConvMethodAndType( "Triangle", hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.BLSURF" ); - } - else if ( hypType == "BLSURF_Parameters") { - hyp->SetConvMethodAndType( "Parameters", "BLSURF"); - } - // NETGEN ---------- - else if ( hypType == "NETGEN_2D") { // 1D-2D - algo->SetConvMethodAndType( "Triangle" , hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.NETGEN" ); - } - else if ( hypType == "NETGEN_Parameters_2D") { - hyp->SetConvMethodAndType( "Parameters", "NETGEN_2D"); - } - else if ( hypType == "NETGEN_SimpleParameters_2D") { - hyp->SetConvMethodAndType( "Parameters", "NETGEN_2D"); - hyp->myArgs.Append( "which=smesh.SIMPLE" ); - } - else if ( hypType == "NETGEN_2D3D") { // 1D-2D-3D - algo->SetConvMethodAndType( "Tetrahedron" , hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.FULL_NETGEN" ); - } - else if ( hypType == "NETGEN_Parameters") { - hyp->SetConvMethodAndType( "Parameters", "NETGEN_2D3D"); - } - else if ( hypType == "NETGEN_SimpleParameters_3D") { - hyp->SetConvMethodAndType( "Parameters", "NETGEN_2D3D"); - hyp->myArgs.Append( "which=smesh.SIMPLE" ); - } - else if ( hypType == "NETGEN_2D_ONLY") { // 2D - algo->SetConvMethodAndType( "Triangle" , hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.NETGEN_2D" ); - } - else if ( hypType == "NETGEN_3D") { // 3D - algo->SetConvMethodAndType( "Tetrahedron" , hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.NETGEN" ); - } - else if ( hypType == "MaxElementVolume") { - hyp->SetConvMethodAndType( "MaxElementVolume", "NETGEN_3D"); - hyp->AddArgMethod( "SetMaxElementVolume" ); - } - // GHS3D_3D ---------- - else if ( hypType == "GHS3D_3D" ) { - algo->SetConvMethodAndType( "Tetrahedron", hypType.ToCString()); - algo->myArgs.Append( "algo=smesh.GHS3D" ); - } - else if ( hypType == "GHS3D_Parameters") { - hyp->SetConvMethodAndType( "Parameters", "GHS3D_3D"); - } - // Hexa_3D --------- - else if ( hypType == "BLSURF" ) { - algo->SetConvMethodAndType( "Hexahedron", hypType.ToCString()); - } - // Repetitive Projection_1D --------- - else if ( hypType == "Projection_1D" ) { - algo->SetConvMethodAndType( "Projection1D", hypType.ToCString()); - } - else if ( hypType == "ProjectionSource1D" ) { - hyp->SetConvMethodAndType( "SourceEdge", "Projection_1D"); - hyp->AddArgMethod( "SetSourceEdge"); - hyp->AddArgMethod( "SetSourceMesh"); - // 2 args of SetVertexAssociation() will become the 3-th and 4-th args of hyp creation command - hyp->AddArgMethod( "SetVertexAssociation", 2 ); - } - // Projection_2D --------- - else if ( hypType == "Projection_2D" ) { - algo->SetConvMethodAndType( "Projection2D", hypType.ToCString()); - } - else if ( hypType == "Projection_1D2D" ) { - algo->SetConvMethodAndType( "Projection1D2D", hypType.ToCString()); - } - else if ( hypType == "ProjectionSource2D" ) { - hyp->SetConvMethodAndType( "SourceFace", "Projection_2D"); - hyp->AddArgMethod( "SetSourceFace"); - hyp->AddArgMethod( "SetSourceMesh"); - hyp->AddArgMethod( "SetVertexAssociation", 4 ); - } - // Projection_3D --------- - else if ( hypType == "Projection_3D" ) { - algo->SetConvMethodAndType( "Projection3D", hypType.ToCString()); - } - else if ( hypType == "ProjectionSource3D" ) { - hyp->SetConvMethodAndType( "SourceShape3D", "Projection_3D"); - hyp->AddArgMethod( "SetSource3DShape"); - hyp->AddArgMethod( "SetSourceMesh"); - hyp->AddArgMethod( "SetVertexAssociation", 4 ); - } - // Prism_3D --------- - else if ( hypType == "Prism_3D" ) { - algo->SetConvMethodAndType( "Prism", hypType.ToCString()); - } - // RadialPrism_3D --------- - else if ( hypType == "RadialPrism_3D" ) { - algo->SetConvMethodAndType( "Prism", hypType.ToCString()); - } - else if ( hypType == "NumberOfLayers" ) { - hyp->SetConvMethodAndType( "NumberOfLayers", "RadialPrism_3D"); - hyp->AddArgMethod( "SetNumberOfLayers" ); - } else if ( hypType == "LayerDistribution" ) { hyp = new _pyLayerDistributionHypo( theCreationCmd, "Get3DHypothesis" ); hyp->SetConvMethodAndType( "LayerDistribution", "RadialPrism_3D"); } - // Cartesian 3D --------- - else if ( hypType == "Cartesian_3D" ) { - algo->SetConvMethodAndType( "BodyFitted", hypType.ToCString()); - } else if ( hypType == "CartesianParameters3D" ) { hyp = new _pyComplexParamHypo( theCreationCmd ); hyp->SetConvMethodAndType( "SetGrid", "Cartesian_3D"); for ( int iArg = 0; iArg < 4; ++iArg ) - hyp->myArgs.Append("[]"); + hyp->setCreationArg( iArg+1, "[]"); + } + else + { + hyp = theGen->GetHypothesisReader()->GetHypothesis( hypType, theCreationCmd ); } return algo->IsValid() ? algo : hyp; @@ -1730,10 +2258,10 @@ Handle(_pyHypothesis) _pyHypothesis::NewHypothesis( const Handle(_pyCommand)& th bool _pyHypothesis::IsWrappable(const _pyID& theMesh) const { - if ( !myIsWrapped && myMesh == theMesh && !IsRemovedFromStudy() ) + if ( !myIsWrapped && myMesh == theMesh && IsInStudy() ) { Handle(_pyObject) pyMesh = theGen->FindObject( myMesh ); - if ( !pyMesh.IsNull() && !pyMesh->IsRemovedFromStudy() ) + if ( !pyMesh.IsNull() && pyMesh->IsInStudy() ) return true; } return false; @@ -1774,13 +2302,13 @@ bool _pyHypothesis::Addition2Creation( const Handle(_pyCommand)& theCmd, theCmd->SetResultValue( GetID() ); theCmd->SetObject( IsAlgo() ? theMesh : algo->GetID()); theCmd->SetMethod( IsAlgo() ? GetAlgoCreationMethod() : GetCreationMethod( algo->GetAlgoType() )); - // set args + // set args (geom will be set by _pyMesh calling this method) theCmd->RemoveArgs(); - for ( int i = 1; i <= myArgs.Length(); ++i ) { - if ( !myArgs( i ).IsEmpty() ) - theCmd->SetArg( i, myArgs( i )); + for ( size_t i = 0; i < myCurCrMethod->myArgs.size(); ++i ) { + if ( !myCurCrMethod->myArgs[ i ].IsEmpty() ) + theCmd->SetArg( i+1, myCurCrMethod->myArgs[ i ]); else - theCmd->SetArg( i, "[]"); + theCmd->SetArg( i+1, "[]"); } // set a new creation command GetCreationCmd()->Clear(); @@ -1796,8 +2324,8 @@ bool _pyHypothesis::Addition2Creation( const Handle(_pyCommand)& theCmd, // set unknown arg commands after hypo creation Handle(_pyCommand) afterCmd = myIsWrapped ? theCmd : GetCreationCmd(); - list::iterator cmd = myUnknownCommands.begin(); - for ( ; cmd != myUnknownCommands.end(); ++cmd ) { + list::iterator cmd = myUnusedCommands.begin(); + for ( ; cmd != myUnusedCommands.end(); ++cmd ) { afterCmd->AddDependantCmd( *cmd ); } @@ -1814,20 +2342,27 @@ bool _pyHypothesis::Addition2Creation( const Handle(_pyCommand)& theCmd, void _pyHypothesis::Process( const Handle(_pyCommand)& theCommand) { ASSERT( !myIsAlgo ); + if ( !theGen->IsToKeepAllCommands() ) + rememberCmdOfParameter( theCommand ); // set args - int nbArgs = 0; - for ( int i = 1; i <= myArgMethods.Length(); ++i ) { - if ( myArgMethods( i ) == theCommand->GetMethod() ) { - while ( myArgs.Length() < nbArgs + myNbArgsByMethod( i )) - myArgs.Append( "[]" ); - for ( int iArg = 1; iArg <= myNbArgsByMethod( i ); ++iArg ) - myArgs( nbArgs + iArg ) = theCommand->GetArg( iArg ); // arg value - myArgCommands.push_back( theCommand ); - return; + bool usedCommand = false; + TType2CrMethod::iterator type2meth = myAlgoType2CreationMethod.begin(); + for ( ; type2meth != myAlgoType2CreationMethod.end(); ++type2meth ) + { + CreationMethod& crMethod = type2meth->second; + for ( size_t i = 0; i < crMethod.myArgMethods.size(); ++i ) { + if ( crMethod.myArgMethods[ i ] == theCommand->GetMethod() ) { + if ( !usedCommand ) + myArgCommands.push_back( theCommand ); + usedCommand = true; + while ( crMethod.myArgs.size() < i+1 ) + crMethod.myArgs.push_back( "[]" ); + crMethod.myArgs[ i ] = theCommand->GetArg( crMethod.myArgNb[i] ); + } } - nbArgs += myNbArgsByMethod( i ); } - myUnknownCommands.push_back( theCommand ); + if ( !usedCommand ) + myUnusedCommands.push_back( theCommand ); } //================================================================================ @@ -1838,9 +2373,8 @@ void _pyHypothesis::Process( const Handle(_pyCommand)& theCommand) void _pyHypothesis::Flush() { - if ( IsWrapped() ) { - } - else { + if ( !IsAlgo() ) + { list < Handle(_pyCommand) >::iterator cmd = myArgCommands.begin(); for ( ; cmd != myArgCommands.end(); ++cmd ) { // Add access to a wrapped mesh @@ -1848,8 +2382,8 @@ void _pyHypothesis::Flush() // Add access to a wrapped algorithm theGen->AddAlgoAccessorMethod( *cmd ); } - cmd = myUnknownCommands.begin(); - for ( ; cmd != myUnknownCommands.end(); ++cmd ) { + cmd = myUnusedCommands.begin(); + for ( ; cmd != myUnusedCommands.end(); ++cmd ) { // Add access to a wrapped mesh theGen->AddMeshAccessorMethod( *cmd ); // Add access to a wrapped algorithm @@ -1858,50 +2392,299 @@ void _pyHypothesis::Flush() } // forget previous hypothesis modifications myArgCommands.clear(); - myUnknownCommands.clear(); + myUnusedCommands.clear(); +} + +//================================================================================ +/*! + * \brief clear creation, arg and unkown commands + */ +//================================================================================ + +void _pyHypothesis::ClearAllCommands() +{ + GetCreationCmd()->Clear(); + list::iterator cmd = myArgCommands.begin(); + for ( ; cmd != myArgCommands.end(); ++cmd ) + ( *cmd )->Clear(); + cmd = myUnusedCommands.begin(); + for ( ; cmd != myUnusedCommands.end(); ++cmd ) + ( *cmd )->Clear(); +} + + +//================================================================================ +/*! + * \brief Assign fields of theOther to me except myIsWrapped + */ +//================================================================================ + +void _pyHypothesis::Assign( const Handle(_pyHypothesis)& theOther, + const _pyID& theMesh ) +{ + // myCreationCmd = theOther->myCreationCmd; + myIsAlgo = theOther->myIsAlgo; + myIsWrapped = false; + myGeom = theOther->myGeom; + myMesh = theMesh; + myAlgoType2CreationMethod = theOther->myAlgoType2CreationMethod; + myAccumulativeMethods = theOther->myAccumulativeMethods; + //myUnusedCommands = theOther->myUnusedCommands; + // init myCurCrMethod + GetCreationMethod( theOther->GetAlgoType() ); +} + +//================================================================================ +/*! + * \brief Analyze my erasability depending on myReferredObjs + */ +//================================================================================ + +bool _pyHypothesis::CanClear() +{ + if ( IsInStudy() ) + { + list< Handle(_pyObject) >::iterator obj = myReferredObjs.begin(); + for ( ; obj != myReferredObjs.end(); ++obj ) + if ( (*obj)->CanClear() ) + return true; + return false; + } + return true; +} + +//================================================================================ +/*! + * \brief Clear my commands depending on usage by meshes + */ +//================================================================================ + +void _pyHypothesis::ClearCommands() +{ + // if ( !theGen->IsToKeepAllCommands() ) + // { + // bool isUsed = false; + // int lastComputeOrder = 0; + // list::iterator cmd = myComputeCmds.begin(); + // for ( ; cmd != myComputeCmds.end(); ++cmd ) + // if ( ! (*cmd)->IsEmpty() ) + // { + // isUsed = true; + // if ( (*cmd)->GetOrderNb() > lastComputeOrder ) + // lastComputeOrder = (*cmd)->GetOrderNb(); + // } + // if ( !isUsed ) + // { + // SetRemovedFromStudy( true ); + // } + // else + // { + // // clear my commands invoked after lastComputeOrder + // // map >::iterator m2c; + // // for ( m2c = myMeth2Commands.begin(); m2c != myMeth2Commands.end(); ++m2c ) + // // { + // // list< Handle(_pyCommand)> & cmds = m2c->second; + // // if ( !cmds.empty() && cmds.back()->GetOrderNb() > lastComputeOrder ) + // // cmds.back()->Clear(); + // // } + // } + // } + _pyObject::ClearCommands(); +} + +//================================================================================ +/*! + * \brief Find arguments that are objects like mesh, group, geometry + * \param meshes - referred meshes (directly or indirrectly) + * \retval bool - false if a referred geometry is not in the study + */ +//================================================================================ + +bool _pyHypothesis::GetReferredMeshesAndGeom( list< Handle(_pyMesh) >& meshes ) +{ + if ( IsAlgo() ) return true; + + bool geomPublished = true; + vector< _AString > args; + TType2CrMethod::iterator type2meth = myAlgoType2CreationMethod.begin(); + for ( ; type2meth != myAlgoType2CreationMethod.end(); ++type2meth ) + { + CreationMethod& crMethod = type2meth->second; + args.insert( args.end(), crMethod.myArgs.begin(), crMethod.myArgs.end()); + } + list::iterator cmd = myUnusedCommands.begin(); + for ( ; cmd != myUnusedCommands.end(); ++cmd ) { + for ( int nb = (*cmd)->GetNbArgs(); nb; --nb ) + args.push_back( (*cmd)->GetArg( nb )); + } + + for ( size_t i = 0; i < args.size(); ++i ) + { + list< _pyID > idList = _pyCommand::GetStudyEntries( args[ i ]); + if ( idList.empty() && !args[ i ].IsEmpty() ) + idList.push_back( args[ i ]); + list< _pyID >::iterator id = idList.begin(); + for ( ; id != idList.end(); ++id ) + { + Handle(_pyObject) obj = theGen->FindObject( *id ); + if ( obj.IsNull() ) obj = theGen->FindHyp( *id ); + if ( obj.IsNull() ) + { + if ( theGen->IsGeomObject( *id ) && theGen->IsNotPublished( *id )) + geomPublished = false; + } + else + { + myReferredObjs.push_back( obj ); + Handle(_pyMesh) mesh = ObjectToMesh( obj ); + if ( !mesh.IsNull() ) + meshes.push_back( mesh ); + // prevent clearing not published hyps referred e.g. by "LayerDistribution" + else if ( obj->IsKind( STANDARD_TYPE( _pyHypothesis )) && this->IsInStudy() ) + obj->SetRemovedFromStudy( false ); + } + } + } + return geomPublished; +} + +//================================================================================ +/*! + * \brief Remember theCommand setting a parameter + */ +//================================================================================ + +void _pyHypothesis::rememberCmdOfParameter( const Handle(_pyCommand) & theCommand ) +{ + // parameters are discriminated by method name + _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 + // by passing parameter names like e.g. SetOption("size", "0.2") + if ( theCommand->GetString().FirstLocationInSet( "'\"", 1, theCommand->Length() ) && + theCommand->GetNbArgs() > 1 ) + { + // mangle method by appending a 1st textual arg + for ( int iArg = 1; iArg <= theCommand->GetNbArgs(); ++iArg ) + { + const TCollection_AsciiString& arg = theCommand->GetArg( iArg ); + if ( arg.Value(1) != '\"' && arg.Value(1) != '\'' ) continue; + if ( !isalpha( arg.Value(2))) continue; + method += arg; + break; + } + } + // parameters are discriminated by method name + list< Handle(_pyCommand)>& cmds = myMeth2Commands[ method /*theCommand->GetMethod()*/ ]; + if ( !cmds.empty() && !isCmdUsedForCompute( cmds.back() )) + { + cmds.back()->Clear(); // previous parameter value has not been used + cmds.back() = theCommand; + } + else + { + cmds.push_back( theCommand ); + } +} + +//================================================================================ +/*! + * \brief Return true if a setting parameter command ha been used to compute mesh + */ +//================================================================================ + +bool _pyHypothesis::isCmdUsedForCompute( const Handle(_pyCommand) & cmd, + _pyCommand::TAddr avoidComputeAddr ) const +{ + bool isUsed = false; + map< _pyCommand::TAddr, list >::const_iterator addr2cmds = + myComputeAddr2Cmds.begin(); + for ( ; addr2cmds != myComputeAddr2Cmds.end() && !isUsed; ++addr2cmds ) + { + if ( addr2cmds->first == avoidComputeAddr ) continue; + const list & cmds = addr2cmds->second; + isUsed = ( std::find( cmds.begin(), cmds.end(), cmd ) != cmds.end() ); + } + return isUsed; +} + +//================================================================================ +/*! + * \brief Save commands setting parameters as they are used for a mesh computation + */ +//================================================================================ + +void _pyHypothesis::MeshComputed( const Handle(_pyCommand)& theComputeCmd ) +{ + myComputeCmds.push_back( theComputeCmd ); + list& savedCmds = myComputeAddr2Cmds[ theComputeCmd->GetAddress() ]; + + map >::iterator m2c; + for ( m2c = myMeth2Commands.begin(); m2c != myMeth2Commands.end(); ++m2c ) + savedCmds.push_back( m2c->second.back() ); } //================================================================================ /*! - * \brief clear creation, arg and unkown commands + * \brief Clear commands setting parameters as a mesh computed using them is cleared */ //================================================================================ -void _pyHypothesis::ClearAllCommands() +void _pyHypothesis::ComputeDiscarded( const Handle(_pyCommand)& theComputeCmd ) { - GetCreationCmd()->Clear(); - list::iterator cmd = myArgCommands.begin(); - for ( ; cmd != myArgCommands.end(); ++cmd ) - ( *cmd )->Clear(); - cmd = myUnknownCommands.begin(); - for ( ; cmd != myUnknownCommands.end(); ++cmd ) - ( *cmd )->Clear(); -} + list& savedCmds = myComputeAddr2Cmds[ theComputeCmd->GetAddress() ]; + list::iterator cmd = savedCmds.begin(); + for ( ; cmd != savedCmds.end(); ++cmd ) + { + // check if a cmd has been used to compute another mesh + if ( isCmdUsedForCompute( *cmd, theComputeCmd->GetAddress() )) + continue; + // check if a cmd is a sole command setting its parameter; + // don't use method name for search as it can change + map >::iterator + m2cmds = myMeth2Commands.begin(); + for ( ; m2cmds != myMeth2Commands.end(); ++m2cmds ) + { + list< Handle(_pyCommand)>& cmds = m2cmds->second; + list< Handle(_pyCommand)>::iterator cmdIt = std::find( cmds.begin(), cmds.end(), *cmd ); + if ( cmdIt != cmds.end() ) + { + if ( cmds.back() != *cmd ) + { + cmds.erase( cmdIt ); + (*cmd)->Clear(); + } + break; + } + } + } + myComputeAddr2Cmds.erase( theComputeCmd->GetAddress() ); +} //================================================================================ /*! - * \brief Assign fields of theOther to me except myIsWrapped + * \brief Sets an argNb-th argument of current creation command + * \param argNb - argument index countered from 1 */ //================================================================================ -void _pyHypothesis::Assign( const Handle(_pyHypothesis)& theOther, - const _pyID& theMesh ) +void _pyHypothesis::setCreationArg( const int argNb, const _AString& arg ) { - myIsWrapped = false; - myMesh = theMesh; - - // myCreationCmd = theOther->myCreationCmd; - myIsAlgo = theOther->myIsAlgo; - myGeom = theOther->myGeom; - myType2CreationMethod = theOther->myType2CreationMethod; - myArgs = theOther->myArgs; - myArgMethods = theOther->myArgMethods; - myNbArgsByMethod = theOther->myNbArgsByMethod; - myArgCommands = theOther->myArgCommands; - myUnknownCommands = theOther->myUnknownCommands; + if ( myCurCrMethod ) + { + while ( myCurCrMethod->myArgs.size() < argNb ) + myCurCrMethod->myArgs.push_back( "None" ); + if ( arg.IsEmpty() ) + myCurCrMethod->myArgs[ argNb-1 ] = "None"; + else + myCurCrMethod->myArgs[ argNb-1 ] = arg; + } } + //================================================================================ /*! * \brief Remember hypothesis parameter values @@ -1917,7 +2700,7 @@ void _pyComplexParamHypo::Process( const Handle(_pyCommand)& theCommand) if ( theCommand->GetMethod() == "SetSizeThreshold" ) { - myArgs( 4 ) = theCommand->GetArg( 1 ); + setCreationArg( 4, theCommand->GetArg( 1 )); myArgCommands.push_back( theCommand ); return; } @@ -1925,20 +2708,21 @@ void _pyComplexParamHypo::Process( const Handle(_pyCommand)& theCommand) theCommand->GetMethod() == "SetGridSpacing" ) { TCollection_AsciiString axis = theCommand->GetArg( theCommand->GetNbArgs() ); - int iArg = 1 + ( axis.Value(1) - '0' ); + int iArg = axis.Value(1) - '0'; if ( theCommand->GetMethod() == "SetGrid" ) { - myArgs( iArg ) = theCommand->GetArg( 1 ); + setCreationArg( 1+iArg, theCommand->GetArg( 1 )); } else { - myArgs( iArg ) = "[ "; - myArgs( iArg ) += theCommand->GetArg( 1 ); - myArgs( iArg ) += ", "; - myArgs( iArg ) += theCommand->GetArg( 2 ); - myArgs( iArg ) += "]"; + myCurCrMethod->myArgs[ iArg ] = "[ "; + myCurCrMethod->myArgs[ iArg ] += theCommand->GetArg( 1 ); + myCurCrMethod->myArgs[ iArg ] += ", "; + myCurCrMethod->myArgs[ iArg ] += theCommand->GetArg( 2 ); + myCurCrMethod->myArgs[ iArg ] += "]"; } myArgCommands.push_back( theCommand ); + rememberCmdOfParameter( theCommand ); return; } } @@ -1949,10 +2733,15 @@ void _pyComplexParamHypo::Process( const Handle(_pyCommand)& theCommand) // ex: hyp.SetLength(start, 1) // hyp.SetLength(end, 0) ASSERT(( theCommand->GetArg( 2 ).IsIntegerValue() )); - int i = 2 - theCommand->GetArg( 2 ).IntegerValue(); - while ( myArgs.Length() < i ) - myArgs.Append( "[]" ); - myArgs( i ) = theCommand->GetArg( 1 ); // arg value + int i = 1 - theCommand->GetArg( 2 ).IntegerValue(); + TType2CrMethod::iterator type2meth = myAlgoType2CreationMethod.begin(); + for ( ; type2meth != myAlgoType2CreationMethod.end(); ++type2meth ) + { + CreationMethod& crMethod = type2meth->second; + while ( crMethod.myArgs.size() < i+1 ) + crMethod.myArgs.push_back( "[]" ); + crMethod.myArgs[ i ] = theCommand->GetArg( 1 ); // arg value + } myArgCommands.push_back( theCommand ); } else @@ -1970,8 +2759,8 @@ void _pyComplexParamHypo::Flush() { if ( IsWrapped() ) { - list < Handle(_pyCommand) >::iterator cmd = myUnknownCommands.begin(); - for ( ; cmd != myUnknownCommands.end(); ++cmd ) + list < Handle(_pyCommand) >::iterator cmd = myUnusedCommands.begin(); + for ( ; cmd != myUnusedCommands.end(); ++cmd ) if ((*cmd)->GetMethod() == "SetObjectEntry" ) (*cmd)->Clear(); } @@ -1989,21 +2778,28 @@ void _pyLayerDistributionHypo::Process( const Handle(_pyCommand)& theCommand) if ( theCommand->GetMethod() != "SetLayerDistribution" ) return; - _pyID newName; // name for 1D hyp = "HypType" + "_Distribution" - const _pyID& hyp1dID = theCommand->GetArg( 1 ); - Handle(_pyHypothesis) hyp1d = theGen->FindHyp( hyp1dID ); - if ( hyp1d.IsNull() ) // apparently hypId changed at study restoration - hyp1d = my1dHyp; - else if ( !my1dHyp.IsNull() && hyp1dID != my1dHyp->GetID() ) { - // 1D hypo is already set, so distribution changes and the old - // 1D hypo is thrown away - my1dHyp->ClearAllCommands(); - } - my1dHyp = hyp1d; - - if ( !myArgCommands.empty() ) - myArgCommands.front()->Clear(); + // Handle(_pyHypothesis) hyp1d = theGen->FindHyp( hyp1dID ); + // if ( hyp1d.IsNull() && ! my1dHyp.IsNull()) // apparently hypId changed at study restoration + // { + // TCollection_AsciiString cmd = + // my1dHyp->GetCreationCmd()->GetIndentation() + hyp1dID + " = " + my1dHyp->GetID(); + // Handle(_pyCommand) newCmd = theGen->AddCommand( cmd ); + // theGen->SetCommandAfter( newCmd, my1dHyp->GetCreationCmd() ); + // hyp1d = my1dHyp; + // } + // else if ( !my1dHyp.IsNull() && hyp1dID != my1dHyp->GetID() ) + // { + // // 1D hypo is already set, so distribution changes and the old + // // 1D hypo is thrown away + // my1dHyp->ClearAllCommands(); + // } + // my1dHyp = hyp1d; + // //my1dHyp->SetRemovedFromStudy( false ); + + // if ( !myArgCommands.empty() ) + // myArgCommands.back()->Clear(); + myCurCrMethod->myArgs.push_back( hyp1dID ); myArgCommands.push_back( theCommand ); } @@ -2063,35 +2859,51 @@ void _pyLayerDistributionHypo::Flush() { // as creation of 1D hyp was written later then it's edition, // we need to find all it's edition calls and process them - if ( !my1dHyp.IsNull() ) - { - _pyID hyp1dID = my1dHyp->GetCreationCmd()->GetResultValue(); + list< Handle(_pyCommand) >::iterator cmd = myArgCommands.begin(); + _pyID prevNewName; + for ( cmd = myArgCommands.begin(); cmd != myArgCommands.end(); ++cmd ) + { + const _pyID& hyp1dID = (*cmd)->GetArg( 1 ); + if ( hyp1dID.IsEmpty() ) continue; + + Handle(_pyHypothesis) hyp1d = theGen->FindHyp( hyp1dID ); // make a new name for 1D hyp = "HypType" + "_Distribution" _pyID newName; - if ( my1dHyp->IsWrapped() ) { - newName = my1dHyp->GetCreationCmd()->GetMethod(); + if ( hyp1d.IsNull() ) // apparently hypId changed at study restoration + { + if ( prevNewName.IsEmpty() ) continue; + newName = prevNewName; } - else { - TCollection_AsciiString hypTypeQuoted = my1dHyp->GetCreationCmd()->GetArg(1); - newName = hypTypeQuoted.SubString( 2, hypTypeQuoted.Length() - 1 ); + else + { + if ( hyp1d->IsWrapped() ) { + newName = hyp1d->GetCreationCmd()->GetMethod(); + } + else { + TCollection_AsciiString hypTypeQuoted = hyp1d->GetCreationCmd()->GetArg(1); + newName = hypTypeQuoted.SubString( 2, hypTypeQuoted.Length() - 1 ); + } + newName += "_Distribution"; + prevNewName = newName; + + hyp1d->GetCreationCmd()->SetResultValue( newName ); } - newName += "_Distribution"; - my1dHyp->GetCreationCmd()->SetResultValue( newName ); - list< Handle(_pyCommand) >& cmds = theGen->GetCommands(); list< Handle(_pyCommand) >::iterator cmdIt = cmds.begin(); for ( ; cmdIt != cmds.end(); ++cmdIt ) { const _pyID& objID = (*cmdIt)->GetObject(); if ( objID == hyp1dID ) { - my1dHyp->Process( *cmdIt ); - my1dHyp->GetCreationCmd()->AddDependantCmd( *cmdIt ); + if ( !hyp1d.IsNull() ) + { + hyp1d->Process( *cmdIt ); + hyp1d->GetCreationCmd()->AddDependantCmd( *cmdIt ); + } ( *cmdIt )->SetObject( newName ); } } - // Set new hyp name to SetLayerDistribution() cmd - if ( !myArgCommands.empty() && !myArgCommands.back()->IsEmpty() ) - myArgCommands.back()->SetArg( 1, newName ); + // Set new hyp name to SetLayerDistribution(hyp1dID) cmd + (*cmd)->SetArg( 1, newName ); } } @@ -2107,11 +2919,11 @@ void _pyLayerDistributionHypo::Flush() bool _pyNumberOfSegmentsHyp::Addition2Creation( const Handle(_pyCommand)& theCmd, const _pyID& theMesh) { - if ( IsWrappable( theMesh ) && myArgs.Length() > 1 ) { + if ( IsWrappable( theMesh ) && myCurCrMethod->myArgs.size() > 1 ) { // scale factor (2-nd arg) is provided: clear SetDistrType(1) command bool scaleDistrType = false; - list::reverse_iterator cmd = myUnknownCommands.rbegin(); - for ( ; cmd != myUnknownCommands.rend(); ++cmd ) { + list::reverse_iterator cmd = myUnusedCommands.rbegin(); + for ( ; cmd != myUnusedCommands.rend(); ++cmd ) { if ( (*cmd)->GetMethod() == "SetDistrType" ) { if ( (*cmd)->GetArg( 1 ) == "1" ) { scaleDistrType = true; @@ -2119,7 +2931,13 @@ bool _pyNumberOfSegmentsHyp::Addition2Creation( const Handle(_pyCommand)& theCmd } else if ( !scaleDistrType ) { // distribution type changed: remove scale factor from args - myArgs.Remove( 2, myArgs.Length() ); + TType2CrMethod::iterator type2meth = myAlgoType2CreationMethod.begin(); + for ( ; type2meth != myAlgoType2CreationMethod.end(); ++type2meth ) + { + CreationMethod& crMethod = type2meth->second; + if ( crMethod.myArgs.size() == 2 ) + crMethod.myArgs.pop_back(); + } break; } } @@ -2137,16 +2955,16 @@ bool _pyNumberOfSegmentsHyp::Addition2Creation( const Handle(_pyCommand)& theCmd void _pyNumberOfSegmentsHyp::Flush() { // find number of the last SetDistrType() command - list::reverse_iterator cmd = myUnknownCommands.rbegin(); + list::reverse_iterator cmd = myUnusedCommands.rbegin(); int distrTypeNb = 0; - for ( ; !distrTypeNb && cmd != myUnknownCommands.rend(); ++cmd ) + for ( ; !distrTypeNb && cmd != myUnusedCommands.rend(); ++cmd ) if ( (*cmd)->GetMethod() == "SetDistrType" ) distrTypeNb = (*cmd)->GetOrderNb(); else if (IsWrapped() && (*cmd)->GetMethod() == "SetObjectEntry" ) (*cmd)->Clear(); // clear commands before the last SetDistrType() - list * cmds[2] = { &myArgCommands, &myUnknownCommands }; + list * cmds[2] = { &myArgCommands, &myUnusedCommands }; for ( int i = 0; i < 2; ++i ) { set uniqueMethods; list & cmdList = *cmds[i]; @@ -2198,8 +3016,8 @@ bool _pySegmentLengthAroundVertexHyp::Addition2Creation( const Handle(_pyCommand theCmd->SetArg( 1, geom ); // set vertex as a second arg - if ( myArgs.Length() < 1) myArgs.Append( "1" ); // :( - myArgs.Append( vertex ); + if ( myCurCrMethod->myArgs.size() < 1) setCreationArg( 1, "1" ); // :( + setCreationArg( 2, vertex ); // mesh.AddHypothesis(vertex, SegmentLengthAroundVertex) --> // theMeshID.LengthNearVertex( length, vertex ) @@ -2301,12 +3119,20 @@ const TCollection_AsciiString & _pyCommand::GetResultValue() { if ( GetBegPos( RESULT_IND ) == UNKNOWN ) { - int begPos = myString.Location( "=", 1, Length() ); - if ( begPos ) - myRes = GetWord( myString, begPos, false ); - else - begPos = EMPTY; - SetBegPos( RESULT_IND, begPos ); + SetBegPos( RESULT_IND, EMPTY ); + int begPos, endPos = myString.Location( "=", 1, Length() ); + if ( endPos ) + { + begPos = 1; + while ( begPos < endPos && isspace( myString.Value( begPos ))) ++begPos; + if ( begPos < endPos ) + { + SetBegPos( RESULT_IND, begPos ); + --endPos; + while ( begPos < endPos && isspace( myString.Value( endPos ))) --endPos; + myRes = myString.SubString( begPos, endPos ); + } + } } return myRes; } @@ -2336,22 +3162,25 @@ const int _pyCommand::GetNbResultValues() //================================================================================ /*! * \brief Return substring of python command looking like - * ResultValue1 , ResultValue1,... = Obj.Meth() with res index + * ResultValue1 , ResultValue2,... = Obj.Meth() with res index * \retval const TCollection_AsciiString & - ResultValue with res index substring */ //================================================================================ -const TCollection_AsciiString & _pyCommand::GetResultValue(int res) +TCollection_AsciiString _pyCommand::GetResultValue(int res) { int begPos = 1; - int Nb=0; + if ( SkipSpaces( myString, begPos ) && myString.Value( begPos ) == '[' ) + ++begPos; // skip [, else the whole list is returned int endPos = myString.Location( "=", 1, Length() ); + int Nb=0; while ( begPos < endPos) { - myRes = GetWord( myString, begPos, true ); - begPos = begPos + myRes.Length(); + _AString result = GetWord( myString, begPos, true ); + begPos = begPos + result.Length(); Nb++; - if(res == Nb){ - myRes.RemoveAll('[');myRes.RemoveAll(']'); - return myRes; + if(res == Nb) { + result.RemoveAll('['); + result.RemoveAll(']'); + return result; } if(Nb>res) break; @@ -2403,6 +3232,12 @@ const TCollection_AsciiString & _pyCommand::GetObject() if ( dotPos > begPos+myObj.Length() ) myObj = myString.SubString( begPos, dotPos-1 ); } + // 1st word after '=' is an object + // else // no method -> no object + // { + // myObj.Clear(); + // begPos = EMPTY; + // } // store SetBegPos( OBJECT_IND, begPos ); } @@ -2458,7 +3293,7 @@ const TCollection_AsciiString & _pyCommand::GetArg( int index ) // we are at or before '(', skip it if present if ( pos > 0 ) { while ( pos <= Length() && myString.Value( pos ) != '(' ) ++pos; - if ( myString.Value( pos ) != '(' ) + if ( pos > Length() ) pos = 0; } if ( pos < 1 ) { @@ -2476,14 +3311,18 @@ const TCollection_AsciiString & _pyCommand::GetArg( int index ) if ( separatorStack.back().Location( chr, 1, separatorStack.back().Length())) { - if ( separatorStack.size() == 1 ) // ',' dividing args or a terminal ')' found + if ( separatorStack.size() == 1 ) // a comma dividing args or a terminal ')' found { while ( pos-1 >= prevPos && isspace( myString.Value( prevPos ))) ++prevPos; + TCollection_AsciiString arg; if ( pos-1 >= prevPos ) { - TCollection_AsciiString arg = myString.SubString( prevPos, pos-1 ); + arg = myString.SubString( prevPos, pos-1 ); arg.RightAdjust(); // remove spaces arg.LeftAdjust(); + } + if ( !arg.IsEmpty() || chr == ',' ) + { SetBegPos( ARG1_IND + myArgs.Length(), prevPos ); myArgs.Append( arg ); } @@ -2539,10 +3378,10 @@ static inline bool isWord(const char c, const bool dotIsWord) */ //================================================================================ -TCollection_AsciiString _pyCommand::GetWord( const TCollection_AsciiString & theString, - int & theStartPos, - const bool theForward, - const bool dotIsWord ) +TCollection_AsciiString _pyCommand::GetWord( const _AString & theString, + int & theStartPos, + const bool theForward, + const bool dotIsWord ) { int beg = theStartPos, end = theStartPos; theStartPos = EMPTY; @@ -2579,10 +3418,11 @@ TCollection_AsciiString _pyCommand::GetWord( const TCollection_AsciiString & the return theEmptyString; // no word found beg = end - 1; char endChar = theString.Value( end ); - if ( endChar == '"' || endChar == '\'' ) { + if ( endChar == '"' || endChar == '\'' || endChar == ']') { + char begChar = ( endChar == ']' ) ? '[' : endChar; // beg is at the corresponding quoting mark while ( beg > 1 && - ( theString.Value( beg ) != endChar || theString.Value( beg-1 ) == '\\')) + ( theString.Value( beg ) != begChar || theString.Value( beg-1 ) == '\\')) --beg; } else { @@ -2596,14 +3436,58 @@ TCollection_AsciiString _pyCommand::GetWord( const TCollection_AsciiString & the return theString.SubString( beg, end ); } +//================================================================================ +/*! + * \brief Returns true if the string looks like a study entry + */ +//================================================================================ + +bool _pyCommand::IsStudyEntry( const TCollection_AsciiString& str ) +{ + if ( str.Length() < 5 ) return false; + + int nbColons = 0, isColon; + for ( int i = 1; i <= str.Length(); ++i ) + { + char c = str.Value(i); + if (!( isColon = (c == ':')) && ( c < '0' || c > '9' )) + return false; + nbColons += isColon; + } + return nbColons > 2 && str.Length()-nbColons > 2; +} + +//================================================================================ +/*! + * \brief Finds entries in a sting + */ +//================================================================================ + +std::list< _pyID > _pyCommand::GetStudyEntries( const TCollection_AsciiString& str ) +{ + std::list< _pyID > resList; + int pos = 0; + while ( ++pos <= str.Length() ) + { + if ( !isdigit( str.Value( pos ))) continue; + if ( pos != 1 && ( isalpha( str.Value( pos-1 ) || str.Value( pos-1 ) == ':'))) continue; + + int end = pos; + while ( ++end <= str.Length() && ( isdigit( str.Value( end )) || str.Value( end ) == ':' )); + _pyID entry = str.SubString( pos, end-1 ); + pos = end; + if ( IsStudyEntry( entry )) + resList.push_back( entry ); + } + return resList; +} + //================================================================================ /*! * \brief Look for position where not space char is * \param theString - The string * \param thePos - The position to search from and which returns result * \retval bool - false if there are only space after thePos in theString - * - * */ //================================================================================ @@ -2717,6 +3601,30 @@ void _pyCommand::RemoveArgs() myBegPos.Remove( ARG1_IND, myBegPos.Length() ); } +//================================================================================ +/*! + * \brief Comment a python command + */ +//================================================================================ + +void _pyCommand::Comment() +{ + if ( IsEmpty() ) return; + + int i = 1; + while ( i <= Length() && isspace( myString.Value(i) )) ++i; + if ( i <= Length() ) + { + myString.Insert( i, "#" ); + for ( int iPart = 0; iPart < myBegPos.Length(); ++iPart ) + { + int begPos = GetBegPos( iPart ); + if ( begPos != UNKNOWN ) + SetBegPos( iPart, begPos + 1 ); + } + } +} + //================================================================================ /*! * \brief Set dependent commands after this one @@ -2788,11 +3696,41 @@ bool _pyCommand::AddAccessorMethod( _pyID theObjectID, const char* theAcsMethod */ //================================================================================ -_pyObject::_pyObject(const Handle(_pyCommand)& theCreationCmd) - : myCreationCmd(theCreationCmd), myNbCalls(0), myIsRemoved(false) +_pyObject::_pyObject(const Handle(_pyCommand)& theCreationCmd, const _pyID& theID) + : myID(theID), myCreationCmd(theCreationCmd), myIsPublished(false) +{ + setID( theID ); +} + +//================================================================================ +/*! + * \brief Set up myID and myIsPublished + */ +//================================================================================ + +void _pyObject::setID(const _pyID& theID) +{ + myID = theID; + myIsPublished = !theGen->IsNotPublished( GetID() ); +} + +//================================================================================ +/*! + * \brief Clear myCreationCmd and myProcessedCmds + */ +//================================================================================ + +void _pyObject::ClearCommands() { - if ( !theCreationCmd.IsNull() && !theCreationCmd->IsEmpty() ) - myIsRemoved = theGen->IsDead( theCreationCmd->GetResultValue() ); + if ( !CanClear() ) + return; + + if ( !myCreationCmd.IsNull() ) + myCreationCmd->Clear(); + + list< Handle(_pyCommand) >::iterator cmd = myProcessedCmds.begin(); + for ( ; cmd != myProcessedCmds.end(); ++cmd ) + (*cmd)->Clear(); } //================================================================================ @@ -2832,6 +3770,61 @@ void _pySelfEraser::Flush() GetCreationCmd()->Clear(); } +//================================================================================ +/*! + * \brief _pySubMesh constructor + */ +//================================================================================ + +_pySubMesh::_pySubMesh(const Handle(_pyCommand)& theCreationCmd): + _pyObject(theCreationCmd) +{ + myMesh = ObjectToMesh( theGen->FindObject( theCreationCmd->GetObject() )); +} + +//================================================================================ +/*! + * \brief Return true if a sub-mesh can be used as argument of the given method + */ +//================================================================================ + +bool _pySubMesh::CanBeArgOfMethod(const _AString& theMethodName) +{ + // names of all methods where a sub-mesh can be used as argument + static TStringSet methods; + if ( methods.empty() ) { + const char * names[] = { + // methods of SMESH_Gen + "CopyMesh", + // methods of SMESH_Group + "AddFrom", + // methods of SMESH_Measurements + "MinDistance", + // methods of SMESH_Mesh + "ExportPartToMED","ExportCGNS","ExportPartToDAT","ExportPartToUNV","ExportPartToSTL", + "RemoveSubMesh", + // methods of SMESH_MeshEditor + "ReorientObject","Reorient2D","TriToQuadObject","QuadToTriObject","SplitQuadObject", + "SplitVolumesIntoTetra","SmoothObject","SmoothParametricObject","ConvertFromQuadraticObject", + "RotationSweepObject","RotationSweepObjectMakeGroups","RotationSweepObject1D", + "RotationSweepObject1DMakeGroups","RotationSweepObject2D","RotationSweepObject2DMakeGroups", + "ExtrusionSweepObject","ExtrusionSweepObjectMakeGroups","ExtrusionSweepObject0D", + "ExtrusionSweepObject0DMakeGroups","ExtrusionSweepObject1D","ExtrusionSweepObject2D", + "ExtrusionSweepObject1DMakeGroups","ExtrusionSweepObject2DMakeGroups", + "ExtrusionAlongPathObjX","ExtrusionAlongPathObject","ExtrusionAlongPathObjectMakeGroups", + "ExtrusionAlongPathObject1D","ExtrusionAlongPathObject1DMakeGroups", + "ExtrusionAlongPathObject2D","ExtrusionAlongPathObject2DMakeGroups","MirrorObject", + "MirrorObjectMakeGroups","MirrorObjectMakeMesh","TranslateObject","Scale", + "TranslateObjectMakeGroups","TranslateObjectMakeMesh","ScaleMakeGroups","ScaleMakeMesh", + "RotateObject","RotateObjectMakeGroups","RotateObjectMakeMesh","FindCoincidentNodesOnPart", + "FindCoincidentNodesOnPartBut","FindEqualElements","FindAmongElementsByPoint", + "MakeBoundaryMesh","Create0DElementsOnAllNodes", + "" }; // <- mark of end + methods.Insert( names ); + } + return methods.Contains( theMethodName ); +} + //================================================================================ /*! * \brief count invoked commands @@ -2846,7 +3839,7 @@ void _pySubMesh::Process( const Handle(_pyCommand)& theCommand ) //================================================================================ /*! - * \brief Clear creation command if no commands invoked + * \brief Move creation command depending on invoked commands */ //================================================================================ @@ -2859,6 +3852,85 @@ void _pySubMesh::Flush() myCreator->GetCreationCmd()->AddDependantCmd( GetCreationCmd() ); } +//================================================================================ +/*! + * \brief Creates _pyGroup + */ +//================================================================================ + +_pyGroup::_pyGroup(const Handle(_pyCommand)& theCreationCmd, const _pyID & id) + :_pySubMesh(theCreationCmd) +{ + if ( !id.IsEmpty() ) + setID( id ); + + myCanClearCreationCmd = true; + + const _AString& method = theCreationCmd->GetMethod(); + if ( method == "CreateGroup" ) // CreateGroup() --> CreateEmptyGroup() + { + theCreationCmd->SetMethod( "CreateEmptyGroup" ); + } + // ---------------------------------------------------------------------- + else if ( method == "CreateGroupFromGEOM" ) // (type, name, grp) + { + _pyID geom = theCreationCmd->GetArg( 3 ); + // VSR 24/12/2010. PAL21106: always use GroupOnGeom() function on dump + // next if(){...} section is commented + //if ( sameGroupType( geom, theCreationCmd->GetArg( 1 )) ) { // --> Group(geom) + // theCreationCmd->SetMethod( "Group" ); + // theCreationCmd->RemoveArgs(); + // theCreationCmd->SetArg( 1, geom ); + //} + //else { + // ------------------------->>>>> GroupOnGeom( geom, name, typ ) + _pyID type = theCreationCmd->GetArg( 1 ); + _pyID name = theCreationCmd->GetArg( 2 ); + theCreationCmd->SetMethod( "GroupOnGeom" ); + theCreationCmd->RemoveArgs(); + theCreationCmd->SetArg( 1, geom ); + theCreationCmd->SetArg( 2, name ); + theCreationCmd->SetArg( 3, type ); + //} + } + else if ( method == "CreateGroupFromFilter" ) + { + // -> GroupOnFilter(typ, name, aFilter0x4743dc0 -> aFilter_1) + theCreationCmd->SetMethod( "GroupOnFilter" ); + + _pyID filterID = theCreationCmd->GetArg(3); + Handle(_pyFilter) filter = Handle(_pyFilter)::DownCast( theGen->FindObject( filterID )); + if ( !filter.IsNull()) + { + if ( !filter->GetNewID().IsEmpty() ) + theCreationCmd->SetArg( 3, filter->GetNewID() ); + filter->AddUser( this ); + } + myFilter = filter; + } + else + { + // theCreationCmd does something else apart from creation of this group + // and thus it can't be cleared if this group is removed + myCanClearCreationCmd = false; + } +} + +//================================================================================ +/*! + * \brief set myCanClearCreationCmd = true if the main action of the creation + * command is discarded + */ +//================================================================================ + +void _pyGroup::RemovedWithContents() +{ + // this code would be appropriate if Add0DElementsToAllNodes() returned only new nodes + // via a created group + //if ( GetCreationCmd()->GetMethod() == "Add0DElementsToAllNodes") + // myCanClearCreationCmd = true; +} + //================================================================================ /*! * \brief To convert creation of a group by filter @@ -2871,45 +3943,80 @@ void _pyGroup::Process( const Handle(_pyCommand)& theCommand) // group = mesh.CreateEmptyGroup( elemType, groupName ) // aFilter.SetMesh(mesh) // nbAdd = group.AddFrom( aFilter ) + Handle(_pyFilter) filter; if ( theCommand->GetMethod() == "AddFrom" ) { _pyID idSource = theCommand->GetArg(1); // check if idSource is a filter - Handle(_pyObject) filter = theGen->FindObject( idSource ); - if ( filter.IsNull() || !filter->IsKind(STANDARD_TYPE(_pyFilter))) - return; - // find aFilter.SetMesh(mesh) to clear it, it should be just before theCommand - list< Handle(_pyCommand) >::reverse_iterator cmdIt = theGen->GetCommands().rbegin(); - while ( *cmdIt != theCommand ) ++cmdIt; - while ( (*cmdIt)->GetOrderNb() != 1 ) + filter = Handle(_pyFilter)::DownCast( theGen->FindObject( idSource )); + if ( !filter.IsNull() ) { - const Handle(_pyCommand)& setMeshCmd = *(++cmdIt); - if ((setMeshCmd->GetObject() == idSource || - setMeshCmd->GetObject() == Handle(_pyFilter)::DownCast(filter)->GetNewID() ) - && - setMeshCmd->GetMethod() == "SetMesh") + // find aFilter.SetMesh(mesh) to clear it, it should be just before theCommand + list< Handle(_pyCommand) >::reverse_iterator cmdIt = theGen->GetCommands().rbegin(); + while ( *cmdIt != theCommand ) ++cmdIt; + while ( (*cmdIt)->GetOrderNb() != 1 ) { - setMeshCmd->Clear(); - break; + const Handle(_pyCommand)& setMeshCmd = *(++cmdIt); + if ((setMeshCmd->GetObject() == idSource || + setMeshCmd->GetObject() == filter->GetNewID() ) + && + setMeshCmd->GetMethod() == "SetMesh") + { + setMeshCmd->Clear(); + break; + } } + // replace 3 commands by one + theCommand->Clear(); + const Handle(_pyCommand)& makeGroupCmd = GetCreationCmd(); + TCollection_AsciiString name = makeGroupCmd->GetArg( 2 ); + if ( !filter->GetNewID().IsEmpty() ) + idSource = filter->GetNewID(); + makeGroupCmd->SetMethod( "MakeGroupByFilter" ); + makeGroupCmd->SetArg( 1, name ); + makeGroupCmd->SetArg( 2, idSource ); } - // replace 3 commands by one - theCommand->Clear(); - const Handle(_pyCommand)& makeGroupCmd = GetCreationCmd(); - TCollection_AsciiString name = makeGroupCmd->GetArg( 2 ); - makeGroupCmd->SetMethod( "MakeGroupByFilter" ); - makeGroupCmd->SetArg( 1, name ); - makeGroupCmd->SetArg( 2, idSource ); - // set new name of a filter - filter->Process( makeGroupCmd ); } else if ( theCommand->GetMethod() == "SetFilter" ) { - // set new name of a filter + // set new name of a filter or clear the command if the same filter is set _pyID filterID = theCommand->GetArg(1); - Handle(_pyObject) filter = theGen->FindObject( filterID ); - if ( !filter.IsNull() ) - filter->Process( theCommand ); + filter = Handle(_pyFilter)::DownCast( theGen->FindObject( filterID )); + if ( !myFilter.IsNull() && filter == myFilter ) + theCommand->Clear(); + else if ( !filter.IsNull() && !filter->GetNewID().IsEmpty() ) + theCommand->SetArg( 1, filter->GetNewID() ); + myFilter = filter; + } + else if ( theCommand->GetMethod() == "GetFilter" ) + { + // GetFilter() returns a filter with other ID, make myFilter process + // calls of the returned filter + if ( !myFilter.IsNull() ) + { + theGen->SetProxyObject( theCommand->GetResultValue(), myFilter ); + theCommand->Clear(); + } + } + + if ( !filter.IsNull() ) + filter->AddUser( this ); + + theGen->AddMeshAccessorMethod( theCommand ); +} + +//================================================================================ +/*! + * \brief Prevent clearing "DoubleNode...() command if a group created by it is removed + */ +//================================================================================ + +void _pyGroup::Flush() +{ + if ( !theGen->IsToKeepAllCommands() && + myCreationCmd && !myCanClearCreationCmd ) + { + myCreationCmd.Nullify(); // this way myCreationCmd won't be cleared } } @@ -2937,24 +4044,12 @@ void _pyFilter::Process( const Handle(_pyCommand)& theCommand) _pyObject::Process(theCommand); // count commands if ( !myNewID.IsEmpty() ) - { - if ( theCommand->GetObject() == GetID() ) - theCommand->SetObject( myNewID ); - else if ( theCommand->GetResultValue() == GetID() ) - theCommand->SetResultValue( myNewID ); - else - for ( int i = 1, nb = theCommand->GetNbArgs(); i <= nb; ++i ) - if ( theCommand->GetArg( i ) == GetID() ) - { - theCommand->SetArg( i, myNewID ); - break; - } - } - + theCommand->SetObject( myNewID ); + // Convert the following set of commands into smesh.GetFilterFromCriteria(criteria) // aFilter0x2aaab0487080 = aFilterManager.CreateFilter() // aFilter0x2aaab0487080.SetCriteria(aCriteria) - if ( GetNbCalls() == 0 && // none method was called before SetCriteria() + if ( GetNbCalls() == 1 && // none method was called before this SetCriteria() call theCommand->GetMethod() == "SetCriteria") { // aFilter.SetCriteria(aCriteria) -> @@ -2969,8 +4064,12 @@ void _pyFilter::Process( const Handle(_pyCommand)& theCommand) // Clear aFilterManager.CreateFilter() GetCreationCmd()->Clear(); } - else if ( theCommand->GetMethod() == "SetMesh") + else if ( theCommand->GetMethod() == "SetMesh" ) { + if ( myMesh == theCommand->GetArg( 1 )) + theCommand->Clear(); + else + myMesh = theCommand->GetArg( 1 ); theGen->AddMeshAccessorMethod( theCommand ); } } @@ -2986,3 +4085,182 @@ void _pyFilter::Flush() if ( !myNewID.IsEmpty() && !GetCreationCmd()->IsEmpty() ) GetCreationCmd()->SetResultValue( myNewID ); } + +//================================================================================ +/*! + * \brief Return true if all my users can be cleared + */ +//================================================================================ + +bool _pyFilter::CanClear() +{ + list< Handle(_pyObject) >::iterator obj = myUsers.begin(); + for ( ; obj != myUsers.end(); ++obj ) + if ( !(*obj)->CanClear() ) + return false; + + return true; +} + +//================================================================================ +/*! + * \brief Reads _pyHypothesis'es from resource files of mesher Plugins + */ +//================================================================================ + +_pyHypothesisReader::_pyHypothesisReader() +{ + // Read xml files + vector< string > xmlPaths = SMESH_Gen::GetPluginXMLPaths(); + LDOMParser xmlParser; + for ( size_t i = 0; i < xmlPaths.size(); ++i ) + { + bool error = xmlParser.parse( xmlPaths[i].c_str() ); + if ( error ) + { + _AString data; + INFOS( xmlParser.GetError(data) ); + continue; + } + // + // + // Regular_1D=Segment() + // LocalLength=LocalLength(SetLength(1),,SetPrecision(1)) + // + LDOM_Document xmlDoc = xmlParser.getDocument(); + LDOM_NodeList algoNodeList = xmlDoc.getElementsByTagName( "algorithm" ); + for ( int i = 0; i < algoNodeList.getLength(); ++i ) + { + LDOM_Node algoNode = algoNodeList.item( i ); + LDOM_Element& algoElem = (LDOM_Element&) algoNode; + LDOM_NodeList pyAlgoNodeList = algoElem.getElementsByTagName( "algo" ); + if ( pyAlgoNodeList.getLength() < 1 ) continue; + + _AString text, algoType, method, arg; + for ( int iA = 0; iA < pyAlgoNodeList.getLength(); ++iA ) + { + LDOM_Node pyAlgoNode = pyAlgoNodeList.item( iA ); + LDOM_Node textNode = pyAlgoNode.getFirstChild(); + text = textNode.getNodeValue(); + Handle(_pyCommand) algoCmd = new _pyCommand( text ); + algoType = algoCmd->GetResultValue(); + method = algoCmd->GetMethod(); + arg = algoCmd->GetArg(1); + if ( !algoType.IsEmpty() && !method.IsEmpty() ) + { + Handle(_pyAlgorithm) algo = new _pyAlgorithm( algoCmd ); + algo->SetConvMethodAndType( method, algoType ); + if ( !arg.IsEmpty() ) + algo->setCreationArg( 1, arg ); + + myType2Hyp[ algoType ] = algo; + break; + } + } + if ( algoType.IsEmpty() ) continue; + + LDOM_NodeList pyHypoNodeList = algoElem.getElementsByTagName( "hypo" ); + _AString hypType; + Handle( _pyHypothesis ) hyp; + for ( int iH = 0; iH < pyHypoNodeList.getLength(); ++iH ) + { + LDOM_Node pyHypoNode = pyHypoNodeList.item( iH ); + LDOM_Node textNode = pyHypoNode.getFirstChild(); + text = textNode.getNodeValue(); + Handle(_pyCommand) hypoCmd = new _pyCommand( text ); + hypType = hypoCmd->GetResultValue(); + method = hypoCmd->GetMethod(); + if ( !hypType.IsEmpty() && !method.IsEmpty() ) + { + map<_AString, Handle(_pyHypothesis)>::iterator type2hyp = myType2Hyp.find( hypType ); + if ( type2hyp == myType2Hyp.end() ) + hyp = new _pyHypothesis( hypoCmd ); + else + hyp = type2hyp->second; + hyp->SetConvMethodAndType( method, algoType ); + for ( int iArg = 1; iArg <= hypoCmd->GetNbArgs(); ++iArg ) + { + _pyCommand argCmd( hypoCmd->GetArg( iArg )); + _AString argMethod = argCmd.GetMethod(); + _AString argNbText = argCmd.GetArg( 1 ); + if ( argMethod.IsEmpty() && !argCmd.IsEmpty() ) + hyp->setCreationArg( 1, argCmd.GetString() ); // e.g. Parameters(smesh.SIMPLE) + else + hyp->AddArgMethod( argMethod, + argNbText.IsIntegerValue() ? argNbText.IntegerValue() : 1 ); + } + myType2Hyp[ hypType ] = hyp; + } + } + } + // + // + // + // SetEnforcedVertex, + // SetEnforcedVertexNamed + // + // + // + // + 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 +} + +//================================================================================ +/*! + * \brief Returns a new hypothesis initialized according to the read information + */ +//================================================================================ + +Handle(_pyHypothesis) +_pyHypothesisReader::GetHypothesis(const _AString& hypType, + const Handle(_pyCommand)& creationCmd) const +{ + Handle(_pyHypothesis) resHyp, sampleHyp; + + map<_AString, Handle(_pyHypothesis)>::const_iterator type2hyp = myType2Hyp.find( hypType ); + if ( type2hyp != myType2Hyp.end() ) + sampleHyp = type2hyp->second; + + if ( sampleHyp.IsNull() ) + { + resHyp = new _pyHypothesis(creationCmd); + } + else + { + if ( sampleHyp->IsAlgo() ) + resHyp = new _pyAlgorithm( creationCmd ); + else + resHyp = new _pyHypothesis(creationCmd); + resHyp->Assign( sampleHyp, _pyID() ); + } + return resHyp; +}