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-tracking branch 'origin/master' into V8_5_BR
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_2smeshpy.hxx
diff --git
a/src/SMESH_I/SMESH_2smeshpy.hxx
b/src/SMESH_I/SMESH_2smeshpy.hxx
index 4e6531ddee31c3ed6e9785afc58f6e2f9a19853d..3c01f79bf78e77b6ac325d7c865fc869d41ea8ee 100644
(file)
--- a/
src/SMESH_I/SMESH_2smeshpy.hxx
+++ b/
src/SMESH_I/SMESH_2smeshpy.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
4
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
@@
-33,6
+33,7
@@
#include <TCollection_AsciiString.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
#include <TColStd_SequenceOfInteger.hxx>
#include <TCollection_AsciiString.hxx>
#include <TColStd_SequenceOfAsciiString.hxx>
#include <TColStd_SequenceOfInteger.hxx>
+#include <Resource_DataMapOfAsciiStringAsciiString.hxx>
#include <list>
#include <map>
#include <list>
#include <map>
@@
-58,8
+59,6
@@
*/
// ===========================================================================================
*/
// ===========================================================================================
-class Resource_DataMapOfAsciiStringAsciiString;
-
// ===========================================================================================
// =====================
// INTERNAL STUFF
// ===========================================================================================
// =====================
// INTERNAL STUFF
@@
-104,7
+103,7
@@
class _pyCommand: public Standard_Transient
TColStd_SequenceOfAsciiString myArgs; //!< found arguments
TColStd_SequenceOfAsciiString myResults; //!< found results
TColStd_SequenceOfInteger myBegPos; //!< where myRes, myObj, ... begin
TColStd_SequenceOfAsciiString myArgs; //!< found arguments
TColStd_SequenceOfAsciiString myResults; //!< found results
TColStd_SequenceOfInteger myBegPos; //!< where myRes, myObj, ... begin
- std::list< Handle(_pyCommand) > myDependentCmds; //!< commands that sould follow me in the script
+ std::list< Handle(_pyCommand) > myDependentCmds; //!< commands that s
h
ould follow me in the script
enum { UNKNOWN=-1, EMPTY=0, RESULT_IND, OBJECT_IND, METHOD_IND, ARG1_IND };
int GetBegPos( int thePartIndex ) const;
enum { UNKNOWN=-1, EMPTY=0, RESULT_IND, OBJECT_IND, METHOD_IND, ARG1_IND };
int GetBegPos( int thePartIndex ) const;
@@
-115,19
+114,19
@@
class _pyCommand: public Standard_Transient
public:
_pyCommand() {};
_pyCommand( const _AString& theString, int theNb=-1 )
public:
_pyCommand() {};
_pyCommand( const _AString& theString, int theNb=-1 )
- : my
String( theString ), myOrderNb( theNb
) {};
+ : my
OrderNb( theNb ), myString( theString
) {};
_AString & GetString() { return myString; }
_AString & GetString() { return myString; }
- int GetOrderNb() const { return myOrderNb; }
+ int
GetOrderNb() const { return myOrderNb; }
void SetOrderNb( int theNb ) { myOrderNb = theNb; }
typedef void* TAddr;
TAddr GetAddress() const { return (void*) this; }
void SetOrderNb( int theNb ) { myOrderNb = theNb; }
typedef void* TAddr;
TAddr GetAddress() const { return (void*) this; }
- int Length() const { return myString.Length(); }
+ int
Length() const { return myString.Length(); }
void Clear() { myString.Clear(); myBegPos.Clear(); myArgs.Clear(); }
bool IsEmpty() const { return myString.IsEmpty(); }
_AString GetIndentation();
const _AString & GetResultValue();
int GetNbResultValues();
void Clear() { myString.Clear(); myBegPos.Clear(); myArgs.Clear(); }
bool IsEmpty() const { return myString.IsEmpty(); }
_AString GetIndentation();
const _AString & GetResultValue();
int GetNbResultValues();
- const _AString& GetResultValue(int res);
+ const _AString
& GetResultValue(int res);
const _AString & GetObject();
const _AString & GetMethod();
const _AString & GetArg( int index );
const _AString & GetObject();
const _AString & GetMethod();
const _AString & GetArg( int index );
@@
-159,7
+158,7
@@
public:
bool AddAccessorMethod( _pyID theObjectID, const char* theAcsMethod );
bool AddAccessorMethod( _pyID theObjectID, const char* theAcsMethod );
- DEFINE_STANDARD_RTTI
(_pyCommand
)
+ DEFINE_STANDARD_RTTI
EXT(_pyCommand,Standard_Transient
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-183,11
+182,11
@@
public:
const _pyID& GetID() { return myID.IsEmpty() ? myCreationCmd->GetResultValue() : myID; }
static _pyID FatherID(const _pyID & childID);
const Handle(_pyCommand)& GetCreationCmd() { return myCreationCmd; }
const _pyID& GetID() { return myID.IsEmpty() ? myCreationCmd->GetResultValue() : myID; }
static _pyID FatherID(const _pyID & childID);
const Handle(_pyCommand)& GetCreationCmd() { return myCreationCmd; }
- int GetNbCalls() const { return myProcessedCmds.size(); }
+ int
GetNbCalls() const { return myProcessedCmds.size(); }
bool IsInStudy() const { return myIsPublished; }
virtual void SetRemovedFromStudy(const bool isRemoved) { myIsPublished = !isRemoved; }
void SetCreationCmd( Handle(_pyCommand) cmd ) { myCreationCmd = cmd; }
bool IsInStudy() const { return myIsPublished; }
virtual void SetRemovedFromStudy(const bool isRemoved) { myIsPublished = !isRemoved; }
void SetCreationCmd( Handle(_pyCommand) cmd ) { myCreationCmd = cmd; }
- int GetCommandNb() { return myCreationCmd->GetOrderNb(); }
+ int
GetCommandNb() { return myCreationCmd->GetOrderNb(); }
void AddProcessedCmd( const Handle(_pyCommand) & cmd )
{ if (myProcessedCmds.empty() || myProcessedCmds.back()!=cmd) myProcessedCmds.push_back( cmd );}
std::list< Handle(_pyCommand) >& GetProcessedCmds() { return myProcessedCmds; }
void AddProcessedCmd( const Handle(_pyCommand) & cmd )
{ if (myProcessedCmds.empty() || myProcessedCmds.back()!=cmd) myProcessedCmds.push_back( cmd );}
std::list< Handle(_pyCommand) >& GetProcessedCmds() { return myProcessedCmds; }
@@
-199,7
+198,7
@@
public:
virtual void ClearCommands();
virtual void Free() {}
virtual void ClearCommands();
virtual void Free() {}
- DEFINE_STANDARD_RTTI
(_pyObjec
t)
+ DEFINE_STANDARD_RTTI
EXT(_pyObject,Standard_Transien
t)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-330,7
+329,7
@@
private:
std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
- DEFINE_STANDARD_RTTI
(_pyGen
)
+ DEFINE_STANDARD_RTTI
EXT(_pyGen,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-371,7
+370,7
@@
private:
static void AddMeshAccess( const Handle(_pyCommand)& theCommand )
{ theCommand->SetObject( theCommand->GetObject() + "." _pyMesh_ACCESS_METHOD ); }
static void AddMeshAccess( const Handle(_pyCommand)& theCommand )
{ theCommand->SetObject( theCommand->GetObject() + "." _pyMesh_ACCESS_METHOD ); }
- DEFINE_STANDARD_RTTI
(_pyMesh
)
+ DEFINE_STANDARD_RTTI
EXT(_pyMesh,_pyObject
)
};
#undef _pyMesh_ACCESS_METHOD
};
#undef _pyMesh_ACCESS_METHOD
@@
-391,7
+390,7
@@
public:
virtual void Flush() {}
virtual bool CanClear();
virtual void Flush() {}
virtual bool CanClear();
- DEFINE_STANDARD_RTTI
(_pyMesh
)
+ DEFINE_STANDARD_RTTI
EXT(_pyMeshEditor,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-475,7
+474,7
@@
public:
//void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand );
//void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand );
- DEFINE_STANDARD_RTTI
(_pyHypothesis
)
+ DEFINE_STANDARD_RTTI
EXT(_pyHypothesis,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-492,7
+491,7
@@
public:
virtual const char* AccessorMethod() const { return "GetAlgorithm()"; }
virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; }
virtual const char* AccessorMethod() const { return "GetAlgorithm()"; }
virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; }
- DEFINE_STANDARD_RTTI
(_pyAlgorithm
)
+ DEFINE_STANDARD_RTTI
EXT(_pyAlgorithm,_pyHypothesis
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-507,7
+506,7
@@
public:
virtual void Process( const Handle(_pyCommand)& theCommand);
virtual void Flush();
virtual void Process( const Handle(_pyCommand)& theCommand);
virtual void Flush();
- DEFINE_STANDARD_RTTI
(_pyComplexParamHypo
)
+ DEFINE_STANDARD_RTTI
EXT(_pyComplexParamHypo,_pyHypothesis
)
};
DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
};
DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
@@
-529,7
+528,7
@@
public:
const _pyID& theMesh);
virtual void Free() { my1dHyp.Nullify(); }
const _pyID& theMesh);
virtual void Free() { my1dHyp.Nullify(); }
- DEFINE_STANDARD_RTTI
(_pyLayerDistributionHypo
)
+ DEFINE_STANDARD_RTTI
EXT(_pyLayerDistributionHypo,_pyHypothesis
)
};
DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis);
};
DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis);
@@
-546,7
+545,7
@@
public:
const _pyID& theMesh);
void Flush();
const _pyID& theMesh);
void Flush();
- DEFINE_STANDARD_RTTI
(_pyNumberOfSegmentsHyp
)
+ DEFINE_STANDARD_RTTI
EXT(_pyNumberOfSegmentsHyp,_pyHypothesis
)
};
DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis);
};
DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis);
@@
-561,7
+560,7
@@
public:
_pySegmentLengthAroundVertexHyp(const Handle(_pyCommand)& theCrCmd): _pyHypothesis(theCrCmd) {}
virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
const _pyID& theMesh);
_pySegmentLengthAroundVertexHyp(const Handle(_pyCommand)& theCrCmd): _pyHypothesis(theCrCmd) {}
virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
const _pyID& theMesh);
- DEFINE_STANDARD_RTTI
(_pySegmentLengthAroundVertexHyp
)
+ DEFINE_STANDARD_RTTI
EXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis
)
};
DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
};
DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
@@
-580,7
+579,7
@@
public:
virtual bool CanClear();
static bool IsAliveCmd( const Handle(_pyCommand)& theCmd );
virtual bool CanClear();
static bool IsAliveCmd( const Handle(_pyCommand)& theCmd );
- DEFINE_STANDARD_RTTI
(_pySelfEraser
)
+ DEFINE_STANDARD_RTTI
EXT(_pySelfEraser,_pyObject
)
};
DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
};
DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
@@
-602,7
+601,7
@@
public:
void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; }
static bool CanBeArgOfMethod(const _AString& theMethodName);
void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; }
static bool CanBeArgOfMethod(const _AString& theMethodName);
- DEFINE_STANDARD_RTTI
(_pySubMesh
)
+ DEFINE_STANDARD_RTTI
EXT(_pySubMesh,_pyObject
)
};
// -------------------------------------------------------------------------------------
/*!
};
// -------------------------------------------------------------------------------------
/*!
@@
-622,7
+621,7
@@
public:
//virtual void Free() { myUsers.clear(); }
const _pyID& GetNewID() const { return myNewID; }
//virtual void Free() { myUsers.clear(); }
const _pyID& GetNewID() const { return myNewID; }
- DEFINE_STANDARD_RTTI
(_pyFilter
)
+ DEFINE_STANDARD_RTTI
EXT(_pyFilter,_pyObject
)
};
DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
};
DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
@@
-643,7
+642,7
@@
public:
virtual bool CanClear();
void RemovedWithContents();
virtual bool CanClear();
void RemovedWithContents();
- DEFINE_STANDARD_RTTI
(_pyGroup
)
+ DEFINE_STANDARD_RTTI
EXT(_pyGroup,_pySubMesh
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-658,7
+657,7
@@
public:
_pyHypothesisReader();
Handle(_pyHypothesis) GetHypothesis(const _AString& hypType,
const Handle(_pyCommand)& creationCmd) const;
_pyHypothesisReader();
Handle(_pyHypothesis) GetHypothesis(const _AString& hypType,
const Handle(_pyCommand)& creationCmd) const;
- DEFINE_STANDARD_RTTI
(_pyHypothesisReader
)
+ DEFINE_STANDARD_RTTI
EXT(_pyHypothesisReader,Standard_Transient
)
};
#endif
};
#endif