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/V8_5_asterstudy'
[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 8783d9f5e8e69f61fd3b04961e5c81d7a50cdd39..793e4a4a18071b4fcc431fcdf015280df15908ef 100644
(file)
--- a/
src/SMESH_I/SMESH_PythonDump.hxx
+++ b/
src/SMESH_I/SMESH_PythonDump.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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,16
+27,20
@@
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
#include <SALOMEconfig.h>
#include CORBA_SERVER_HEADER(SMESH_Mesh)
+#include CORBA_SERVER_HEADER(SMESH_MeshEditor)
+#include CORBA_SERVER_HEADER(GEOM_Gen)
#include CORBA_SERVER_HEADER(SALOMEDS)
#include CORBA_SERVER_HEADER(SALOMEDS)
+#include <TCollection_AsciiString.hxx>
+#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
+
#include <sstream>
#include <vector>
#include <set>
#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;
// ===========================================================================================
/*!
// ===========================================================================================
/*!
@@
-46,8
+50,9
@@
class Resource_DataMapOfAsciiStringAsciiString;
*/
// ===========================================================================================
*/
// ===========================================================================================
-
namespace
SMESH_2smeshpy
+
class
SMESH_2smeshpy
{
{
+public:
/*!
* \brief Convert a python script using commands of smeshBuilder.py
* \param theScript - the Input script to convert
/*!
* \brief Convert a python script using commands of smeshBuilder.py
* \param theScript - the Input script to convert
@@
-57,14
+62,13
@@
namespace SMESH_2smeshpy
* \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
* \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 - Conver
t
ion result
+ * \retval TCollection_AsciiString - Conver
s
ion result
*/
*/
- void
- ConvertScript(
TCollection_AsciiString& theScript
,
+
static
void
+ ConvertScript(
std::list< TCollection_AsciiString >& theScriptLines
,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,
- SALOMEDS::Study_ptr& theStudy,
const bool theHistoricalDump);
/*!
const bool theHistoricalDump);
/*!
@@
-85,7
+89,7
@@
namespace SMESH
// ===========================================================================================
/*!
// ===========================================================================================
/*!
- * \brief Object used to make TPythonDump know that its held value can be a varible
+ * \brief Object used to make TPythonDump know that its held value can be a vari
a
ble
*
* TPythonDump substitute TVar with names of notebook variables if any.
*/
*
* TPythonDump substitute TVar with names of notebook variables if any.
*/
@@
-94,6
+98,7
@@
namespace SMESH
struct SMESH_I_EXPORT TVar
{
std::vector< std::string > myVals;
struct SMESH_I_EXPORT TVar
{
std::vector< std::string > myVals;
+ bool myIsList;
TVar(CORBA::Double value);
TVar(CORBA::Long value);
TVar(CORBA::Short value);
TVar(CORBA::Double value);
TVar(CORBA::Long value);
TVar(CORBA::Short value);
@@
-159,6
+164,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);
@@
-192,9
+200,6
@@
namespace SMESH
TPythonDump&
operator<<(SMESH_MeshEditor_i* theArg);
TPythonDump&
operator<<(SMESH_MeshEditor_i* theArg);
- TPythonDump&
- operator<<(SMESH::MED_VERSION theArg);
-
TPythonDump&
operator<<(const SMESH::AxisStruct & theAxis);
TPythonDump&
operator<<(const SMESH::AxisStruct & theAxis);
@@
-213,9
+218,21
@@
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);
TPythonDump&
operator<<(const SMESH::ListOfIDSources& theList);
+ TPythonDump&
+ operator<<(const SMESH::CoincidentFreeBorders& theCFB);
+
+ TPythonDump&
+ operator<<(const std::string& theArg);
+
static const char* SMESHGenName() { return "smeshgen"; }
static const char* MeshEditorName() { return "mesh_editor"; }
static const char* NotPublishedObjectName();
static const char* SMESHGenName() { return "smeshgen"; }
static const char* MeshEditorName() { return "mesh_editor"; }
static const char* NotPublishedObjectName();