-// Copyright (C) 2005 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.
+// Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE
//
-// 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
+// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+// 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"
{
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);
}
case FT_Area: myStream<< "aArea"; break;
case FT_FreeBorders: myStream<< "aFreeBorders"; break;
case FT_FreeEdges: myStream<< "aFreeEdges"; break;
+ case FT_FreeNodes: myStream<< "aFreeNodes"; break;
case FT_MultiConnection: myStream<< "aMultiConnection"; break;
case FT_MultiConnection2D:myStream<< "aMultiConnection2D";break;
case FT_Length: myStream<< "aLength"; 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;
}
// Some objects are wrapped with python classes and
// Resource_DataMapOfAsciiStringAsciiString holds methods returning wrapped objects
Resource_DataMapOfAsciiStringAsciiString anEntry2AccessorMethod;
- aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod );
+ aScript = SMESH_2smeshpy::ConvertScript( aScript, anEntry2AccessorMethod, theObjectNames );
// Find entries to be replaced by names
Handle(TColStd_HSequenceOfInteger) aSeq = FindEntries(aScript);
anUpdatedScript += aScript.SubString(aSeq->Value(aLen) + 1, aScriptLength);
- SMESH_Gen_i* aSMESHGenI = SMESH_Gen_i::GetSMESHGen();
- SALOMEDS::Study_ptr aStudy = aSMESHGenI->GetCurrentStudy();
- if( !CORBA::is_nil(aStudy) )
+ //SMESH_Gen_i* aSMESHGenI = SMESH_Gen_i::GetSMESHGen();
+ if( !CORBA::is_nil(theStudy) )
{
- SALOMEDS::SObject_var aComp = aStudy->FindComponent(ComponentDataType());
+ SALOMEDS::SObject_var aComp = theStudy->FindComponent(ComponentDataType());
if( !CORBA::is_nil(aComp) )
{
- SALOMEDS::ChildIterator_var Itr = aStudy->NewChildIterator(aComp);
+ SALOMEDS::ChildIterator_var Itr = theStudy->NewChildIterator(aComp);
for( Itr->InitEx(true); Itr->More(); Itr->Next() )
{
SALOMEDS::SObject_var aSObj = Itr->Value();
// Set object names
anUpdatedScript += "\n\t## set object names";
- anUpdatedScript += helper + " \n\tisGUIMode = " + isPublished;
- anUpdatedScript += "\n\tif isGUIMode and salome.sg.hasDesktop():";
// anUpdatedScript += "\n\t\tsmeshgui = salome.ImportComponentGUI(\"SMESH\")";
// anUpdatedScript += "\n\t\tsmeshgui.Init(theStudy._get_StudyId())";
// anUpdatedScript += "\n";
aName = theObjectNames.Find(anEntry);
aGUIName = theNames.Find(anEntry);
mapEntries.Bind(anEntry, aName);
- anUpdatedScript += helper + "\n\t\t" + aSmeshpy + ".SetName(" + aName;
+ 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";
// -----------------------------------------------------------------
{
// 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--;