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;
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" );
// find where literal begins
int literalBeg = theFrom + myLongStringStart.Length(); // = 26
- char* typeLenStr = theText.ToCString() + literalBeg - 1; // = "7 Pattern!!! SALO...."
+ char* typeLenStr = (char*) theText.ToCString() + literalBeg - 1; // = "7 Pattern!!! SALO...."
int typeLen = atoi ( typeLenStr ); // = 7
while ( *typeLenStr != ' ' ) { // look for ' ' after typeLen
literalBeg++; // 26 -> 27
// Add trace of API methods calls and replace study entries by names
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();
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) {
*/
//=============================================================================
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() );
}
// Dump trace of API methods calls
- TCollection_AsciiString aNewLines = GetNewPythonLines(theStudyID);
+ TCollection_AsciiString aNewLines = GetNewPythonLines(aStudyID);
if (aNewLines.Length() > 0) {
aScript += helper + "\n" + aNewLines;
}
if (aSeq->Value(aLen) < aScriptLength)
anUpdatedScript += aScript.SubString(aSeq->Value(aLen) + 1, aScriptLength);
+
+ //SMESH_Gen_i* aSMESHGenI = SMESH_Gen_i::GetSMESHGen();
+ if( !CORBA::is_nil(theStudy) )
+ {
+ 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();
+ CORBA::String_var aName = aSObj->GetName();
+
+ SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( SMESH_Gen_i::SObjectToObject( aSObj ) );
+ if( !CORBA::is_nil(aMesh) )
+ {
+ bool isAutoColor = aMesh->GetAutoColor();
+ if( isAutoColor )
+ {
+ anUpdatedScript += "\n\t";
+ anUpdatedScript += (char*)aName.in();
+ anUpdatedScript += ".SetAutoColor(1)";
+ }
+ }
+
+ SMESH::SMESH_GroupBase_var aGroup = SMESH::SMESH_GroupBase::_narrow( SMESH_Gen_i::SObjectToObject( aSObj ) );
+ if( !CORBA::is_nil(aGroup) )
+ {
+ SALOMEDS::Color aColor = aGroup->GetColor();
+ if ( aColor.R > 0 || aColor.G > 0 || aColor.B > 0 )
+ {
+ anUpdatedScript += "\n\t";
+ anUpdatedScript += (char*)aName.in();
+ anUpdatedScript += ".SetColor(SALOMEDS.Color(";
+ anUpdatedScript += aColor.R;
+ anUpdatedScript += ",";
+ anUpdatedScript += aColor.G;
+ anUpdatedScript += ",";
+ anUpdatedScript += aColor.B;
+ anUpdatedScript += "))";
+ }
+ }
+ }
+ }
+ }
+
// Remove removed objects
if ( seqRemoved.Length() > 0 ) {
anUpdatedScript += "\n\t## some objects were removed";
}
anUpdatedScript += "\n\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";
// -----------------------------------------------------------------
{
// find the function name
int functBeg = posAlready;
- char* script = anUpdatedScript.ToCString() + posAlready - 1; // look at ":" after "def fuction()"
+ char* script = (char*) anUpdatedScript.ToCString() + posAlready - 1; // look at ":" after "def fuction()"
while ( *script != ' ' ) {
script--;
functBeg--;