ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-05 12:28:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Rename to avoid clash with same name class from GEOM_Engine

Browse Source 
-class ObjectStates{
+class SMESH_ObjectStates{
This commit is contained in:
eap 2010-03-31 05:56:30 +00:00
parent 204b3f755c
commit da4a6470be
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/SMESH_I/SMESH_NoteBook.cxx
View File

@ -41,14 +41,14 @@ static int MYDEBUG = 0;
using namespace std; using namespace std;
void SetVariable(Handle(_pyCommand) theCommand,const ObjectStates* theStates, int position, int theArgNb); void SetVariable(Handle(_pyCommand) theCommand,const SMESH_ObjectStates* theStates, int position, int theArgNb);
//================================================================================ //================================================================================
/*! /*!
* \brief Constructor * \brief Constructor
*/ */
//================================================================================ //================================================================================
ObjectStates::ObjectStates(TCollection_AsciiString theType) SMESH_ObjectStates::SMESH_ObjectStates(TCollection_AsciiString theType)
{ {
_type = theType; _type = theType;
_dumpstate = 0; _dumpstate = 0;
@ -59,7 +59,7 @@ ObjectStates::ObjectStates(TCollection_AsciiString theType)
* \brief Destructor * \brief Destructor
*/ */
//================================================================================ //================================================================================
ObjectStates::~ObjectStates() SMESH_ObjectStates::~SMESH_ObjectStates()
{ {
} }
@ -69,7 +69,7 @@ ObjectStates::~ObjectStates()
* \param theState - Object state (vector of notebook variable) * \param theState - Object state (vector of notebook variable)
*/ */
//================================================================================ //================================================================================
void ObjectStates::AddState(const TState &theState) void SMESH_ObjectStates::AddState(const TState &theState)
{ {
_states.push_back(theState); _states.push_back(theState);
} }
@ -80,7 +80,7 @@ void ObjectStates::AddState(const TState &theState)
* \\retval state - Object state (vector of notebook variable) * \\retval state - Object state (vector of notebook variable)
*/ */
//================================================================================ //================================================================================
TState ObjectStates::GetCurrectState() const TState SMESH_ObjectStates::GetCurrectState() const
{ {
if(_states.size() > _dumpstate) if(_states.size() > _dumpstate)
return _states[_dumpstate]; return _states[_dumpstate];
@ -94,7 +94,7 @@ TState ObjectStates::GetCurrectState() const
* *
*/ */
//================================================================================ //================================================================================
TAllStates ObjectStates::GetAllStates() const TAllStates SMESH_ObjectStates::GetAllStates() const
{ {
return _states; return _states;
} }
@ -104,7 +104,7 @@ TAllStates ObjectStates::GetAllStates() const
* *
*/ */
//================================================================================ //================================================================================
void ObjectStates::IncrementState() void SMESH_ObjectStates::IncrementState()
{ {
_dumpstate++; _dumpstate++;
} }
@ -114,7 +114,7 @@ void ObjectStates::IncrementState()
* *
*/ */
//================================================================================ //================================================================================
TCollection_AsciiString ObjectStates::GetObjectType() const{ TCollection_AsciiString SMESH_ObjectStates::GetObjectType() const{
return _type; return _type;
} }
@ -125,7 +125,7 @@ TCollection_AsciiString ObjectStates::GetObjectType() const{
*/ */
//================================================================================ //================================================================================
LayerDistributionStates::LayerDistributionStates(): LayerDistributionStates::LayerDistributionStates():
ObjectStates("LayerDistribution") SMESH_ObjectStates("LayerDistribution")
{ {
} }
//================================================================================ //================================================================================
@ -252,7 +252,7 @@ void SMESH_NoteBook::ReplaceVariables()
if(it != _objectMap.end()) { if(it != _objectMap.end()) {
if(MYDEBUG) if(MYDEBUG)
cout << "Found object : " << (*it).first << endl; cout << "Found object : " << (*it).first << endl;
ObjectStates *aStates = (*it).second; SMESH_ObjectStates *aStates = (*it).second;
// Case for LocalLength hypothesis // Case for LocalLength hypothesis
if(aStates->GetObjectType().IsEqual("LocalLength") && aStates->GetCurrectState().size() >= 2) { if(aStates->GetObjectType().IsEqual("LocalLength") && aStates->GetCurrectState().size() >= 2) {
if(aMethod.IsEqual("SetLength")) { if(aMethod.IsEqual("SetLength")) {
@ -674,12 +674,12 @@ void SMESH_NoteBook::InitObjectMap()
} }
if(MYDEBUG) if(MYDEBUG)
cout<<"The object Type : "<<anObjType<<endl; cout<<"The object Type : "<<anObjType<<endl;
ObjectStates *aState = NULL; SMESH_ObjectStates *aState = NULL;
if(anObjType == "LayerDistribution") { if(anObjType == "LayerDistribution") {
aState = new LayerDistributionStates(); aState = new LayerDistributionStates();
} }
else else
aState = new ObjectStates(anObjType); aState = new SMESH_ObjectStates(anObjType);
for(int i = 0; i < aSections->length(); i++) { for(int i = 0; i < aSections->length(); i++) {
TState aVars; TState aVars;
@ -697,7 +697,7 @@ void SMESH_NoteBook::InitObjectMap()
} }
aState->AddState(aVars); aState->AddState(aVars);
} }
_objectMap.insert(pair<TCollection_AsciiString,ObjectStates*>(TCollection_AsciiString(aSObject->GetID()),aState)); _objectMap.insert(pair<TCollection_AsciiString,SMESH_ObjectStates*>(TCollection_AsciiString(aSObject->GetID()),aState));
} }
} }
} }
@ -850,10 +850,10 @@ bool SMESH_NoteBook::GetReal(const TCollection_AsciiString& theVarName, double&
/*! /*!
* Set variable of the ObjectStates from position to the _pyCommand * Set variable of the SMESH_ObjectStates from position to the _pyCommand
* method as nbArg argument * method as nbArg argument
*/ */
void SetVariable(Handle(_pyCommand) theCommand, const ObjectStates* theStates, int position, int theArgNb) void SetVariable(Handle(_pyCommand) theCommand, const SMESH_ObjectStates* theStates, int position, int theArgNb)
{ {
if(theStates->GetCurrectState().size() > position) if(theStates->GetCurrectState().size() > position)
if(!theStates->GetCurrectState().at(position).IsEmpty()) if(!theStates->GetCurrectState().at(position).IsEmpty())

10
src/SMESH_I/SMESH_NoteBook.hxx
View File

@ -36,12 +36,12 @@ typedef std::vector<TCollection_AsciiString> TState;
typedef std::vector<TState> TAllStates; typedef std::vector<TState> TAllStates;
typedef TCollection_AsciiString _pyID; typedef TCollection_AsciiString _pyID;
class ObjectStates{ class SMESH_ObjectStates{
public: public:
ObjectStates(TCollection_AsciiString theType); SMESH_ObjectStates(TCollection_AsciiString theType);
virtual ~ObjectStates(); virtual ~SMESH_ObjectStates();
void AddState(const TState &theState); void AddState(const TState &theState);
@ -58,7 +58,7 @@ private:
int _dumpstate; int _dumpstate;
}; };
class LayerDistributionStates : public ObjectStates class LayerDistributionStates : public SMESH_ObjectStates
{ {
public: public:
typedef std::map<TCollection_AsciiString,TCollection_AsciiString> TDistributionMap; typedef std::map<TCollection_AsciiString,TCollection_AsciiString> TDistributionMap;
@ -81,7 +81,7 @@ private:
class SMESH_NoteBook class SMESH_NoteBook
{ {
public: public:
typedef std::map<TCollection_AsciiString,ObjectStates*> TVariablesMap; typedef std::map<TCollection_AsciiString,SMESH_ObjectStates*> TVariablesMap;
typedef std::map<TCollection_AsciiString,TCollection_AsciiString> TMeshEditorMap; typedef std::map<TCollection_AsciiString,TCollection_AsciiString> TMeshEditorMap;
SMESH_NoteBook(); SMESH_NoteBook();
~SMESH_NoteBook(); ~SMESH_NoteBook();