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
Copyright update 2021
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_PythonDump.cxx
diff --git
a/src/SMESH_I/SMESH_PythonDump.cxx
b/src/SMESH_I/SMESH_PythonDump.cxx
index a0976694911ad6e9e32af116d6c95d5835ef00f5..ed5d5377db5adcfca03b8c3b2cb1d6ffbc5ce688 100644
(file)
--- a/
src/SMESH_I/SMESH_PythonDump.cxx
+++ b/
src/SMESH_I/SMESH_PythonDump.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-202
0
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-202
1
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
@@
-33,13
+33,17
@@
#include "SMESH_MeshEditor_i.hxx"
#include <Basics_Utils.hxx>
#include "SMESH_MeshEditor_i.hxx"
#include <Basics_Utils.hxx>
+#include <Basics_OCCTVersion.hxx>
#include <SALOMEDS_wrap.hxx>
#include <LDOMParser.hxx>
#include <SALOMEDS_wrap.hxx>
#include <LDOMParser.hxx>
-#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
#include <TColStd_HSequenceOfInteger.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_HSequenceOfInteger.hxx>
#include <TCollection_AsciiString.hxx>
+#if OCC_VERSION_LARGE < 0x07050000
+#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
+#endif
+
#include <cstring>
#ifdef _DEBUG_
#include <cstring>
#ifdef _DEBUG_
@@
-64,9
+68,13
@@
namespace SMESH
for ( size_t i = 0; i < value.length(); i++)
myVals[i] = SMESH_Comment(value[i]);
}
for ( size_t i = 0; i < value.length(); i++)
myVals[i] = SMESH_Comment(value[i]);
}
+
+ TPythonDump::TPythonDump():myVarsCounter(0),mySmesh(SMESH_Gen_i::GetSMESHGen())
+ {
+ ++myCounter;
+ }
- TPythonDump::
- TPythonDump():myVarsCounter(0)
+ TPythonDump::TPythonDump(SMESH_Gen_i *smesh):myVarsCounter(0),mySmesh(smesh)
{
++myCounter;
}
{
++myCounter;
}
@@
-300,7
+308,7
@@
namespace SMESH
operator<<(CORBA::Object_ptr theArg)
{
SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
operator<<(CORBA::Object_ptr theArg)
{
SMESH_Gen_i* aSMESHGen = SMESH_Gen_i::GetSMESHGen();
- SALOMEDS::SObject_wrap aSObject =
SMESH_Gen_i::
ObjectToSObject(theArg);
+ SALOMEDS::SObject_wrap aSObject =
mySmesh->
ObjectToSObject(theArg);
if(!aSObject->_is_nil()) {
CORBA::String_var id = aSObject->GetID();
myStream << id;
if(!aSObject->_is_nil()) {
CORBA::String_var id = aSObject->GetID();
myStream << id;
@@
-319,7
+327,7
@@
namespace SMESH
TPythonDump::
operator<<(SMESH::SMESH_Hypothesis_ptr theArg)
{
TPythonDump::
operator<<(SMESH::SMESH_Hypothesis_ptr theArg)
{
- SALOMEDS::SObject_wrap aSObject =
SMESH_Gen_i::
ObjectToSObject(theArg);
+ SALOMEDS::SObject_wrap aSObject =
mySmesh->
ObjectToSObject(theArg);
if(aSObject->_is_nil() && !CORBA::is_nil(theArg))
myStream << "hyp_" << theArg->GetId();
else
if(aSObject->_is_nil() && !CORBA::is_nil(theArg))
myStream << "hyp_" << theArg->GetId();
else
@@
-333,7
+341,7
@@
namespace SMESH
{
if ( CORBA::is_nil( theArg ) )
return *this << "None";
{
if ( CORBA::is_nil( theArg ) )
return *this << "None";
- SALOMEDS::SObject_wrap aSObject =
SMESH_Gen_i::
ObjectToSObject(theArg);
+ SALOMEDS::SObject_wrap aSObject =
mySmesh->
ObjectToSObject(theArg);
if(!aSObject->_is_nil())
{
return *this << aSObject;
if(!aSObject->_is_nil())
{
return *this << aSObject;
@@
-348,7
+356,7
@@
namespace SMESH
SMESH::long_array_var anElementsId = theArg->GetIDs();
SMESH::array_of_ElementType_var types = theArg->GetTypes();
SMESH::ElementType type = types->length() ? types[0] : SMESH::ALL;
SMESH::long_array_var anElementsId = theArg->GetIDs();
SMESH::array_of_ElementType_var types = theArg->GetTypes();
SMESH::ElementType type = types->length() ? types[0] : SMESH::ALL;
- SALOMEDS::SObject_wrap meshSO =
SMESH_Gen_i::
ObjectToSObject(mesh);
+ SALOMEDS::SObject_wrap meshSO =
mySmesh->
ObjectToSObject(mesh);
if ( meshSO->_is_nil() ) // don't waste memory for dumping not published objects
return *this << mesh << ".GetIDSource([], " << type << ")";
else
if ( meshSO->_is_nil() ) // don't waste memory for dumping not published objects
return *this << mesh << ".GetIDSource([], " << type << ")";
else
@@
-367,7
+375,7
@@
namespace SMESH
TPythonDump&
TPythonDump::
TPythonDump&
TPythonDump::
- operator<<(SMESH::FilterManager_i*
theArg
)
+ operator<<(SMESH::FilterManager_i*
/*theArg*/
)
{
myStream<<"aFilterManager";
return *this;
{
myStream<<"aFilterManager";
return *this;
@@
-448,13
+456,13
@@
namespace SMESH
TPythonDump&
TPythonDump::
TPythonDump&
TPythonDump::
- operator<<(SMESH::Measurements_i*
theArg
)
+ operator<<(SMESH::Measurements_i*
/*theArg*/
)
{
myStream<<"aMeasurements";
return *this;
}
{
myStream<<"aMeasurements";
return *this;
}
- TPythonDump& TPythonDump:: operator<<(SMESH_Gen_i*
theArg
)
+ TPythonDump& TPythonDump:: operator<<(SMESH_Gen_i*
/*theArg*/
)
{
myStream << SMESHGenName(); return *this;
}
{
myStream << SMESHGenName(); return *this;
}
@@
-671,6
+679,8
@@
namespace SMESH
{
#ifdef _DEBUG_
std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
{
#ifdef _DEBUG_
std::cout << "Exception in SMESH_Gen_i::DumpPython(): " << text << std::endl;
+#else
+ (void)text; // unused in release mode
#endif
}
#endif
}