X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_DumpPython.cxx;h=0e3ae652fd399f3c0767bf945130a3f03224f7f8;hb=f89c0586c1d18c14cf772fa64a7fe6cc680376d1;hp=0bed09d8c18ef31c5fb3a7f6bee1e11049b0d7a8;hpb=27624ded2e10707932e7d306f3dbcea7d7e7014f;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index 0bed09d8c..0e3ae652f 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -25,15 +25,17 @@ // Module : SMESH #include "SMESH_PythonDump.hxx" -#include "SMESH_Gen_i.hxx" + +#include "SMESH_2smeshpy.hxx" +#include "SMESH_Comment.hxx" #include "SMESH_Filter_i.hxx" +#include "SMESH_Gen_i.hxx" #include "SMESH_MeshEditor_i.hxx" -#include "SMESH_2smeshpy.hxx" + +#include #include #include -#include - #ifdef _DEBUG_ static int MYDEBUG = 0; @@ -41,15 +43,11 @@ static int MYDEBUG = 0; static int MYDEBUG = 0; #endif -static TCollection_AsciiString NotPublishedObjectName() -{ - return "__NOT__Published__Object__"; -} - namespace SMESH { size_t TPythonDump::myCounter = 0; + const char theNotPublishedObjectName[] = "__NOT__Published__Object__"; TVar::TVar(CORBA::Double value):myVals(1) { myVals[0] = SMESH_Comment(value); } TVar::TVar(CORBA::Long value):myVals(1) { myVals[0] = SMESH_Comment(value); } @@ -72,29 +70,29 @@ namespace SMESH SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); std::string aString = myStream.str(); TCollection_AsciiString aCollection(Standard_CString(aString.c_str())); - SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); - if(!aStudy->_is_nil() && !aCollection.IsEmpty()){ + SALOMEDS::Study_var aStudy = aSMESHGen->GetCurrentStudy(); + if(!aStudy->_is_nil() && !aCollection.IsEmpty()) + { aSMESHGen->AddToPythonScript(aStudy->StudyId(),aCollection); if(MYDEBUG) MESSAGE(aString); - aSMESHGen->UpdateParameters(""); // prevent misuse of already treated variables + // prevent misuse of already treated variables + aSMESHGen->UpdateParameters(CORBA::Object_var().in(),""); } } } - TPythonDump& //!< to store a variable value + TPythonDump& //!< store a variable value. Write either a value or '$varID$' TPythonDump:: operator<<(const TVar& theVarValue) { - if ( theVarValue.myVals.empty() ) return *this; - - const std::vector< std::string >& varNames = SMESH_Gen_i::GetSMESHGen()->GetLastParameters(); - if ( theVarValue.myVals.size() > 1 ) + const std::vector< int >& varIDs = SMESH_Gen_i::GetSMESHGen()->GetLastParamIndices(); + if ( theVarValue.myVals.size() != 1 ) { myStream << "[ "; for ( size_t i = 1; i <= theVarValue.myVals.size(); ++i ) { - if ( myVarsCounter < varNames.size() && !varNames[ myVarsCounter ].empty() ) - myStream << TVar::Quote() << varNames[ myVarsCounter ] << TVar::Quote(); + if ( myVarsCounter < varIDs.size() && varIDs[ myVarsCounter ] >= 0 ) + myStream << TVar::Quote() << varIDs[ myVarsCounter ] << TVar::Quote(); else myStream << theVarValue.myVals[i-1]; if ( i < theVarValue.myVals.size() ) @@ -105,8 +103,8 @@ namespace SMESH } else { - if ( myVarsCounter < varNames.size() && !varNames[ myVarsCounter ].empty() ) - myStream << TVar::Quote() << varNames[ myVarsCounter ] << TVar::Quote(); + if ( myVarsCounter < varIDs.size() && varIDs[ myVarsCounter ] >= 0 ) + myStream << TVar::Quote() << varIDs[ myVarsCounter ] << TVar::Quote(); else myStream << theVarValue.myVals[0]; ++myVarsCounter; @@ -163,13 +161,14 @@ namespace SMESH { myStream<<"SMESH."; switch(theArg){ - case ALL: myStream<<"ALL";break; - case NODE: myStream<<"NODE";break; - case EDGE: myStream<<"EDGE";break; - case FACE: myStream<<"FACE";break; - case VOLUME:myStream<<"VOLUME";break; - case ELEM0D:myStream<<"ELEM0D";break; - default: myStream<<"__UNKNOWN__ElementType: " << theArg; + case ALL: myStream<<"ALL"; break; + case NODE: myStream<<"NODE"; break; + case EDGE: myStream<<"EDGE"; break; + case FACE: myStream<<"FACE"; break; + case VOLUME: myStream<<"VOLUME"; break; + case ELEM0D: myStream<<"ELEM0D"; break; + case BALL: myStream<<"BALL"; break; + default: myStream<<"__UNKNOWN__ElementType: " << theArg; } return *this; } @@ -190,10 +189,45 @@ namespace SMESH case Geom_HEXA: myStream<<"Geom_HEXA"; break; case Geom_PENTA: myStream<<"Geom_PENTA"; break; case Geom_POLYHEDRA: myStream<<"Geom_POLYHEDRA"; break; + case Geom_BALL: myStream<<"Geom_BALL"; break; default: myStream<<"__UNKNOWN__GeometryType: " << theArg; } return *this; } + TPythonDump& + TPythonDump:: + operator<<(const SMESH::EntityType& theArg) + { + myStream<<"SMESH."; + switch(theArg){ + case Entity_0D: myStream<<"Entity_0D"; break; + case Entity_Edge: myStream<<"Entity_Edge"; break; + case Entity_Quad_Edge: myStream<<"Entity_Quad_Edge"; break; + case Entity_Triangle: myStream<<"Entity_Triangle"; break; + case Entity_Quad_Triangle: myStream<<"Entity_Quad_Triangle"; break; + case Entity_Quadrangle: myStream<<"Entity_Quadrangle"; break; + case Entity_Quad_Quadrangle: myStream<<"Entity_Quad_Quadrangle"; break; + case Entity_BiQuad_Quadrangle: myStream<<"Entity_BiQuad_Quadrangle"; break; + case Entity_Polygon: myStream<<"Entity_Polygon"; break; + case Entity_Quad_Polygon: myStream<<"Entity_Quad_Polygon"; break; + case Entity_Tetra: myStream<<"Entity_Tetra"; break; + case Entity_Quad_Tetra: myStream<<"Entity_Quad_Tetra"; break; + case Entity_Pyramid: myStream<<"Entity_Pyramid"; break; + case Entity_Quad_Pyramid: myStream<<"Entity_Quad_Pyramid"; break; + case Entity_Hexa: myStream<<"Entity_Hexa"; break; + case Entity_Quad_Hexa: myStream<<"Entity_Quad_Hexa"; break; + case Entity_TriQuad_Hexa: myStream<<"Entity_TriQuad_Hexa"; break; + case Entity_Penta: myStream<<"Entity_Penta"; break; + case Entity_Quad_Penta: myStream<<"Entity_Quad_Penta"; break; + case Entity_Hexagonal_Prism: myStream<<"Entity_Hexagonal_Prism"; break; + case Entity_Polyhedra: myStream<<"Entity_Polyhedra"; break; + case Entity_Quad_Polyhedra: myStream<<"Entity_Quad_Polyhedra"; break; + case Entity_Ball: myStream<<"Entity_Ball"; break; + case Entity_Last: myStream<<"Entity_Last"; break; + default: myStream<<"__UNKNOWN__EntityType: " << theArg; + } + return *this; + } template void DumpArray(const TArray& theArray, TPythonDump & theStream) @@ -238,10 +272,13 @@ namespace SMESH TPythonDump:: operator<<(SALOMEDS::SObject_ptr aSObject) { - if ( !aSObject->_is_nil() ) - myStream << aSObject->GetID(); - else - myStream << NotPublishedObjectName(); + if ( !aSObject->_is_nil() ) { + CORBA::String_var entry = aSObject->GetID(); + myStream << entry.in(); + } + else { + myStream << theNotPublishedObjectName; + } return *this; } @@ -249,9 +286,9 @@ namespace SMESH TPythonDump:: operator<<(CORBA::Object_ptr theArg) { - SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); - SALOMEDS::Study_var aStudy = aSMESHGen->GetCurrentStudy(); - SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); + SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); + SALOMEDS::Study_var aStudy = aSMESHGen->GetCurrentStudy(); + SALOMEDS::SObject_wrap aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); if(!aSObject->_is_nil()) { CORBA::String_var id = aSObject->GetID(); myStream << id; @@ -259,7 +296,7 @@ namespace SMESH if ( aSMESHGen->CanPublishInStudy( theArg )) // not published SMESH object myStream << "smeshObj_" << size_t(theArg); else - myStream << NotPublishedObjectName(); + myStream << theNotPublishedObjectName; } else myStream << "None"; @@ -270,8 +307,8 @@ namespace SMESH TPythonDump:: operator<<(SMESH::SMESH_Hypothesis_ptr theArg) { - SALOMEDS::Study_var aStudy = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy(); - SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); + SALOMEDS::Study_var aStudy = SMESH_Gen_i::GetSMESHGen()->GetCurrentStudy(); + SALOMEDS::SObject_wrap aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); if(aSObject->_is_nil() && !CORBA::is_nil(theArg)) myStream << "hyp_" << theArg->GetId(); else @@ -285,22 +322,26 @@ namespace SMESH { if ( CORBA::is_nil( theArg ) ) return *this << "None"; - SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); - SALOMEDS::Study_var aStudy = aSMESHGen->GetCurrentStudy(); - SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); + SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); + SALOMEDS::Study_var aStudy = aSMESHGen->GetCurrentStudy(); + SALOMEDS::SObject_wrap aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); if(!aSObject->_is_nil()) + { return *this << aSObject; + } if ( SMESH::Filter_i* filter = SMESH::DownCast( theArg )) + { return *this << filter; - SMESH::SMESH_Mesh_var mesh = theArg->GetMesh(); - if ( !theArg->_is_equivalent( mesh )) + } + if ( SMESH_MeshEditor_i::IsTemporaryIDSource( theArg )) { - SMESH::long_array_var anElementsId = theArg->GetIDs(); - SMESH::array_of_ElementType_var types = theArg->GetTypes(); + SMESH::SMESH_Mesh_var mesh = theArg->GetMesh(); + SMESH::long_array_var anElementsId = theArg->GetIDs(); + SMESH::array_of_ElementType_var types = theArg->GetTypes(); SMESH::ElementType type = types->length() ? types[0] : SMESH::ALL; return *this << mesh << ".GetIDSource(" << anElementsId << ", " << type << ")"; } - return *this; + return *this << theNotPublishedObjectName; } TPythonDump& @@ -462,6 +503,10 @@ namespace SMESH DumpArray( theList, *this ); return *this; } + const char* TPythonDump::NotPublishedObjectName() + { + return theNotPublishedObjectName; + } TCollection_AsciiString myLongStringStart( "TPythonDump::LongStringStart" ); TCollection_AsciiString myLongStringEnd ( "TPythonDump::LongStringEnd" ); @@ -590,7 +635,8 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, if (CORBA::is_nil(aStudy)) return new Engines::TMPFile(0); - SALOMEDS::SObject_var aSO = aStudy->FindComponent(ComponentDataType()); + CORBA::String_var compDataType = ComponentDataType(); + SALOMEDS::SObject_wrap aSO = aStudy->FindComponent( compDataType.in() ); if (CORBA::is_nil(aSO)) return new Engines::TMPFile(0); @@ -599,9 +645,9 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, Resource_DataMapOfAsciiStringAsciiString aMapNames; //TCollection_AsciiString s ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); - SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aSO); + SALOMEDS::ChildIterator_wrap Itr = aStudy->NewChildIterator(aSO); for (Itr->InitEx(true); Itr->More(); Itr->Next()) { - SALOMEDS::SObject_var aValue = Itr->Value(); + SALOMEDS::SObject_wrap aValue = Itr->Value(); CORBA::String_var anID = aValue->GetID(); CORBA::String_var aName = aValue->GetName(); TCollection_AsciiString aGUIName ( (char*) aName.in() ); @@ -613,13 +659,14 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, } // Get trace of restored study - //SALOMEDS::SObject_var aSO = SMESH_Gen_i::ObjectToSObject(theStudy, _this()); SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); - SALOMEDS::GenericAttribute_var anAttr = + SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute(aSO, "AttributePythonObject"); - char* oldValue = SALOMEDS::AttributePythonObject::_narrow(anAttr)->GetObject(); - TCollection_AsciiString aSavedTrace (oldValue); + SALOMEDS::AttributePythonObject_var pyAttr = + SALOMEDS::AttributePythonObject::_narrow(anAttr); + CORBA::String_var oldValue = pyAttr->GetObject(); + TCollection_AsciiString aSavedTrace (oldValue.in()); // Add trace of API methods calls and replace study entries by names TCollection_AsciiString aScript; @@ -633,7 +680,7 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, CORBA::Octet* anOctetBuf = (CORBA::Octet*)aBuffer; Engines::TMPFile_var aStreamFile = new Engines::TMPFile(aLen+1, aLen+1, anOctetBuf, 1); - bool hasNotPublishedObjects = aScript.Location( NotPublishedObjectName(), 1, aLen); + bool hasNotPublishedObjects = aScript.Location( SMESH::theNotPublishedObjectName, 1, aLen); isValidScript = isValidScript && !hasNotPublishedObjects; return aStreamFile._retn(); @@ -675,14 +722,16 @@ void SMESH_Gen_i::SavePython (SALOMEDS::Study_ptr theStudy) TCollection_AsciiString aScript = GetNewPythonLines(theStudy->StudyId()); // Check contents of PythonObject attribute - SALOMEDS::SObject_var aSO = theStudy->FindComponent(ComponentDataType()); - //SALOMEDS::SObject_var aSO = SMESH_Gen_i::ObjectToSObject(theStudy, _this()); + CORBA::String_var compDataType = ComponentDataType(); + SALOMEDS::SObject_wrap aSO = theStudy->FindComponent( compDataType.in() ); SALOMEDS::StudyBuilder_var aStudyBuilder = theStudy->NewBuilder(); - SALOMEDS::GenericAttribute_var anAttr = + SALOMEDS::GenericAttribute_wrap anAttr = aStudyBuilder->FindOrCreateAttribute(aSO, "AttributePythonObject"); - char* oldValue = SALOMEDS::AttributePythonObject::_narrow(anAttr)->GetObject(); - TCollection_AsciiString oldScript (oldValue); + SALOMEDS::AttributePythonObject_var pyAttr = + SALOMEDS::AttributePythonObject::_narrow(anAttr); + CORBA::String_var oldValue = pyAttr->GetObject(); + TCollection_AsciiString oldScript (oldValue.in()); if (oldScript.Length() > 0) { oldScript += "\n"; @@ -692,7 +741,7 @@ void SMESH_Gen_i::SavePython (SALOMEDS::Study_ptr theStudy) } // Store in PythonObject attribute - SALOMEDS::AttributePythonObject::_narrow(anAttr)->SetObject(oldScript.ToCString(), 1); + pyAttr->SetObject(oldScript.ToCString(), 1); // Clean trace of API methods calls CleanPythonTrace(theStudy->StudyId()); @@ -776,7 +825,9 @@ namespace { isValidName = false; } // shorten names like CartesianParameters3D_400_400_400_1000000_1 - if ( aName.Length() > 20 && nbUnderscore > 2 ) + const int nbAllowedUnderscore = 3; /* changed from 2 to 3 by an user request + posted to SALOME Forum */ + if ( aName.Length() > 20 && nbUnderscore > nbAllowedUnderscore ) { p = aName.Location( "_", 20, aName.Length()); if ( p > 1 ) @@ -792,14 +843,14 @@ namespace { */ //============================================================================= TCollection_AsciiString SMESH_Gen_i::DumpPython_impl - (SALOMEDS::Study_ptr theStudy, + (SALOMEDS::Study_ptr theStudy, Resource_DataMapOfAsciiStringAsciiString& theObjectNames, Resource_DataMapOfAsciiStringAsciiString& theNames, - bool isPublished, - bool isMultiFile, - bool isHistoricalDump, - bool& aValidScript, - const TCollection_AsciiString& theSavedTrace) + bool isPublished, + bool isMultiFile, + bool isHistoricalDump, + bool& aValidScript, + const TCollection_AsciiString& theSavedTrace) { int aStudyID = theStudy->StudyId(); @@ -865,9 +916,11 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl // Some objects are wrapped with python classes and // Resource_DataMapOfAsciiStringAsciiString holds methods returning wrapped objects Resource_DataMapOfAsciiStringAsciiString anEntry2AccessorMethod; + std::set< TCollection_AsciiString > aRemovedObjIDs; if ( !getenv("NO_2smeshpy_conversion")) aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod, - theObjectNames, theStudy, isHistoricalDump ); + theObjectNames, aRemovedObjIDs, + theStudy, isHistoricalDump ); // Replace characters used instead of quote marks to quote notebook variables { @@ -967,6 +1020,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl anUpdatedScript += "\n\taStudyBuilder = theStudy.NewBuilder()"; } for (int ir = 1; ir <= seqRemoved.Length(); ir++) { + if ( aRemovedObjIDs.count( seqRemoved.Value(ir) )) continue; anUpdatedScript += "\n\tSO = theStudy.FindObjectIOR(theStudy.ConvertObjectToIOR("; anUpdatedScript += seqRemoved.Value(ir); // for object wrapped by class of smesh.py @@ -987,13 +1041,14 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl for (Standard_Integer i = 1; i <= aLen; i += 2) { anEntry = aScript.SubString(aSeq->Value(i), aSeq->Value(i + 1)); - aName = geom->GetDumpName( anEntry.ToCString() ); + aName = geom->GetDumpName( anEntry.ToCString() ); if (aName.IsEmpty() && // Not a GEOM object theNames.IsBound(anEntry) && + !aRemovedObjIDs.count(anEntry) && // a command creating anEntry was erased !mapEntries.IsBound(anEntry) && // Not yet processed !mapRemoved.IsBound(anEntry)) // Was not removed { - aName = theObjectNames.Find(anEntry); + aName = theObjectNames.Find(anEntry); aGUIName = theNames.Find(anEntry); mapEntries.Bind(anEntry, aName); anUpdatedScript += helper + "\n\t" + aSMESHGen + ".SetName(" + aName; @@ -1014,7 +1069,8 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl if (isPublished) { //Output the script that sets up the visual parameters. - char* script = theStudy->GetDefaultScript(ComponentDataType(), "\t"); + CORBA::String_var compDataType = ComponentDataType(); + char* script = theStudy->GetDefaultScript( compDataType.in(), "\t"); if (script && strlen(script) > 0) { anUpdatedScript += "\n\n\t### Store presentation parameters of displayed objects\n"; anUpdatedScript += script;