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 branch 'origin/V8_5_asterstudy'
[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 607136e2f73cd93bb371c3e85c2bff78f4bf36af..fa86d86826f46e40ea098425d21c79aec5a23bb4 100644
(file)
--- a/
src/SMESH_I/SMESH_2smeshpy.hxx
+++ b/
src/SMESH_I/SMESH_2smeshpy.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
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
@@
-6,7
+6,7
@@
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-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
@@
-102,11
+101,12
@@
class _pyCommand: public Standard_Transient
_AString myString; //!< command text
_AString myRes, myObj, myMeth; //!< found parts of command
TColStd_SequenceOfAsciiString myArgs; //!< found arguments
_AString myString; //!< command text
_AString myRes, myObj, myMeth; //!< found parts of command
TColStd_SequenceOfAsciiString myArgs; //!< found arguments
+ TColStd_SequenceOfAsciiString myResults; //!< found results
TColStd_SequenceOfInteger myBegPos; //!< where myRes, myObj, ... begin
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 };
enum { UNKNOWN=-1, EMPTY=0, RESULT_IND, OBJECT_IND, METHOD_IND, ARG1_IND };
- int GetBegPos( int thePartIndex );
+ int GetBegPos( int thePartIndex )
const
;
void SetBegPos( int thePartIndex, int thePosition );
void SetPart( int thePartIndex, const _AString& theNewPart, _AString& theOldPart);
void FindAllArgs() { GetArg(1); }
void SetBegPos( int thePartIndex, int thePosition );
void SetPart( int thePartIndex, const _AString& theNewPart, _AString& theOldPart);
void FindAllArgs() { GetArg(1); }
@@
-114,23
+114,24
@@
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()
{ 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();
-
_AString
GetResultValue(int res);
+
const _AString &
GetResultValue(int res);
const _AString & GetObject();
const _AString & GetMethod();
const _AString & GetArg( int index );
int GetNbArgs() { FindAllArgs(); return myArgs.Length(); }
const _AString & GetObject();
const _AString & GetMethod();
const _AString & GetArg( int index );
int GetNbArgs() { FindAllArgs(); return myArgs.Length(); }
+ int GetArgBeginning() const;
bool IsMethodCall();
bool MethodStartsFrom(const _AString& beg)
{ GetMethod(); return ( myMeth.Location( beg, 1, myMeth.Length() ) == 1 ); }
bool IsMethodCall();
bool MethodStartsFrom(const _AString& beg)
{ GetMethod(); return ( myMeth.Location( beg, 1, myMeth.Length() ) == 1 ); }
@@
-148,6
+149,8
@@
public:
const bool theForward, const bool dotIsWord = false);
static bool IsStudyEntry( const _AString& str );
static bool IsID( const _AString& str );
const bool theForward, const bool dotIsWord = false);
static bool IsStudyEntry( const _AString& str );
static bool IsID( const _AString& str );
+ static bool IsIDChar( char c )
+ { return ( isalnum( c ) || c == '_' || c == ':' ); }
static std::list< _pyID > GetStudyEntries( const _AString& str );
void AddDependantCmd( Handle(_pyCommand) cmd, bool prepend = false)
{ if (prepend) myDependentCmds.push_front( cmd ); else myDependentCmds.push_back( cmd ); }
static std::list< _pyID > GetStudyEntries( const _AString& str );
void AddDependantCmd( Handle(_pyCommand) cmd, bool prepend = false)
{ if (prepend) myDependentCmds.push_front( cmd ); else myDependentCmds.push_back( cmd ); }
@@
-155,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
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-179,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; }
@@
-195,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)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-234,7
+237,7
@@
class _pyStringFamily
int isIn( const char* str );
public:
bool Add( const char* str );
int isIn( const char* str );
public:
bool Add( const char* str );
- bool IsIn
( const _AString& str, _AString
& subStr );
+ bool IsIn
Args( Handle( _pyCommand)& cmd, std::list<_AString>
& subStr );
void Print( int level = 0 );
};
void Print( int level = 0 );
};
@@
-250,7
+253,6
@@
public:
_pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,
_pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
std::set< TCollection_AsciiString >& theRemovedObjIDs,
- SALOMEDS::Study_ptr& theStudy,
const bool theToKeepAllCommands);
Handle(_pyCommand) AddCommand( const _AString& theCommand );
void ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) theCmd2 );
const bool theToKeepAllCommands);
Handle(_pyCommand) AddCommand( const _AString& theCommand );
void ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) theCmd2 );
@@
-261,7
+263,7
@@
public:
void PlaceSubmeshAfterItsCreation( Handle(_pyCommand) theCmdUsingSubmesh ) const;
_pyID GenerateNewID( const _pyID& theID );
void PlaceSubmeshAfterItsCreation( Handle(_pyCommand) theCmdUsingSubmesh ) const;
_pyID GenerateNewID( const _pyID& theID );
-
void
AddObject( Handle(_pyObject)& theObj );
+
bool
AddObject( Handle(_pyObject)& theObj );
void CheckObjectIsReCreated( Handle(_pyObject)& theObj );
void SetProxyObject( const _pyID& theID, Handle(_pyObject)& theObj );
Handle(_pyObject) FindObject( const _pyID& theObjID ) const;
void CheckObjectIsReCreated( Handle(_pyObject)& theObj );
void SetProxyObject( const _pyID& theID, Handle(_pyObject)& theObj );
Handle(_pyObject) FindObject( const _pyID& theObjID ) const;
@@
-305,8
+307,9
@@
private:
private:
std::map< _pyID, Handle(_pyMesh) > myMeshes;
std::map< _pyID, Handle(_pyMeshEditor) > myMeshEditors;
private:
std::map< _pyID, Handle(_pyMesh) > myMeshes;
std::map< _pyID, Handle(_pyMeshEditor) > myMeshEditors;
- std::map< _pyID, Handle(_pyObject) > myObjects;
std::map< _pyID, Handle(_pyHypothesis) > myHypos;
std::map< _pyID, Handle(_pyHypothesis) > myHypos;
+ std::map< _pyID, Handle(_pyObject) > myObjects;
+ std::list< Handle(_pyObject) > myOrderedObjects; // to know order of myObjects creation
#ifdef USE_STRING_FAMILY
_pyStringFamily myKeepAgrCmdsIDs;
#else
#ifdef USE_STRING_FAMILY
_pyStringFamily myKeepAgrCmdsIDs;
#else
@@
-320,12
+323,11
@@
private:
Handle(_pyCommand) myLastCommand;
int myNbFilters;
bool myToKeepAllCommands;
Handle(_pyCommand) myLastCommand;
int myNbFilters;
bool myToKeepAllCommands;
- SALOMEDS::Study_var myStudy;
int myGeomIDNb, myGeomIDIndex;
std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
int myGeomIDNb, myGeomIDIndex;
std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
- DEFINE_STANDARD_RTTI
(_pyGen
)
+ DEFINE_STANDARD_RTTI
EXT(_pyGen,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-366,7
+368,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
@@
-386,7
+388,7
@@
public:
virtual void Flush() {}
virtual bool CanClear();
virtual void Flush() {}
virtual bool CanClear();
- DEFINE_STANDARD_RTTI
(_pyMesh
)
+ DEFINE_STANDARD_RTTI
EXT(_pyMeshEditor,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-470,7
+472,7
@@
public:
//void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand );
//void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand );
- DEFINE_STANDARD_RTTI
(_pyHypothesis
)
+ DEFINE_STANDARD_RTTI
EXT(_pyHypothesis,_pyObject
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-487,7
+489,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
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-502,7
+504,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);
@@
-524,7
+526,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);
@@
-541,7
+543,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);
@@
-556,7
+558,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);
@@
-572,8
+574,10
@@
public:
_pySelfEraser(const Handle(_pyCommand)& theCreationCmd);
void IgnoreOwnCalls() { myIgnoreOwnCalls = true; }
virtual void Flush();
_pySelfEraser(const Handle(_pyCommand)& theCreationCmd);
void IgnoreOwnCalls() { myIgnoreOwnCalls = true; }
virtual void Flush();
+ 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);
@@
-595,7
+599,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
)
};
// -------------------------------------------------------------------------------------
/*!
};
// -------------------------------------------------------------------------------------
/*!
@@
-615,7
+619,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);
@@
-636,7
+640,7
@@
public:
virtual bool CanClear();
void RemovedWithContents();
virtual bool CanClear();
void RemovedWithContents();
- DEFINE_STANDARD_RTTI
(_pyGroup
)
+ DEFINE_STANDARD_RTTI
EXT(_pyGroup,_pySubMesh
)
};
// -------------------------------------------------------------------------------------
};
// -------------------------------------------------------------------------------------
@@
-651,7
+655,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