-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2021 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
// 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
#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 <TCollection_AsciiString.hxx>
+#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
+
#include <sstream>
#include <vector>
+#include <set>
+#include <list>
class SMESH_Gen_i;
class SMESH_MeshEditor_i;
-class TCollection_AsciiString;
-class Resource_DataMapOfAsciiStringAsciiString;
// ===========================================================================================
/*!
- * \brief Tool converting SMESH engine calls into commands defined in smeshDC.py
+ * \brief Tool converting SMESH engine calls into commands defined in smeshBuilder.py
*
* Implementation is in SMESH_2smeshpy.cxx
*/
{
public:
/*!
- * \brief Convert a python script using commands of smesh.py
- * \param theScript - Input script
- * \param theEntry2AccessorMethod - The returning method names to access to
+ * \brief Convert a python script using commands of smeshBuilder.py
+ * \param theScript - the Input script to convert
+ * \param theEntry2AccessorMethod - returns method names to access to
* 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
+ * \retval TCollection_AsciiString - Conversion result
*/
- static TCollection_AsciiString
- ConvertScript(const TCollection_AsciiString& theScript,
+ static void
+ ConvertScript(std::list< TCollection_AsciiString >& theScriptLines,
Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
- SALOMEDS::Study_ptr& theStudy,
+ std::set< TCollection_AsciiString >& theRemovedObjIDs,
const bool theHistoricalDump);
/*!
// ===========================================================================================
/*!
- * \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 variable
*
* 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);
+ bool myIsList;
+ TVar(CORBA::Double value);
+ TVar(CORBA::Long value);
+ TVar(CORBA::LongLong 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 '$'; }
+ // string preceding an entry of object storing the attribute holding var names
+ static const char* ObjPrefix() { return " # OBJ: "; }
};
// ===========================================================================================
std::ostringstream myStream;
static size_t myCounter;
int myVarsCounter; // counts stored TVar's
+ SMESH_Gen_i *mySmesh = nullptr;
public:
+ TPythonDump(SMESH_Gen_i *smesh);
TPythonDump();
virtual ~TPythonDump();
TPythonDump&
operator<<(int theArg);
+ TPythonDump&
+ operator<<(long long theArg);
+
TPythonDump&
operator<<(double theArg);
TPythonDump&
operator<<(const SMESH::long_array& theArg);
+ TPythonDump&
+ operator<<(const SMESH::smIdType_array& theArg);
+
TPythonDump&
operator<<(const SMESH::double_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_MeshEditor_i* theArg);
- TPythonDump&
- operator<<(SMESH::MED_VERSION theArg);
-
TPythonDump&
operator<<(const SMESH::AxisStruct & theAxis);
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::submesh_array& theList);
+
+ TPythonDump&
+ operator<<(const SMESH::ListOfHypothesis& theList);
+
+ TPythonDump&
+ operator<<(const SMESH::CoincidentFreeBorders& theCFB);
+
+ TPythonDump&
+ operator<<(const std::string& theArg);
+
+
+ template<class TArray, class TStream>
+ static TStream& DumpArray(const TArray& theArray, TStream & theStream)
+ {
+ if ( theArray.length() == 0 )
+ {
+ theStream << "[]";
+ }
+ else
+ {
+ theStream << "[ ";
+ for (CORBA::ULong i = 1; i <= theArray.length(); i++) {
+ theStream << theArray[i-1];
+ if ( i < theArray.length() )
+ theStream << ", ";
+ }
+ theStream << " ]";
+ }
+ return theStream;
+ }
+
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