X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_DumpPython.cxx;h=07ab0f69585566d5d63083966d1949ce8c6d6cb3;hb=686a8645643ba74ea3be5646b8fc7b35a70c297d;hp=016e21639b0b474eefd3d45b582e6e6127c56b0b;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git diff --git a/src/SMESH_I/SMESH_DumpPython.cxx b/src/SMESH_I/SMESH_DumpPython.cxx index 016e21639..07ab0f695 100644 --- a/src/SMESH_I/SMESH_DumpPython.cxx +++ b/src/SMESH_I/SMESH_DumpPython.cxx @@ -1,15 +1,39 @@ +// Copyright (C) 2007-2008 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 +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// // File : SMESH_Gen_i_DumpPython.cxx // Created : Thu Mar 24 17:17:59 2005 // Author : Julia DOROVSKIKH // Module : SMESH // $Header : $ - +// #include "SMESH_PythonDump.hxx" #include "SMESH_Gen_i.hxx" #include "SMESH_Filter_i.hxx" +#include "SMESH_MeshEditor_i.hxx" +#include "SMESH_2smeshpy.hxx" #include #include +#include #ifdef _DEBUG_ @@ -38,10 +62,10 @@ namespace SMESH { if(--myCounter == 0){ 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()){ - std::string aString = myStream.str(); - TCollection_AsciiString aCollection(Standard_CString(aString.c_str())); + if(!aStudy->_is_nil() && !aCollection.IsEmpty()){ aSMESHGen->AddToPythonScript(aStudy->StudyId(),aCollection); if(MYDEBUG) MESSAGE(aString); } @@ -86,7 +110,8 @@ namespace SMESH TPythonDump& TPythonDump:: operator<<(const char* theArg){ - myStream< + void DumpArray(const TArray& theArray, std::ostringstream & theStream) { - myStream<<"[ "; - CORBA::Long i = 1, iEnd = theArg.length(); - for(; i <= iEnd; i++) { - myStream<_is_nil() ) + myStream << aSObject->GetID(); + else + myStream << NotPublishedObjectName(); + return *this; + } TPythonDump& TPythonDump:: operator<<(CORBA::Object_ptr theArg) { - TCollection_AsciiString aString("None"); SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,theArg); - if(!aSObject->_is_nil()){ - aString = aSObject->GetID(); - }else if(!CORBA::is_nil(theArg)){ - aString = "smeshObj_"; + if(!aSObject->_is_nil()) { + myStream << aSObject->GetID(); + } else if ( !CORBA::is_nil(theArg)) { if ( aSMESHGen->CanPublishInStudy( theArg )) // not published SMESH object - aString += (int) theArg; + myStream << "smeshObj_" << size_t(theArg); else - aString = NotPublishedObjectName(); + myStream << NotPublishedObjectName(); } - myStream<GetFunctorType(); - switch(aFunctorType){ - case FT_AspectRatio: - myStream<<"anAspectRatio"; - break; - case FT_AspectRatio3D: - myStream<<"anAspectRatio3D"; - break; - case FT_Warping: - myStream<<"aWarping"; - break; - case FT_MinimumAngle: - myStream<<"aMinimumAngle"; - break; - case FT_Taper: - myStream<<"aTaper"; - break; - case FT_Skew: - myStream<<"aSkew"; - break; - case FT_Area: - myStream<<"aArea"; - break; - case FT_FreeBorders: - myStream<<"aFreeBorders"; - break; - case FT_FreeEdges: - myStream<<"aFreeEdges"; - break; - case FT_MultiConnection: - myStream<<"aMultiConnection"; - break; - case FT_MultiConnection2D: - myStream<<"aMultiConnection2D"; - break; - case FT_Length: - myStream<<"aLength"; - break; - case FT_Length2D: - myStream<<"aLength"; - break; - case FT_BelongToGeom: - myStream<<"aBelongToGeom"; - break; - case FT_BelongToPlane: - myStream<<"aBelongToPlane"; - break; - case FT_BelongToCylinder: - myStream<<"aBelongToCylinder"; - break; - case FT_LyingOnGeom: - myStream<<"aLyingOnGeom"; - break; - case FT_RangeOfIds: - myStream<<"aRangeOfIds"; - break; - case FT_BadOrientedVolume: - myStream<<"aBadOrientedVolume"; - break; - case FT_LessThan: - myStream<<"aLessThan"; - break; - case FT_MoreThan: - myStream<<"aMoreThan"; - break; - case FT_EqualTo: - myStream<<"anEqualTo"; - break; - case FT_LogicalNOT: - myStream<<"aLogicalNOT"; - break; - case FT_LogicalAND: - myStream<<"aLogicalAND"; - break; - case FT_LogicalOR: - myStream<<"aLogicalOR"; - break; - case FT_Undefined: - myStream<<"anUndefined"; - break; + if ( theArg ) { + FunctorType aFunctorType = theArg->GetFunctorType(); + switch(aFunctorType){ + case FT_AspectRatio: myStream<< "anAspectRatio"; break; + case FT_AspectRatio3D: myStream<< "anAspectRatio3D"; break; + case FT_Warping: myStream<< "aWarping"; break; + case FT_MinimumAngle: myStream<< "aMinimumAngle"; break; + case FT_Taper: myStream<< "aTaper"; break; + case FT_Skew: myStream<< "aSkew"; break; + case FT_Area: myStream<< "aArea"; break; + case FT_Volume3D: myStream<< "aVolume3D"; break; + case FT_FreeBorders: myStream<< "aFreeBorders"; break; + case FT_FreeEdges: myStream<< "aFreeEdges"; break; + case FT_FreeNodes: myStream<< "aFreeNodes"; break; + case FT_FreeFaces: myStream<< "aFreeFaces"; break; + case FT_MultiConnection: myStream<< "aMultiConnection"; break; + case FT_MultiConnection2D:myStream<< "aMultiConnection2D";break; + case FT_Length: myStream<< "aLength"; break; + case FT_Length2D: myStream<< "aLength"; break; + case FT_BelongToGeom: myStream<< "aBelongToGeom"; break; + case FT_BelongToPlane: myStream<< "aBelongToPlane"; break; + case FT_BelongToCylinder: myStream<< "aBelongToCylinder"; break; + case FT_BelongToGenSurface:myStream<<"aBelongToGenSurface";break; + case FT_LyingOnGeom: myStream<< "aLyingOnGeom"; break; + case FT_RangeOfIds: myStream<< "aRangeOfIds"; break; + case FT_BadOrientedVolume:myStream<< "aBadOrientedVolume";break; + case FT_LinearOrQuadratic:myStream<< "aLinearOrQuadratic";break; + case FT_GroupColor: myStream<< "aGroupColor"; break; + case FT_ElemGeomType: myStream<< "anElemGeomType"; break; + case FT_LessThan: myStream<< "aLessThan"; break; + case FT_MoreThan: myStream<< "aMoreThan"; break; + case FT_EqualTo: myStream<< "anEqualTo"; break; + case FT_LogicalNOT: myStream<< "aLogicalNOT"; break; + case FT_LogicalAND: myStream<< "aLogicalAND"; break; + case FT_LogicalOR: myStream<< "aLogicalOR"; break; + case FT_Undefined: + default: myStream<< "anUndefined"; break; + } + myStream<GetMeshId() : -1 ); return *this; + } + + TPythonDump& TPythonDump::operator<<(const TCollection_AsciiString & theStr) + { + myStream << theStr; return *this; + } + + + TPythonDump& TPythonDump::operator<<(SMESH::MED_VERSION theVersion) + { + switch (theVersion) { + case SMESH::MED_V2_1: myStream << "SMESH.MED_V2_1"; break; + case SMESH::MED_V2_2: myStream << "SMESH.MED_V2_2"; break; + default: myStream << theVersion; + } + return *this; + } + + TPythonDump& TPythonDump::operator<<(const SMESH::AxisStruct & theAxis) + { + myStream << "SMESH.AxisStruct( " + << theAxis.x << ", " + << theAxis.y << ", " + << theAxis.z << ", " + << theAxis.vx << ", " + << theAxis.vy << ", " + << 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 << " ))"; + return *this; + } + + TPythonDump& TPythonDump::operator<<(const SMESH::ListOfGroups * theList){ + if(theList && theList->length() > 0 ) { + SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); + SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); + myStream << "["; + int aListLen = theList->length(); + for(int i = 0 ; i < aListLen; i++){ + SALOMEDS::SObject_var aSObject = SMESH_Gen_i::ObjectToSObject(aStudy,(*theList)[i]); + if(!aSObject->_is_nil()) { + myStream << aSObject->GetID(); + i < (aListLen - 1) ? myStream<<", " : myStream<<"]"; + } + + } + } + return *this; + } + + TCollection_AsciiString myLongStringStart( "TPythonDump::LongStringStart" ); + TCollection_AsciiString myLongStringEnd ( "TPythonDump::LongStringEnd" ); + + //================================================================================ + /*! + * \brief Return marker of long string literal beginning + * \param type - a name of functionality producing the string literal + * \retval TCollection_AsciiString - the marker string to be written into + * a raw python script + */ + //================================================================================ + + TCollection_AsciiString TPythonDump::LongStringStart(const char* type) + { + return + myLongStringStart + + (Standard_Integer) strlen(type) + + " " + + (char*) type; + } + + //================================================================================ + /*! + * \brief Return marker of long string literal end + * \retval TCollection_AsciiString - the marker string to be written into + * a raw python script + */ + //================================================================================ + + TCollection_AsciiString TPythonDump::LongStringEnd() + { + return myLongStringEnd; + } + + //================================================================================ + /*! + * \brief Cut out a long string literal from a string + * \param theText - text possibly containing string literals + * \param theFrom - position in the text to search from + * \param theLongString - the retrieved literal + * \param theStringType - a name of functionality produced the literal + * \retval bool - true if a string literal found + * + * The literal is removed from theText; theFrom points position right after + * the removed literal + */ + //================================================================================ + + bool TPythonDump::CutoutLongString( TCollection_AsciiString & theText, + int & theFrom, + TCollection_AsciiString & theLongString, + TCollection_AsciiString & theStringType) + { + if ( theFrom < 1 || theFrom > theText.Length() ) + return false; + + // ...script \ beg marker \ \ type \ literal \ end marker \ script... + // "theText myLongStringStart7 Pattern!!! SALOME Mesh Pattern file myLongStringEndtextEnd" + // 012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + // 0 1 2 3 4 5 6 7 8 + + theFrom = theText.Location( myLongStringStart, theFrom, theText.Length() ); // = 09 + if ( !theFrom ) + return false; + + // find where literal begins + int literalBeg = theFrom + myLongStringStart.Length(); // = 26 + char* typeLenStr = (char*) theText.ToCString() + literalBeg - 1; // = "7 Pattern!!! SALO...." + int typeLen = atoi ( typeLenStr ); // = 7 + while ( *typeLenStr != ' ' ) { // look for ' ' after typeLen + literalBeg++; // 26 -> 27 + typeLenStr++; + } + literalBeg += typeLen + 1; // = 35 + if ( literalBeg > theText.Length() ) + return false; + + // where literal ends (i.e. end marker begins) + int literalEnd = theText.Location( myLongStringEnd, literalBeg, theText.Length() ); // = 64 + if ( !literalEnd ) + literalEnd = theText.Length(); + + // literal + theLongString = theText.SubString( literalBeg, literalEnd - 1); // "!!! SALOME Mesh Pattern file " + // type + theStringType = theText.SubString( literalBeg - typeLen, literalBeg - 1 ); // "Pattern" + // cut off literal + literalEnd += myLongStringEnd.Length(); // = 79 + TCollection_AsciiString textEnd = theText.SubString( literalEnd, theText.Length() ); // "textE..." + theText = theText.SubString( 1, theFrom - 1 ) + textEnd; + + return true; + } } //======================================================================= @@ -286,7 +458,7 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, // Map study entries to object names Resource_DataMapOfAsciiStringAsciiString aMap; Resource_DataMapOfAsciiStringAsciiString aMapNames; - TCollection_AsciiString s ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); + //TCollection_AsciiString s ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aSO); for (Itr->InitEx(true); Itr->More(); Itr->Next()) { @@ -311,12 +483,9 @@ Engines::TMPFile* SMESH_Gen_i::DumpPython (CORBA::Object_ptr theStudy, TCollection_AsciiString aSavedTrace (oldValue); // Add trace of API methods calls and replace study entries by names - //TCollection_AsciiString aScript = - // SALOMEDSImpl_Study::GetDumpStudyComment("SMESH") + "\n\n" + - // DumpPython_impl(aStudy->StudyId(), aMap, aMapNames, isPublished, isValidScript, aSavedTrace); TCollection_AsciiString aScript = "### This file is generated by SALOME automatically by dump python functionality of SMESH component\n\n"; - aScript += DumpPython_impl(aStudy->StudyId(), aMap, aMapNames, + aScript += DumpPython_impl(aStudy, aMap, aMapNames, isPublished, isValidScript, aSavedTrace); int aLen = aScript.Length(); @@ -358,45 +527,6 @@ void SMESH_Gen_i::RemoveLastFromPythonScript (int theStudyID) } } -//======================================================================= -//function : AddToCurrentPyScript -//purpose : -//======================================================================= - -void SMESH_Gen_i::AddToCurrentPyScript (const TCollection_AsciiString& theString) -{ - SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); - SALOMEDS::Study_ptr aStudy = aSMESHGen->GetCurrentStudy(); - if (aStudy->_is_nil()) return; - aSMESHGen->AddToPythonScript(aStudy->StudyId(), theString); -} - - -//======================================================================= -//function : AddObject -//purpose : add object to script string -//======================================================================= - -TCollection_AsciiString& SMESH_Gen_i::AddObject(TCollection_AsciiString& theStr, - CORBA::Object_ptr theObject) -{ - TCollection_AsciiString aString("None"); - SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen(); - SALOMEDS::SObject_var aSObject = - aSMESHGen->ObjectToSObject(aSMESHGen->GetCurrentStudy(), theObject); - if ( !aSObject->_is_nil() ) { - aString = aSObject->GetID(); - } else if ( !CORBA::is_nil( theObject )) { - aString = "smeshObj_"; - if ( aSMESHGen->CanPublishInStudy( theObject )) // not published SMESH object - aString += (int) theObject; - else - aString = NotPublishedObjectName(); - } - theStr += aString; - return theStr; -} - //======================================================================= //function : SavePython //purpose : @@ -445,25 +575,26 @@ Handle(TColStd_HSequenceOfInteger) FindEntries (TCollection_AsciiString& theStri Standard_Integer aLen = theString.Length(); Standard_Boolean isFound = Standard_False; - char* arr = theString.ToCString(); + char* arr = (char*) theString.ToCString(); Standard_Integer i = 0, j; while(i < aLen) { int c = (int)arr[i]; j = i+1; - if(c >= 48 && c <= 57) { //Is digit? + if ( isdigit( c )) { //Is digit? isFound = Standard_False; - while((j < aLen) && ((c >= 48 && c <= 57) || c == 58) ) { //Check if it is an entry + while((j < aLen) && ( isdigit(c) || c == ':' )) { //Check if it is an entry c = (int)arr[j++]; - if(c == 58) isFound = Standard_True; + if(c == ':') isFound = Standard_True; } if (isFound) { int prev = (i < 1) ? 0 : (int)arr[i - 1]; - // last char should be a diggit, + // to distinguish from a sketcher command: + // last char should be a digit, not ":", // previous char should not be '"'. - if (arr[j-2] != 58 && prev != 34) { + if (arr[j-2] != ':' && prev != '"') { aSeq->Append(i+1); // +1 because AsciiString starts from 1 aSeq->Append(j-1); } @@ -476,41 +607,115 @@ Handle(TColStd_HSequenceOfInteger) FindEntries (TCollection_AsciiString& theStri return aSeq; } +namespace { + + //================================================================================ + /*! + * \brief Make a string be a valid python name + * \param aName - a string to fix + * \retval bool - true if aName was not modified + */ + //================================================================================ + + bool fixPythonName(TCollection_AsciiString & aName ) + { + const TCollection_AsciiString allowedChars = + "qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"; + bool isValidName = true; + int p=1; // replace not allowed chars with 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 + else + aName.SetValue(p, '_'); + isValidName = false; + } + if ( aName.IsIntegerValue() ) { // aName must not start with a digit + aName.Insert( 1, 'a' ); + isValidName = false; + } + return isValidName; + } +} + //============================================================================= /*! * DumpPython */ //============================================================================= TCollection_AsciiString SMESH_Gen_i::DumpPython_impl - (int theStudyID, + (SALOMEDS::Study_ptr theStudy, Resource_DataMapOfAsciiStringAsciiString& theObjectNames, Resource_DataMapOfAsciiStringAsciiString& theNames, bool isPublished, bool& aValidScript, const TCollection_AsciiString& theSavedTrace) { + int aStudyID = theStudy->StudyId(); + + TCollection_AsciiString helper; // to comfortably concatenate C strings + TCollection_AsciiString aSmeshpy( SMESH_2smeshpy::SmeshpyName() ); + TCollection_AsciiString aSMESHGen( SMESH_2smeshpy::GenName() ); + TCollection_AsciiString anOldGen( SMESH::TPythonDump::SMESHGenName() ); + TCollection_AsciiString aScript; - aScript = "def RebuildData(theStudy):"; - aScript += "\n\tsmesh = salome.lcc.FindOrLoadComponent(\"FactoryServer\", \"SMESH\")"; - aScript += "\n\taFilterManager = smesh.CreateFilterManager()"; + aScript = "def RebuildData(theStudy):\n\t"; + aScript += helper + "aFilterManager = " + aSMESHGen + ".CreateFilterManager()\n\t"; if ( isPublished ) - aScript += "\n\tsmesh.SetCurrentStudy(theStudy)"; + aScript += aSMESHGen + ".SetCurrentStudy(theStudy)"; else - aScript += "\n\tsmesh.SetCurrentStudy(None)"; + aScript += aSMESHGen + ".SetCurrentStudy(None)"; + + // import python files corresponding to plugins + set moduleNameSet; + map::iterator hyp_creator = myHypCreatorMap.begin(); + for ( ; hyp_creator != myHypCreatorMap.end(); ++hyp_creator ) { + string moduleName = hyp_creator->second->GetModuleName(); + bool newModule = moduleNameSet.insert( moduleName ).second; + if ( newModule ) + aScript += helper + "\n\t" + "import " + (char*) moduleName.c_str(); + } // Dump trace of restored study if (theSavedTrace.Length() > 0) { - aScript += "\n"; - aScript += theSavedTrace; + // For the convertion of IDL API calls -> smesh.py API, "smesh" standing for SMESH_Gen + // was replaces with "smeshgen" (==TPythonDump::SMESHGenName()). + // Change "smesh" -> "smeshgen" in the trace saved before passage to smesh.py API + bool isNewVersion = + theSavedTrace.Location( anOldGen + ".", 1, theSavedTrace.Length() ); + if ( !isNewVersion ) { + TCollection_AsciiString aSavedTrace( theSavedTrace ); + TCollection_AsciiString aSmeshCall ( "smesh." ), gen( "gen" ); + int beg, end = aSavedTrace.Length(), from = 1; + while ( from < end && ( beg = aSavedTrace.Location( aSmeshCall, from, end ))) { + char charBefore = ( beg == 1 ) ? ' ' : aSavedTrace.Value( beg - 1 ); + if ( isspace( charBefore ) || charBefore == '=' ) { // "smesh." is not a part of a long word + aSavedTrace.Insert( beg + aSmeshCall.Length() - 1, gen );// "smesh" -> "smeshgen" + end += gen.Length(); + } + from = beg + aSmeshCall.Length(); + } + aScript += helper + "\n" + aSavedTrace; + } + else + // append a saved trace to the script + aScript += helper + "\n" + theSavedTrace; } // Dump trace of API methods calls - TCollection_AsciiString aNewLines = GetNewPythonLines(theStudyID); + TCollection_AsciiString aNewLines = GetNewPythonLines(aStudyID); if (aNewLines.Length() > 0) { - aScript += "\n"; - aScript += aNewLines; + aScript += helper + "\n" + aNewLines; } + // Convert IDL API calls into smesh.py API. + // 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 ); + // Find entries to be replaced by names Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(aScript); Standard_Integer aLen = aSeq->Length(); @@ -523,8 +728,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl TColStd_SequenceOfAsciiString seqRemoved; Resource_DataMapOfAsciiStringAsciiString mapRemoved; Standard_Integer objectCounter = 0, aStart = 1, aScriptLength = aScript.Length(); - TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("smeshObj_"), - allowedChars ("qwertyuioplkjhgfdsazxcvbnmQWERTYUIOPLKJHGFDSAZXCVBNM0987654321_"); + TCollection_AsciiString anUpdatedScript, anEntry, aName, aBaseName("smeshObj_"); // Collect names of GEOM objects to exclude same names for SMESH objects GEOM::string_array_var aGeomNames = geom->GetAllDumpNames(); @@ -546,17 +750,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl // The Object is in Study aName = theObjectNames.Find(anEntry); // check validity of aName - bool isValidName = true; - if ( aName.IsIntegerValue() ) { // aName must not start with a digit - aName.Insert( 1, 'a' ); - isValidName = false; - } - int p, p2=1; // replace not allowed chars - while ((p = aName.FirstLocationNotInSet(allowedChars, p2, aName.Length()))) { - aName.SetValue(p, '_'); - p2=p; - isValidName = false; - } + bool isValidName = fixPythonName( aName ); if (theObjectNames.IsBound(aName) && anEntry != theObjectNames(aName)) { // diff objects have same name - make a new name by appending a digit TCollection_AsciiString aName2; @@ -573,7 +767,7 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl } else { // Removed Object do { - aName = aBaseName + TCollection_AsciiString(++objectCounter); + aName = aBaseName + (++objectCounter); } while (theObjectNames.IsBound(aName)); seqRemoved.Append(aName); mapRemoved.Bind(anEntry, "1"); @@ -590,10 +784,12 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl } // set initial part of aSript - TCollection_AsciiString initPart = "import salome, SMESH, StdMeshers\n\n"; + TCollection_AsciiString initPart = "import salome, SMESH\n"; + initPart += helper + "import " + aSmeshpy + "\n\n"; if ( importGeom ) { - initPart += ("import string, os, sys, re\n" + initPart += ("## import GEOM dump file ## \n" + "import string, os, sys, re\n" "sys.path.insert( 0, os.path.dirname(__file__) )\n" "exec(\"from \"+re.sub(\"SMESH$\",\"GEOM\",__name__)+\" import *\")\n\n"); } @@ -603,42 +799,140 @@ TCollection_AsciiString SMESH_Gen_i::DumpPython_impl if (aSeq->Value(aLen) < aScriptLength) anUpdatedScript += aScript.SubString(aSeq->Value(aLen) + 1, aScriptLength); + // Set colors + SALOMEDS::SObject_var aComp = theStudy->FindComponent(ComponentDataType()); + if( !CORBA::is_nil(aComp) ) + { + SALOMEDS::ChildIterator_var Itr = theStudy->NewChildIterator(aComp); + for( Itr->InitEx(true); Itr->More(); Itr->Next() ) + { + SALOMEDS::SObject_var aSObj = Itr->Value(); + SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SObjectToObject( aSObj ) ); + // mesh auto color + if( !CORBA::is_nil(aMesh) && aMesh->GetAutoColor() ) + { + CORBA::String_var anEntry = aSObj->GetID(); + anUpdatedScript += + SMESH_Comment("\n\t") << theObjectNames(anEntry.inout()) << ".SetAutoColor(1)"; + } + SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SObjectToObject(aSObj)); + if( !CORBA::is_nil(aGroup) ) + { + SALOMEDS::Color aColor = aGroup->GetColor(); + if ( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 ) + { + CORBA::String_var anEntry = aSObj->GetID(); + anUpdatedScript += SMESH_Comment("\n\t") + << theObjectNames(anEntry.inout()) << ".SetColor(SALOMEDS.Color(" + << aColor.R <<", "<< aColor.G <<", "<< aColor.B <<" ))"; + } + } + } + } + // Remove removed objects - anUpdatedScript += "\n\taStudyBuilder = theStudy.NewBuilder()"; + if ( seqRemoved.Length() > 0 ) { + anUpdatedScript += "\n\t## some objects were removed"; + anUpdatedScript += "\n\taStudyBuilder = theStudy.NewBuilder()"; + } for (int ir = 1; ir <= seqRemoved.Length(); ir++) { anUpdatedScript += "\n\tSO = theStudy.FindObjectIOR(theStudy.ConvertObjectToIOR("; anUpdatedScript += seqRemoved.Value(ir); + // for object wrapped by class of smesh.py + anEntry = theObjectNames( seqRemoved.Value(ir) ); + if ( anEntry2AccessorMethod.IsBound( anEntry ) ) + anUpdatedScript += helper + "." + anEntry2AccessorMethod( anEntry ); anUpdatedScript += "))\n\tif SO is not None: aStudyBuilder.RemoveObjectWithChildren(SO)"; } // Set object names - anUpdatedScript += "\n\n\tisGUIMode = "; - anUpdatedScript += isPublished; - anUpdatedScript += "\n\tif isGUIMode:"; - anUpdatedScript += "\n\t\tsmeshgui = salome.ImportComponentGUI(\"SMESH\")"; - anUpdatedScript += "\n\t\tsmeshgui.Init(theStudy._get_StudyId())"; - anUpdatedScript += "\n"; + anUpdatedScript += "\n\t## set object names"; +// anUpdatedScript += "\n\t\tsmeshgui = salome.ImportComponentGUI(\"SMESH\")"; +// anUpdatedScript += "\n\t\tsmeshgui.Init(theStudy._get_StudyId())"; +// anUpdatedScript += "\n"; TCollection_AsciiString aGUIName; Resource_DataMapOfAsciiStringAsciiString mapEntries; - for (Standard_Integer i = 1; i <= aLen; i += 2) { + for (Standard_Integer i = 1; i <= aLen; i += 2) + { anEntry = aScript.SubString(aSeq->Value(i), aSeq->Value(i + 1)); aName = geom->GetDumpName( anEntry.ToCString() ); if (aName.IsEmpty() && // Not a GEOM object theNames.IsBound(anEntry) && !mapEntries.IsBound(anEntry) && // Not yet processed - !mapRemoved.IsBound(anEntry)) { // Was not removed + !mapRemoved.IsBound(anEntry)) // Was not removed + { aName = theObjectNames.Find(anEntry); aGUIName = theNames.Find(anEntry); mapEntries.Bind(anEntry, aName); - anUpdatedScript += "\n\t\tsmeshgui.SetName(salome.ObjectToID("; - anUpdatedScript += aName + "), \"" + aGUIName + "\")"; + anUpdatedScript += helper + "\n\t" + aSMESHGen + ".SetName(" + aName; + if ( anEntry2AccessorMethod.IsBound( anEntry ) ) + anUpdatedScript += helper + "." + anEntry2AccessorMethod( anEntry ); + anUpdatedScript += helper + ", '" + aGUIName + "')"; } } - anUpdatedScript += "\n\n\t\tsalome.sg.updateObjBrowser(0)"; + anUpdatedScript += "\n\tif salome.sg.hasDesktop():"; + anUpdatedScript += "\n\t\tsalome.sg.updateObjBrowser(0)"; + + // ----------------------------------------------------------------- + // store visual properties of displayed objects + // ----------------------------------------------------------------- + if (isPublished) + { + //Output the script that sets up the visual parameters. + char* script = theStudy->GetDefaultScript(ComponentDataType(), "\t"); + if (script && strlen(script) > 0) { + anUpdatedScript += "\n\n\t### Store presentation parameters of displayed objects\n"; + anUpdatedScript += script; + CORBA::string_free(script); + } + } anUpdatedScript += "\n\n\tpass\n"; + // ----------------------------------------------------------------- + // put string literals describing patterns into separate functions + // ----------------------------------------------------------------- + + TCollection_AsciiString aLongString, aFunctionType; + int where = 1; + set< string > functionNameSet; + while ( SMESH::TPythonDump::CutoutLongString( anUpdatedScript, where, aLongString, aFunctionType )) + { + // make a python string literal + aLongString.Prepend(":\n\treturn '''\n"); + aLongString += "\n\t'''\n\tpass\n"; + + TCollection_AsciiString functionName; + + // check if the function returning this literal is already defined + int posAlready = anUpdatedScript.Location( aLongString, where, anUpdatedScript.Length() ); + if ( posAlready ) // already defined + { + // find the function name + int functBeg = posAlready; + char* script = (char*) anUpdatedScript.ToCString() + posAlready - 1; // look at ":" after "def fuction()" + while ( *script != ' ' ) { + script--; + functBeg--; + } + functBeg++; // do not take ' ' + posAlready--; // do not take ':' + functionName = anUpdatedScript.SubString( functBeg, posAlready ); + } + else // not defined yet + { + // find a unique function name + fixPythonName( aFunctionType ); + Standard_Integer nb = 0; + do functionName = aFunctionType + "_" + ( nb++ ) + "()"; + while ( !functionNameSet.insert( functionName.ToCString() ).second ); + + anUpdatedScript += helper + "\n\ndef " + functionName + aLongString; // define function + } + anUpdatedScript.InsertBefore( where, functionName ); // call function + } + aValidScript = true; return anUpdatedScript;