-// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2012 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
#include CORBA_SERVER_HEADER(SALOMEDS)
#include <sstream>
+#include <vector>
class SMESH_Gen_i;
class SMESH_MeshEditor_i;
// ===========================================================================================
/*!
- * \brief Tool converting SMESH engine calls into commands defined in smesh.py
+ * \brief Tool converting SMESH engine calls into commands defined in smeshDC.py
*
* Implementation is in SMESH_2smeshpy.cxx
*/
* \param theScript - Input script
* \param theEntry2AccessorMethod - The returning method names to access to
* objects wrapped with python class
+ * \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,
+ ConvertScript(const TCollection_AsciiString& theScript,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
- Resource_DataMapOfAsciiStringAsciiString& theObjectNames);
+ Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
+ SALOMEDS::Study_ptr& theStudy,
+ const bool theHistoricalDump);
/*!
* \brief Return the name of the python file wrapping IDL API
- * \retval TCollection_AsciiString - The file name
+ * \retval const char* - the file name
*/
static const char* SmeshpyName() { return "smesh"; }
static const char* GenName() { return "smesh"; }
class Functor_i;
class Measurements_i;
-// ===========================================================================================
-/*!
- * \brief Utility helping in storing SMESH engine calls as python commands
- */
-// ===========================================================================================
+ // ===========================================================================================
+ /*!
+ * \brief Object used to make TPythonDump know that its held value can be a varible
+ *
+ * TPythonDump substitute TVar with names of notebook variables if any.
+ */
+ // ===========================================================================================
+
+ struct SMESH_I_EXPORT TVar
+ {
+ std::vector< std::string > myVals;
+ TVar(CORBA::Double value);
+ TVar(CORBA::Long value);
+ TVar(CORBA::Short value);
+ TVar(const SMESH::double_array& value);
+ // string used to temporary quote variable names in order
+ // not to confuse variables with string arguments
+ static char Quote() { return '$'; }
+ };
+
+ // ===========================================================================================
+ /*!
+ * \brief Utility helping in storing SMESH engine calls as python commands
+ */
+ // ===========================================================================================
class SMESH_I_EXPORT TPythonDump
{
std::ostringstream myStream;
- static size_t myCounter;
+ static size_t myCounter;
+ int myVarsCounter; // counts stored TVar's
public:
TPythonDump();
virtual ~TPythonDump();
+ TPythonDump&
+ operator<<(const TVar& theVariableValue);
+
TPythonDump&
operator<<(long int theArg);
TPythonDump&
operator<<(const SMESH::double_array& theArg);
+ TPythonDump&
+ operator<<(const SMESH::string_array& theArg);
+
TPythonDump&
operator<<(SMESH::SMESH_Hypothesis_ptr theArg);
TPythonDump&
operator<<(const SMESH::DirStruct & theDir);
+ TPythonDump&
+ operator<<(const SMESH::PointStruct & P);
+
TPythonDump&
operator<<(const TCollection_AsciiString & theArg);