ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-19 09:50:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

0021308: Remove hard-coded dependency of the external mesh plugins from the SMESH module

Browse Source 
+class _pyHypothesisReader: public Standard_Transient
This commit is contained in:
eap 2012-03-07 14:42:06 +00:00
parent e30138815a
commit 8b1e8414fb
1 changed files with 98 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
src/SMESH_I/SMESH_2smeshpy.hxx
View File

@ -36,6 +36,7 @@
#include <list> #include <list>
#include <map> #include <map>
#include <vector>
#include <SALOMEconfig.h> #include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SALOMEDS) #include CORBA_CLIENT_HEADER(SALOMEDS)
@ -51,9 +52,6 @@
* *
* Everything here is for internal usage by SMESH_2smeshpy::ConvertScript() * Everything here is for internal usage by SMESH_2smeshpy::ConvertScript()
* declared in SMESH_PythonDump.hxx * declared in SMESH_PythonDump.hxx
*
* See comments to _pyHypothesis class to know how to assure convertion of a new
* type of hypothesis
*/ */
// =========================================================================================== // ===========================================================================================
@ -72,18 +70,21 @@ class _pyMesh;
class _pySubMesh; class _pySubMesh;
class _pyHypothesis; class _pyHypothesis;
class _pyAlgorithm; class _pyAlgorithm;
class _pyHypothesisReader;
DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient); DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient);
DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient); DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient);
DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject); DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient);
DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject); DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject);
DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject); DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject);
DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh); DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject);
DEFINE_STANDARD_HANDLE (_pyMeshEditor,_pyObject); DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh);
DEFINE_STANDARD_HANDLE (_pyHypothesis,_pyObject); DEFINE_STANDARD_HANDLE (_pyMeshEditor ,_pyObject);
DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis); DEFINE_STANDARD_HANDLE (_pyHypothesis ,_pyObject);
DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis);
typedef TCollection_AsciiString _pyID; typedef TCollection_AsciiString _pyID;
typedef TCollection_AsciiString _AString;
// =========================================================== // ===========================================================
/*! /*!
@ -95,24 +96,23 @@ typedef TCollection_AsciiString _pyID;
class _pyCommand: public Standard_Transient class _pyCommand: public Standard_Transient
{ {
int myOrderNb; //!< position within the script int myOrderNb; //!< position within the script
TCollection_AsciiString myString; //!< command text _AString myString; //!< command text
TCollection_AsciiString myRes, myObj, myMeth; //!< found parts of command _AString myRes, myObj, myMeth; //!< found parts of command
TColStd_SequenceOfAsciiString myArgs; //!< found arguments TColStd_SequenceOfAsciiString myArgs; //!< found arguments
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 sould 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 );
void SetBegPos( int thePartIndex, int thePosition ); void SetBegPos( int thePartIndex, int thePosition );
void SetPart( int thePartIndex, const TCollection_AsciiString& theNewPart, void SetPart( int thePartIndex, const _AString& theNewPart, _AString& theOldPart);
TCollection_AsciiString& theOldPart);
void FindAllArgs() { GetArg(1); } void FindAllArgs() { GetArg(1); }
public: public:
_pyCommand() {}; _pyCommand() {};
_pyCommand( const TCollection_AsciiString& theString, int theNb ) _pyCommand( const _AString& theString, int theNb=-1 )
: myString( theString ), myOrderNb( theNb ) {}; : myString( theString ), myOrderNb( theNb ) {};
TCollection_AsciiString & GetString() { return myString; } _AString & GetString() { return myString; }
int GetOrderNb() const { return myOrderNb; } int GetOrderNb() const { return myOrderNb; }
void SetOrderNb( int theNb ) { myOrderNb = theNb; } void SetOrderNb( int theNb ) { myOrderNb = theNb; }
typedef void* TAddr; typedef void* TAddr;
@ -120,32 +120,30 @@ public:
int Length() { return myString.Length(); } int Length() { return myString.Length(); }
void Clear() { myString.Clear(); myBegPos.Clear(); myArgs.Clear(); } void Clear() { myString.Clear(); myBegPos.Clear(); myArgs.Clear(); }
bool IsEmpty() const { return myString.IsEmpty(); } bool IsEmpty() const { return myString.IsEmpty(); }
TCollection_AsciiString GetIndentation(); _AString GetIndentation();
const TCollection_AsciiString & GetResultValue(); const _AString & GetResultValue();
const int GetNbResultValues(); const int GetNbResultValues();
const TCollection_AsciiString & GetResultValue(int res); const _AString & GetResultValue(int res);
const TCollection_AsciiString & GetObject(); const _AString & GetObject();
const TCollection_AsciiString & GetMethod(); const _AString & GetMethod();
const TCollection_AsciiString & GetArg( int index ); const _AString & GetArg( int index );
int GetNbArgs() { FindAllArgs(); return myArgs.Length(); } int GetNbArgs() { FindAllArgs(); return myArgs.Length(); }
bool MethodStartsFrom(const TCollection_AsciiString& beg) bool MethodStartsFrom(const _AString& beg)
{ GetMethod(); return ( myMeth.Location( beg, 1, myMeth.Length() ) == 1 ); } { GetMethod(); return ( myMeth.Location( beg, 1, myMeth.Length() ) == 1 ); }
//Handle(TColStd_HSequenceOfAsciiString) GetArgs(); void SetResultValue( const _AString& theResult )
void SetResultValue( const TCollection_AsciiString& theResult )
{ GetResultValue(); SetPart( RESULT_IND, theResult, myRes ); } { GetResultValue(); SetPart( RESULT_IND, theResult, myRes ); }
void SetObject(const TCollection_AsciiString& theObject) void SetObject(const _AString& theObject)
{ GetObject(); SetPart( OBJECT_IND, theObject, myObj ); } { GetObject(); SetPart( OBJECT_IND, theObject, myObj ); }
void SetMethod(const TCollection_AsciiString& theMethod) void SetMethod(const _AString& theMethod)
{ GetMethod(); SetPart( METHOD_IND, theMethod, myMeth ); } { GetMethod(); SetPart( METHOD_IND, theMethod, myMeth ); }
void SetArg( int index, const TCollection_AsciiString& theArg); void SetArg( int index, const _AString& theArg);
void RemoveArgs(); void RemoveArgs();
void Comment(); void Comment();
static bool SkipSpaces( const TCollection_AsciiString & theSring, int & thePos ); static bool SkipSpaces( const _AString & theSring, int & thePos );
static TCollection_AsciiString GetWord( const TCollection_AsciiString & theSring, static _AString GetWord( const _AString & theSring, int & theStartPos,
int & theStartPos, const bool theForward, const bool theForward, const bool dotIsWord = false);
const bool dotIsWord = false); static bool IsStudyEntry( const _AString& str );
static bool IsStudyEntry( const TCollection_AsciiString& str ); static std::list< _pyID > GetStudyEntries( const _AString& str );
static std::list< _pyID > GetStudyEntries( const TCollection_AsciiString& str );
void AddDependantCmd( Handle(_pyCommand) cmd, bool prepend = false) void AddDependantCmd( Handle(_pyCommand) cmd, bool prepend = false)
{ if (prepend) myDependentCmds.push_front( cmd ); else myDependentCmds.push_back( cmd ); } { if (prepend) myDependentCmds.push_front( cmd ); else myDependentCmds.push_back( cmd ); }
bool SetDependentCmdsAfter() const; bool SetDependentCmdsAfter() const;
@ -201,9 +199,9 @@ public:
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
struct ExportedMeshData struct ExportedMeshData
{ {
Handle(_pyMesh) myMesh; Handle(_pyMesh) myMesh;
Handle(_pyCommand) myLastComputeCmd; Handle(_pyCommand) myLastComputeCmd;
TCollection_AsciiString myLastComputeCmdString; _AString myLastComputeCmdString;
ExportedMeshData() {} ExportedMeshData() {}
ExportedMeshData( const Handle(_pyMesh)& mesh, Handle(_pyCommand) computeCmd): ExportedMeshData( const Handle(_pyMesh)& mesh, Handle(_pyCommand) computeCmd):
myMesh( mesh ), myLastComputeCmd( computeCmd ) myMesh( mesh ), myLastComputeCmd( computeCmd )
@ -226,7 +224,7 @@ public:
Resource_DataMapOfAsciiStringAsciiString& theObjectNames, Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
SALOMEDS::Study_ptr& theStudy, SALOMEDS::Study_ptr& theStudy,
const bool theToKeepAllCommands); const bool theToKeepAllCommands);
Handle(_pyCommand) AddCommand( const TCollection_AsciiString& theCommand ); Handle(_pyCommand) AddCommand( const _AString& theCommand );
void ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) theCmd2 ); void ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) theCmd2 );
void SetCommandAfter( Handle(_pyCommand) theCmd, Handle(_pyCommand) theAfterCmd ); void SetCommandAfter( Handle(_pyCommand) theCmd, Handle(_pyCommand) theAfterCmd );
void SetCommandBefore( Handle(_pyCommand) theCmd, Handle(_pyCommand) theBeforeCmd ); void SetCommandBefore( Handle(_pyCommand) theCmd, Handle(_pyCommand) theBeforeCmd );
@ -249,9 +247,9 @@ public:
bool IsGeomObject(const _pyID& theObjID) const; bool IsGeomObject(const _pyID& theObjID) const;
bool IsNotPublished(const _pyID& theObjID) const; bool IsNotPublished(const _pyID& theObjID) const;
bool IsToKeepAllCommands() const { return myToKeepAllCommands; } bool IsToKeepAllCommands() const { return myToKeepAllCommands; }
void AddExportedMesh(const TCollection_AsciiString& file, const ExportedMeshData& mesh ) void AddExportedMesh(const _AString& file, const ExportedMeshData& mesh )
{ myFile2ExportedMesh[ file ] = mesh; } { myFile2ExportedMesh[ file ] = mesh; }
ExportedMeshData& FindExportedMesh( const TCollection_AsciiString& file ) ExportedMeshData& FindExportedMesh( const _AString& file )
{ return myFile2ExportedMesh[ file ]; } { return myFile2ExportedMesh[ file ]; }
virtual void Process( const Handle(_pyCommand)& theCommand ); virtual void Process( const Handle(_pyCommand)& theCommand );
@ -259,6 +257,8 @@ public:
virtual void ClearCommands(); virtual void ClearCommands();
virtual void Free(); virtual void Free();
Handle( _pyHypothesisReader ) GetHypothesisReader() const;
private: private:
void setNeighbourCommand( Handle(_pyCommand)& theCmd, void setNeighbourCommand( Handle(_pyCommand)& theCmd,
Handle(_pyCommand)& theOtherCmd, Handle(_pyCommand)& theOtherCmd,
@ -278,7 +278,8 @@ private:
bool myToKeepAllCommands; bool myToKeepAllCommands;
SALOMEDS::Study_var myStudy; SALOMEDS::Study_var myStudy;
int myGeomIDNb, myGeomIDIndex; int myGeomIDNb, myGeomIDIndex;
std::map< TCollection_AsciiString, ExportedMeshData > myFile2ExportedMesh; std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
DEFINE_STANDARD_RTTI (_pyGen) DEFINE_STANDARD_RTTI (_pyGen)
}; };
@ -332,8 +333,8 @@ private:
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
class _pyMeshEditor: public _pyObject class _pyMeshEditor: public _pyObject
{ {
_pyID myMesh; _pyID myMesh;
TCollection_AsciiString myCreationCmdStr; _AString myCreationCmdStr;
public: public:
_pyMeshEditor(const Handle(_pyCommand)& theCreationCmd); _pyMeshEditor(const Handle(_pyCommand)& theCreationCmd);
_pyID GetMesh() const { return myMesh; } _pyID GetMesh() const { return myMesh; }
@ -347,64 +348,62 @@ public:
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
/*! /*!
* \brief Root class for hypothesis * \brief Root class for hypothesis
*
* HOWTO assure convertion of a new type of hypothesis
* In _pyHypothesis::NewHypothesis():
* 1. add a case for the name of the new hypothesis
* 2. use SetConvMethodAndType() to set
* . for algo: algorithm name and method of Mesh creating the algo
* . for hypo: name of the algorithm and method creating the hypothesis
* 3. append to myArgMethods interface methods setting param values in the
* order they are used when creation method is called. If arguments of
* the creation method can't be easily got from calls of hypothesis methods, you are
* to derive a specific class from _pyHypothesis that would redefine Process(),
* see _pyComplexParamHypo for example
*/ */
// ------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------
class _pyHypothesis: public _pyObject class _pyHypothesis: public _pyObject
{ {
friend class _pyHypothesisReader;
protected: protected:
bool myIsAlgo, myIsWrapped; bool myIsAlgo, myIsWrapped;
_pyID myGeom, myMesh; _pyID myGeom, myMesh;
// a hypothesis can be used and created by different algos by different methods struct CreationMethod {
std::map<TCollection_AsciiString, TCollection_AsciiString > myType2CreationMethod; _AString myMethod; // method of algo or mesh creating a hyp
TColStd_SequenceOfAsciiString myArgs; // creation arguments // myArgNb(i)-th arg of myArgMethods(i) of hyp becomes an i-th arg of myAlgoMethod
TColStd_SequenceOfAsciiString myArgMethods; // hypo methods setting myArgs std::vector<_AString> myArgMethods;
TColStd_SequenceOfInteger myNbArgsByMethod; // nb args set by each method std::vector<int> myArgNb; // arg nb countered from 1
std::vector<_AString> myArgs; // creation arguments
};
void setCreationArg( const int argNb, const _AString& arg );
// a hypothesis can be created by different algos by different methods
typedef std::map<_AString, CreationMethod > TType2CrMethod;
TType2CrMethod myAlgoType2CreationMethod;
CreationMethod* myCurCrMethod; // used for adding to myAlgoType2CreationMethod
std::list<Handle(_pyCommand)> myArgCommands; std::list<Handle(_pyCommand)> myArgCommands;
std::list<Handle(_pyCommand)> myUnknownCommands; std::list<Handle(_pyCommand)> myUnusedCommands;
std::list<Handle(_pyObject) > myReferredObjs; std::list<Handle(_pyObject) > myReferredObjs;
// maps used to clear commands setting parameters if result of setting is not // maps used to clear commands setting parameters if result of setting is
// used (no mesh.Compute()) or discared (e.g. by mesh.Clear()) // discared (e.g. by mesh.Clear())
std::map<TCollection_AsciiString, std::list<Handle(_pyCommand)> > myMeth2Commands; std::map<_AString, std::list<Handle(_pyCommand)> > myMeth2Commands;
std::map< _pyCommand::TAddr, std::list<Handle(_pyCommand) > > myComputeAddr2Cmds; std::map< _pyCommand::TAddr, std::list<Handle(_pyCommand) > > myComputeAddr2Cmds;
std::list<Handle(_pyCommand) > myComputeCmds; std::list<Handle(_pyCommand) > myComputeCmds;
void rememberCmdOfParameter( const Handle(_pyCommand) & cmd ); void rememberCmdOfParameter( const Handle(_pyCommand) & cmd );
bool isCmdUsedForCompute( const Handle(_pyCommand) & cmd, bool isCmdUsedForCompute( const Handle(_pyCommand) & cmd,
_pyCommand::TAddr avoidComputeAddr=NULL ) const; _pyCommand::TAddr avoidComputeAddr=NULL ) const;
public: public:
_pyHypothesis(const Handle(_pyCommand)& theCreationCmd); _pyHypothesis(const Handle(_pyCommand)& theCreationCmd);
void SetConvMethodAndType(const char* creationMethod, const char* type) void SetConvMethodAndType(const _AString& creationMethod, const _AString& type)
{ myType2CreationMethod[ (char*)type ] = (char*)creationMethod; } { myCurCrMethod = &myAlgoType2CreationMethod[ type ];
void AddArgMethod(const char* method, const int nbArgs = 1) myCurCrMethod->myMethod = creationMethod; }
{ myArgMethods.Append( (char*)method ); myNbArgsByMethod.Append( nbArgs ); } void AddArgMethod(const _AString& method, const int argNb = 1)
const TColStd_SequenceOfAsciiString& GetArgs() const { return myArgs; } { myCurCrMethod->myArgMethods.push_back( method );
myCurCrMethod->myArgNb.push_back( argNb ); }
//const TColStd_SequenceOfAsciiString& GetArgs() const { return myArgs; }
const std::list<Handle(_pyCommand)>& GetArgCommands() const { return myArgCommands; } const std::list<Handle(_pyCommand)>& GetArgCommands() const { return myArgCommands; }
void ClearAllCommands(); void ClearAllCommands();
virtual bool IsAlgo() const { return myIsAlgo; } virtual bool IsAlgo() const { return myIsAlgo; }
bool IsValid() const { return !myType2CreationMethod.empty(); } bool IsValid() const { return !myAlgoType2CreationMethod.empty(); }
bool IsWrapped() const { return myIsWrapped; } bool IsWrapped() const { return myIsWrapped; }
const _pyID & GetGeom() const { return myGeom; } const _pyID & GetGeom() const { return myGeom; }
void SetMesh( const _pyID& theMeshId) { if ( myMesh.IsEmpty() ) myMesh = theMeshId; } void SetMesh( const _pyID& theMeshId) { if ( myMesh.IsEmpty() ) myMesh = theMeshId; }
const _pyID & GetMesh() const { return myMesh; } const _pyID & GetMesh() const { return myMesh; }
const TCollection_AsciiString& GetAlgoType() const const _AString& GetAlgoType() const
{ return myType2CreationMethod.begin()->first; } { return myAlgoType2CreationMethod.begin()->first; }
const TCollection_AsciiString& GetAlgoCreationMethod() const const _AString& GetAlgoCreationMethod() const
{ return myType2CreationMethod.begin()->second; } { return myAlgoType2CreationMethod.begin()->second.myMethod; }
bool CanBeCreatedBy(const TCollection_AsciiString& algoType ) const bool CanBeCreatedBy(const _AString& algoType ) const
{ return myType2CreationMethod.find( algoType ) != myType2CreationMethod.end(); } { return myAlgoType2CreationMethod.find( algoType ) != myAlgoType2CreationMethod.end(); }
const TCollection_AsciiString& GetCreationMethod(const TCollection_AsciiString& algoType) const const _AString& GetCreationMethod(const _AString& algoType)
{ return myType2CreationMethod.find( algoType )->second; } { return ( myCurCrMethod = & myAlgoType2CreationMethod[ algoType ])->myMethod; }
static Handle(_pyHypothesis) NewHypothesis( const Handle(_pyCommand)& theCreationCmd); static Handle(_pyHypothesis) NewHypothesis( const Handle(_pyCommand)& theCreationCmd);
virtual bool IsWrappable(const _pyID& theMesh) const; virtual bool IsWrappable(const _pyID& theMesh) const;
@ -468,7 +467,7 @@ DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
class _pyLayerDistributionHypo: public _pyHypothesis class _pyLayerDistributionHypo: public _pyHypothesis
{ {
Handle(_pyHypothesis) my1dHyp; Handle(_pyHypothesis) my1dHyp;
TCollection_AsciiString myAlgoMethod; _AString myAlgoMethod;
public: public:
_pyLayerDistributionHypo(const Handle(_pyCommand)& theCreationCmd, const char* algoMethod): _pyLayerDistributionHypo(const Handle(_pyCommand)& theCreationCmd, const char* algoMethod):
_pyHypothesis(theCreationCmd), myAlgoMethod((char*)algoMethod) {} _pyHypothesis(theCreationCmd), myAlgoMethod((char*)algoMethod) {}
@ -586,4 +585,19 @@ public:
}; };
DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject); DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
// -------------------------------------------------------------------------------------
/*!
* \brief Class reading _pyHypothesis'es from resource files of mesher Plugins
*/
// -------------------------------------------------------------------------------------
class _pyHypothesisReader: public Standard_Transient
{
std::map<_AString, Handle(_pyHypothesis)> myType2Hyp;
public:
_pyHypothesisReader();
Handle(_pyHypothesis) GetHypothesis(const _AString& hypType,
const Handle(_pyCommand)& creationCmd) const;
DEFINE_STANDARD_RTTI (_pyHypothesisReader)
};
#endif #endif