Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/bsr/medmpi'
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_PythonDump.hxx
diff --git
a/src/SMESH_I/SMESH_PythonDump.hxx
b/src/SMESH_I/SMESH_PythonDump.hxx
index 29c5443132a4a8c4d8d596032a9fbd99d258ba51..13d66a497d5bcd605251e744ef0d0379f94c90ec 100644
(file)
--- a/
src/SMESH_I/SMESH_PythonDump.hxx
+++ b/
src/SMESH_I/SMESH_PythonDump.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
2
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
4
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
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-6,7
+6,7
@@
// 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
// 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.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-27,19
+27,23
@@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(GEOM_Gen)
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(SALOMEDS)
+#include <TCollection_AsciiString.hxx>
+
#include <sstream>
#include <vector>
#include <sstream>
#include <vector>
+#include <set>
+#include <list>
class SMESH_Gen_i;
class SMESH_MeshEditor_i;
class SMESH_Gen_i;
class SMESH_MeshEditor_i;
-class TCollection_AsciiString;
class Resource_DataMapOfAsciiStringAsciiString;
// ===========================================================================================
/*!
class Resource_DataMapOfAsciiStringAsciiString;
// ===========================================================================================
/*!
- * \brief Tool converting SMESH engine calls into commands defined in smesh
DC
.py
+ * \brief Tool converting SMESH engine calls into commands defined in smesh
Builder
.py
*
* Implementation is in SMESH_2smeshpy.cxx
*/
*
* Implementation is in SMESH_2smeshpy.cxx
*/
@@
-49,18
+53,21
@@
class SMESH_2smeshpy
{
public:
/*!
{
public:
/*!
- * \brief Convert a python script using commands of smesh.py
- * \param theScript -
Input scrip
t
- * \param theEntry2AccessorMethod -
The returning
method names to access to
+ * \brief Convert a python script using commands of smesh
Builder
.py
+ * \param theScript -
the Input script to conver
t
+ * \param theEntry2AccessorMethod -
returns
method names to access to
* objects wrapped with python class
* objects wrapped with python class
+ * \param theObjectNames - names of objects
+ * \param theRemovedObjIDs - entries of objects whose created commands were removed
* \param theHistoricalDump - true means to keep all commands, false means
* to exclude commands relating to objects removed from study
* \retval TCollection_AsciiString - Convertion result
*/
* \param theHistoricalDump - true means to keep all commands, false means
* to exclude commands relating to objects removed from study
* \retval TCollection_AsciiString - Convertion result
*/
- static
TCollection_AsciiString
- ConvertScript(
const TCollection_AsciiString& theScript
,
+ static
void
+ ConvertScript(
std::list< TCollection_AsciiString >& theScriptLines
,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+ std::set< TCollection_AsciiString >& theRemovedObjIDs,
SALOMEDS::Study_ptr& theStudy,
const bool theHistoricalDump);
SALOMEDS::Study_ptr& theStudy,
const bool theHistoricalDump);
@@
-98,6
+105,8
@@
namespace SMESH
// string used to temporary quote variable names in order
// not to confuse variables with string arguments
static char Quote() { return '$'; }
// string used to temporary quote variable names in order
// not to confuse variables with string arguments
static char Quote() { return '$'; }
+ // string preceding an entry of object storing the attribute holding var names
+ static const char* ObjPrefix() { return " # OBJ: "; }
};
// ===========================================================================================
};
// ===========================================================================================
@@
-142,6
+151,9
@@
namespace SMESH
TPythonDump&
operator<<(const SMESH::GeometryType& theArg);
TPythonDump&
operator<<(const SMESH::GeometryType& theArg);
+ TPythonDump&
+ operator<<(const SMESH::EntityType& theArg);
+
TPythonDump&
operator<<(const SMESH::long_array& theArg);
TPythonDump&
operator<<(const SMESH::long_array& theArg);
@@
-151,6
+163,9
@@
namespace SMESH
TPythonDump&
operator<<(const SMESH::string_array& theArg);
TPythonDump&
operator<<(const SMESH::string_array& theArg);
+ TPythonDump&
+ operator<<(const SMESH::nodes_array& theArg);
+
TPythonDump&
operator<<(SMESH::SMESH_Hypothesis_ptr theArg);
TPythonDump&
operator<<(SMESH::SMESH_Hypothesis_ptr theArg);
@@
-205,11
+220,18
@@
namespace SMESH
TPythonDump&
operator<<(const SMESH::ListOfGroups * theList);
TPythonDump&
operator<<(const SMESH::ListOfGroups * theList);
+ TPythonDump&
+ operator<<(const GEOM::ListOfGO& theList);
+
+ TPythonDump&
+ operator<<(const GEOM::ListOfGBO& theList);
+
TPythonDump&
operator<<(const SMESH::ListOfIDSources& theList);
static const char* SMESHGenName() { return "smeshgen"; }
static const char* MeshEditorName() { return "mesh_editor"; }
TPythonDump&
operator<<(const SMESH::ListOfIDSources& theList);
static const char* SMESHGenName() { return "smeshgen"; }
static const char* MeshEditorName() { return "mesh_editor"; }
+ static const char* NotPublishedObjectName();
/*!
* \brief Return marker of long string literal beginning
/*!
* \brief Return marker of long string literal beginning