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
Update copyright notes (for 2010)
[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 eac87decaab8d716d9b78e498aef6e6f99dce446..c5ad5122a62e38da1b16c994f3f8b0996680127d 100644
(file)
--- a/
src/SMESH_I/SMESH_2smeshpy.hxx
+++ b/
src/SMESH_I/SMESH_2smeshpy.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
08
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
10
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
@@
-19,6
+19,7
@@
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
+
// File : SMESH_smesh.hxx
// Created : Fri Nov 18 12:05:18 2005
// Author : Edward AGAPOV (eap)
// File : SMESH_smesh.hxx
// Created : Fri Nov 18 12:05:18 2005
// Author : Edward AGAPOV (eap)
@@
-113,7
+114,7
@@
public:
int GetOrderNb() const { return myOrderNb; }
void SetOrderNb( int theNb ) { myOrderNb = theNb; }
int Length() { return myString.Length(); }
int GetOrderNb() const { return myOrderNb; }
void SetOrderNb( int theNb ) { myOrderNb = theNb; }
int Length() { return myString.Length(); }
- void Clear() { myString.Clear(); myBegPos.Clear(); }
+ void Clear() { myString.Clear(); myBegPos.Clear();
myArgs.Clear();
}
bool IsEmpty() const { return myString.IsEmpty(); }
TCollection_AsciiString GetIndentation();
const TCollection_AsciiString & GetResultValue();
bool IsEmpty() const { return myString.IsEmpty(); }
TCollection_AsciiString GetIndentation();
const TCollection_AsciiString & GetResultValue();
@@
-147,21
+148,24
@@
public:
// -------------------------------------------------------------------------------------
/*!
// -------------------------------------------------------------------------------------
/*!
- * \brief Root of all objects
+ * \brief Root of all objects
. It counts calls of Process()
*/
// -------------------------------------------------------------------------------------
class _pyObject: public Standard_Transient
{
*/
// -------------------------------------------------------------------------------------
class _pyObject: public Standard_Transient
{
- Handle(_pyCommand) myCreationCmd;
+ Handle(_pyCommand) myCreationCmd;
+ int myNbCalls;
public:
public:
- _pyObject(const Handle(_pyCommand)& theCreationCmd): myCreationCmd(theCreationCmd) {}
+ _pyObject(const Handle(_pyCommand)& theCreationCmd)
+ : myCreationCmd(theCreationCmd), myNbCalls(0) {}
const _pyID& GetID() { return myCreationCmd->GetResultValue(); }
static _pyID FatherID(const _pyID & childID);
const Handle(_pyCommand)& GetCreationCmd() { return myCreationCmd; }
const _pyID& GetID() { return myCreationCmd->GetResultValue(); }
static _pyID FatherID(const _pyID & childID);
const Handle(_pyCommand)& GetCreationCmd() { return myCreationCmd; }
+ int GetNbCalls() const { return myNbCalls; }
void SetCreationCmd( Handle(_pyCommand) cmd ) { myCreationCmd = cmd; }
int GetCommandNb() { return myCreationCmd->GetOrderNb(); }
void SetCreationCmd( Handle(_pyCommand) cmd ) { myCreationCmd = cmd; }
int GetCommandNb() { return myCreationCmd->GetOrderNb(); }
- virtual void Process(const Handle(_pyCommand) & theCommand)
= 0;
+ virtual void Process(const Handle(_pyCommand) & theCommand)
{ myNbCalls++; }
virtual void Flush() = 0;
virtual const char* AccessorMethod() const;
virtual void Flush() = 0;
virtual const char* AccessorMethod() const;
@@
-205,16
+209,15
@@
private:
private:
std::map< _pyID, Handle(_pyMesh) > myMeshes;
private:
std::map< _pyID, Handle(_pyMesh) > myMeshes;
- std::map< _pyID, Handle(_pySubMesh) > mySubMeshes;
+
//
std::map< _pyID, Handle(_pySubMesh) > mySubMeshes;
std::map< _pyID, Handle(_pyMeshEditor) > myMeshEditors;
std::map< _pyID, Handle(_pyMeshEditor) > myMeshEditors;
+ std::map< _pyID, Handle(_pyObject) > myObjects;
std::list< Handle(_pyHypothesis) > myHypos;
std::list< Handle(_pyCommand) > myCommands;
int myNbCommands;
std::list< Handle(_pyHypothesis) > myHypos;
std::list< Handle(_pyCommand) > myCommands;
int myNbCommands;
- bool myHasPattern;
Resource_DataMapOfAsciiStringAsciiString& myID2AccessorMethod;
Resource_DataMapOfAsciiStringAsciiString& myObjectNames;
Handle(_pyCommand) myLastCommand;
Resource_DataMapOfAsciiStringAsciiString& myID2AccessorMethod;
Resource_DataMapOfAsciiStringAsciiString& myObjectNames;
Handle(_pyCommand) myLastCommand;
- Handle(_pyFilterManager) myFilterManager;
DEFINE_STANDARD_RTTI (_pyGen)
};
DEFINE_STANDARD_RTTI (_pyGen)
};
@@
-325,7
+328,7
@@
public:
void Process( const Handle(_pyCommand)& theCommand);
void Flush();
virtual void Assign( const Handle(_pyHypothesis)& theOther,
void Process( const Handle(_pyCommand)& theCommand);
void Flush();
virtual void Assign( const Handle(_pyHypothesis)& theOther,
- const _pyID& theMesh );
+
const _pyID& theMesh );
DEFINE_STANDARD_RTTI (_pyHypothesis)
};
DEFINE_STANDARD_RTTI (_pyHypothesis)
};
@@
-357,6
+360,7
@@
class _pyComplexParamHypo: public _pyHypothesis
public:
_pyComplexParamHypo(const Handle(_pyCommand)& theCreationCmd): _pyHypothesis(theCreationCmd) {}
void Process( const Handle(_pyCommand)& theCommand);
public:
_pyComplexParamHypo(const Handle(_pyCommand)& theCreationCmd): _pyHypothesis(theCreationCmd) {}
void Process( const Handle(_pyCommand)& theCommand);
+ void Flush();
DEFINE_STANDARD_RTTI (_pyComplexParamHypo)
};
DEFINE_STANDARD_RTTI (_pyComplexParamHypo)
};
@@
-370,9
+374,10
@@
DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
class _pyLayerDistributionHypo: public _pyHypothesis
{
Handle(_pyHypothesis) my1dHyp;
class _pyLayerDistributionHypo: public _pyHypothesis
{
Handle(_pyHypothesis) my1dHyp;
+ TCollection_AsciiString myAlgoMethod;
public:
public:
- _pyLayerDistributionHypo(const Handle(_pyCommand)& theCreationCmd):
- _pyHypothesis(theCreationCmd) {}
+ _pyLayerDistributionHypo(const Handle(_pyCommand)& theCreationCmd
, const char* algoMethod
):
+ _pyHypothesis(theCreationCmd)
, myAlgoMethod((char*)algoMethod)
{}
void Process( const Handle(_pyCommand)& theCommand);
void Flush();
bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
void Process( const Handle(_pyCommand)& theCommand);
void Flush();
bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
@@
-416,20
+421,18
@@
DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
// -------------------------------------------------------------------------------------
/*!
// -------------------------------------------------------------------------------------
/*!
- * \brief
FilterManager creates only if at least one command
invoked
+ * \brief
SelfEraser erases creation command if no more it's commands
invoked
*/
// -------------------------------------------------------------------------------------
*/
// -------------------------------------------------------------------------------------
-class _py
FilterManag
er: public _pyObject
+class _py
SelfEras
er: public _pyObject
{
public:
{
public:
- _pyFilterManager(const Handle(_pyCommand)& theCreationCmd);
- void Process( const Handle(_pyCommand)& theCommand);
+ _pySelfEraser(const Handle(_pyCommand)& theCreationCmd):_pyObject(theCreationCmd) {}
virtual void Flush();
virtual void Flush();
- DEFINE_STANDARD_RTTI (_pyFilterManager)
-private:
- int myCmdCount;
+ DEFINE_STANDARD_RTTI (_pySelfEraser)
};
};
+DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
// -------------------------------------------------------------------------------------
/*!
// -------------------------------------------------------------------------------------
/*!
@@
-439,14
+442,13
@@
private:
class _pySubMesh: public _pyObject
{
public:
class _pySubMesh: public _pyObject
{
public:
- _pySubMesh(const Handle(_pyCommand)& theCreationCmd)
;
+ _pySubMesh(const Handle(_pyCommand)& theCreationCmd)
:_pyObject(theCreationCmd) {}
void Process( const Handle(_pyCommand)& theCommand);
virtual void Flush();
void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; }
void Process( const Handle(_pyCommand)& theCommand);
virtual void Flush();
void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; }
- DEFINE_STANDARD_RTTI (_py
FilterManager
)
+ DEFINE_STANDARD_RTTI (_py
SubMesh
)
private:
private:
- int myCmdCount;
Handle(_pyObject) myCreator;
};
Handle(_pyObject) myCreator;
};