X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_DumpPython.cxx;h=4fd4f135460b26c5e24cc21448044570e0e7fd6f;hp=c882aa2edb16090c25caf4d7120f267d70010345;hb=373c03904b8e3fc5490ff4e17716f0cdcb39c03c;hpb=4fcec244fd07ba6a1d2cc63e51b842e6453a46fb diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index c882aa2ed..4fd4f1354 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-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 @@ -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; @@ -51,8 +53,17 @@ namespace SMESH size_t TPythonDump::myCounter = 0; + TVar::TVar(CORBA::Double value):myVals(1) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(CORBA::Long value):myVals(1) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(CORBA::Short value):myVals(1) { myVals[0] = SMESH_Comment(value); } + TVar::TVar(const SMESH::double_array& value):myVals(value.length()) + { + for ( size_t i = 0; i < value.length(); i++) + myVals[i] = SMESH_Comment(value[i]); + } + TPythonDump:: - TPythonDump() + TPythonDump():myVarsCounter(0) { ++myCounter; } @@ -63,12 +74,44 @@ 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(); + 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 + } + } + } + + TPythonDump& //!< to store a variable value + TPythonDump:: + operator<<(const TVar& theVarValue) + { + const std::vector< std::string >& varNames = SMESH_Gen_i::GetSMESHGen()->GetLastParameters(); + 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(); + else + myStream << theVarValue.myVals[i-1]; + if ( i < theVarValue.myVals.size() ) + myStream << ", "; + ++myVarsCounter; } + myStream << " ]"; + } + else + { + if ( myVarsCounter < varNames.size() && !varNames[ myVarsCounter ].empty() ) + myStream << TVar::Quote() << varNames[ myVarsCounter ] << TVar::Quote(); + else + myStream << theVarValue.myVals[0]; + ++myVarsCounter; } + return *this; } TPythonDump& @@ -120,12 +163,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; + 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; } @@ -146,7 +191,43 @@ 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; } @@ -176,14 +257,30 @@ namespace SMESH return *this; } + TPythonDump& + TPythonDump::operator<<(const SMESH::string_array& theArray) + { + myStream << "[ "; + for (int i = 1; i <= theArray.length(); i++) { + myStream << "'" << theArray[i-1] << "'"; + if ( i < theArray.length() ) + myStream << ", "; + } + myStream << " ]"; + return *this; + } + TPythonDump& TPythonDump:: operator<<(SALOMEDS::SObject_ptr aSObject) { - if ( !aSObject->_is_nil() ) - myStream << aSObject->GetID(); - else + if ( !aSObject->_is_nil() ) { + CORBA::String_var entry = aSObject->GetID(); + myStream << entry.in(); + } + else { myStream << NotPublishedObjectName(); + } return *this; } @@ -191,9 +288,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; @@ -212,8 +309,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 @@ -227,16 +324,22 @@ 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; - SMESH::SMESH_Mesh_var mesh = theArg->GetMesh(); - if ( !theArg->_is_equivalent( mesh )) + } + if ( SMESH::Filter_i* filter = SMESH::DownCast( theArg )) { - SMESH::long_array_var anElementsId = theArg->GetIDs(); - SMESH::array_of_ElementType_var types = theArg->GetTypes(); + return *this << filter; + } + if ( SMESH_MeshEditor_i::IsTemporaryIDSource( theArg )) + { + 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 << ")"; } @@ -358,23 +461,32 @@ namespace SMESH TPythonDump& TPythonDump::operator<<(const SMESH::AxisStruct & theAxis) { - myStream << "SMESH.AxisStruct( " - << theAxis.x << ", " - << theAxis.y << ", " - << theAxis.z << ", " - << theAxis.vx << ", " - << theAxis.vy << ", " - << theAxis.vz << " )"; + *this << "SMESH.AxisStruct( " + << TVar( theAxis.x ) << ", " + << TVar( theAxis.y ) << ", " + << TVar( theAxis.z ) << ", " + << TVar( theAxis.vx ) << ", " + << TVar( theAxis.vy ) << ", " + << TVar( theAxis.vz ) << " )"; return *this; } TPythonDump& TPythonDump::operator<<(const SMESH::DirStruct & theDir) { const SMESH::PointStruct & P = theDir.PS; - myStream << "SMESH.DirStruct( SMESH.PointStruct ( " - << P.x << ", " - << P.y << ", " - << P.z << " ))"; + *this << "SMESH.DirStruct( SMESH.PointStruct ( " + << TVar( P.x ) << ", " + << TVar( P.y ) << ", " + << TVar( P.z ) << " ))"; + return *this; + } + + TPythonDump& TPythonDump::operator<<(const SMESH::PointStruct & P) + { + *this << "SMESH.PointStruct ( " + << TVar( P.x ) << ", " + << TVar( P.y ) << ", " + << TVar( P.z ) << " )"; return *this; } @@ -521,7 +633,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); @@ -530,9 +643,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() ); @@ -544,18 +657,20 @@ 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::SObject_wrap 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; - aScript += DumpPython_impl(aStudy, aMap, aMapNames, - isPublished, isMultiFile, isValidScript, aSavedTrace); + aScript += DumpPython_impl(aStudy, aMap, aMapNames, isPublished, isMultiFile, + myIsHistoricalPythonDump, isValidScript, aSavedTrace); int aLen = aScript.Length(); unsigned char* aBuffer = new unsigned char[aLen+1]; @@ -606,14 +721,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"; @@ -623,7 +740,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()); @@ -691,20 +808,30 @@ namespace { const TCollection_AsciiString allowedChars = "qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"; bool isValidName = true; - int p=1; // replace not allowed chars with underscore + int nbUnderscore = 0; + int p=1; // replace not allowed chars by underscore while (p <= aName.Length() && (p = aName.FirstLocationNotInSet(allowedChars, p, aName.Length()))) { if ( p == 1 || p == aName.Length() || aName.Value(p-1) == '_') - aName.Remove( p, 1 ); // remove double _ and from the start and the end + aName.Remove( p, 1 ); // remove double _ from the start and the end else - aName.SetValue(p, '_'); + aName.SetValue(p, '_'), nbUnderscore++; isValidName = false; } if ( aName.IsIntegerValue() ) { // aName must not start with a digit aName.Insert( 1, 'a' ); isValidName = false; } + // shorten names like CartesianParameters3D_400_400_400_1000000_1 + 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 ) + aName.Trunc( p-1 ); + } return isValidName; } } @@ -715,13 +842,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& aValidScript, - const TCollection_AsciiString& theSavedTrace) + bool isPublished, + bool isMultiFile, + bool isHistoricalDump, + bool& aValidScript, + const TCollection_AsciiString& theSavedTrace) { int aStudyID = theStudy->StudyId(); @@ -737,9 +865,9 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; aScript += helper + "aMeasurements = " + aSMESHGen + ".CreateMeasurements()\n\t"; if ( isPublished ) - aScript += aSMESHGen + ".SetCurrentStudy(theStudy)"; + aScript += aSMESHGen + " = smeshBuilder.New(theStudy)"; else - aScript += aSMESHGen + ".SetCurrentStudy(None)"; + aScript += aSMESHGen + " = smeshBuilder.New(None)"; // import python files corresponding to plugins set moduleNameSet; @@ -748,7 +876,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl string moduleName = hyp_creator->second->GetModuleName(); bool newModule = moduleNameSet.insert( moduleName ).second; if ( newModule ) - aScript += helper + "\n\t" + "import " + (char*) moduleName.c_str(); + aScript += helper + "\n\t" + "from salome." + (char*) moduleName.c_str() + " import " + (char*) moduleName.c_str() +"Builder"; } // Dump trace of restored study @@ -787,13 +915,22 @@ 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; - aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod, theObjectNames ); + if ( !getenv("NO_2smeshpy_conversion")) + aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod, + theObjectNames, theStudy, isHistoricalDump ); + + // Replace characters used instead of quote marks to quote notebook variables + { + int pos = 1; + while (( pos = aScript.Location( 1, SMESH::TVar::Quote(), pos, aScript.Length() ))) + aScript.SetValue( pos, '"' ); + } // Find entries to be replaced by names Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(aScript); Standard_Integer aLen = aSeq->Length(); - if (aLen == 0) + if (aLen == 0 && isMultiFile) return aScript; // Replace entries by the names @@ -803,7 +940,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl Standard_Integer objectCounter = 0, aStart = 1, aScriptLength = aScript.Length(); TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("smeshObj_"); - // Collect names of GEOM objects to exclude same names for SMESH objects + // Collect names of GEOM objects to exclude same names of SMESH objects GEOM::string_array_var aGeomNames = geom->GetAllDumpNames(); int ign = 0, nbgn = aGeomNames->length(); for (; ign < nbgn; ign++) { @@ -860,7 +997,8 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl TCollection_AsciiString initPart = "import "; if ( isMultiFile ) initPart += helper + "salome, "; - initPart += aSmeshpy + ", SMESH, SALOMEDS\n"; + initPart += " SMESH, SALOMEDS\n"; + initPart += "from salome.smesh import smeshBuilder\n"; if ( importGeom && isMultiFile ) { initPart += ("\n## import GEOM dump file ## \n" @@ -871,7 +1009,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl anUpdatedScript.Insert ( 1, initPart ); // add final part of aScript - if (aSeq->Value(aLen) < aScriptLength) + if (aLen && aSeq->Value(aLen) < aScriptLength) anUpdatedScript += aScript.SubString(aSeq->Value(aLen) + 1, aScriptLength); // Remove removed objects @@ -927,7 +1065,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;