-// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2020 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
#include <vector>
#include <set>
-#include <Basics_OCCTVersion.hxx>
-
#include <SALOMEconfig.h>
#include CORBA_CLIENT_HEADER(SALOMEDS)
class _pyAlgorithm;
class _pyHypothesisReader;
-DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh);
-DEFINE_STANDARD_HANDLE (_pyMeshEditor ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyHypothesis ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyCommand ,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyObject ,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyGen ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyMesh ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pySubMesh ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyGroup ,_pySubMesh)
+DEFINE_STANDARD_HANDLE (_pyMeshEditor ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyHypothesis ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyAlgorithm ,_pyHypothesis)
typedef TCollection_AsciiString _pyID;
typedef TCollection_AsciiString _AString;
bool AddAccessorMethod( _pyID theObjectID, const char* theAcsMethod );
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyCommand,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(_pyCommand,Standard_Transient)
};
// -------------------------------------------------------------------------------------
virtual void ClearCommands();
virtual void Free() {}
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyObject,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(_pyObject,Standard_Transient)
};
// -------------------------------------------------------------------------------------
Handle(_pyCommand) myLastCommand;
int myNbFilters;
bool myToKeepAllCommands;
+ // difference of entry and index of this difference
int myGeomIDNb, myGeomIDIndex;
+ // difference of entry and index of this difference, specific for the SHAPER study
+ int myShaperIDNb, myShaperIDIndex;
std::map< _AString, ExportedMeshData > myFile2ExportedMesh;
Handle( _pyHypothesisReader ) myHypReader;
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyGen,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pyGen,_pyObject)
};
// -------------------------------------------------------------------------------------
static void AddMeshAccess( const Handle(_pyCommand)& theCommand )
{ theCommand->SetObject( theCommand->GetObject() + "." _pyMesh_ACCESS_METHOD ); }
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject)
};
#undef _pyMesh_ACCESS_METHOD
virtual void Flush() {}
virtual bool CanClear();
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pyMeshEditor,_pyObject)
};
// -------------------------------------------------------------------------------------
std::list<Handle(_pyCommand)> myUnusedCommands;
std::list<Handle(_pyObject) > myReferredObjs;
// maps used to clear commands setting parameters if result of setting is
- // discared (e.g. by mesh.Clear())
+ // discarded (e.g. by mesh.Clear())
std::map<_AString, std::list<Handle(_pyCommand)> > myMeth2Commands;
std::map< _pyCommand::TAddr, std::list<Handle(_pyCommand) > > myComputeAddr2Cmds;
std::list<Handle(_pyCommand) > myComputeCmds;
//void ComputeSaved ( const Handle(_pyCommand)& theComputeCommand );
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyHypothesis,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pyHypothesis,_pyObject)
};
// -------------------------------------------------------------------------------------
virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
const _pyID& theMesh);
virtual const char* AccessorMethod() const { return "GetAlgorithm()"; }
- virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; }
+ virtual bool IsWrappable(const _pyID& /*theMesh*/) { return !myIsWrapped; }
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyAlgorithm,_pyHypothesis)
+ DEFINE_STANDARD_RTTIEXT(_pyAlgorithm,_pyHypothesis)
};
// -------------------------------------------------------------------------------------
virtual void Process( const Handle(_pyCommand)& theCommand);
virtual void Flush();
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis)
+ DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis)
};
-DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis)
// -------------------------------------------------------------------------------------
/*!
const _pyID& theMesh);
virtual void Free() { my1dHyp.Nullify(); }
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis)
+ DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis)
};
-DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis)
// -------------------------------------------------------------------------------------
/*!
const _pyID& theMesh);
void Flush();
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis)
+ DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis)
};
-DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis)
// -------------------------------------------------------------------------------------
/*!
_pySegmentLengthAroundVertexHyp(const Handle(_pyCommand)& theCrCmd): _pyHypothesis(theCrCmd) {}
virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
const _pyID& theMesh);
- OCCT_DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis)
+ DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis)
};
-DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis)
// -------------------------------------------------------------------------------------
/*!
virtual bool CanClear();
static bool IsAliveCmd( const Handle(_pyCommand)& theCmd );
- OCCT_DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject)
};
-DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
+DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject)
// -------------------------------------------------------------------------------------
/*!
void SetCreator( const Handle(_pyObject)& theCreator ) { myCreator = theCreator; }
static bool CanBeArgOfMethod(const _AString& theMethodName);
- OCCT_DEFINE_STANDARD_RTTIEXT(_pySubMesh,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pySubMesh,_pyObject)
};
// -------------------------------------------------------------------------------------
/*!
//virtual void Free() { myUsers.clear(); }
const _pyID& GetNewID() const { return myNewID; }
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject)
+ DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject)
};
-DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
+DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject)
// -------------------------------------------------------------------------------------
/*!
virtual bool CanClear();
void RemovedWithContents();
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyGroup,_pySubMesh)
+ DEFINE_STANDARD_RTTIEXT(_pyGroup,_pySubMesh)
};
// -------------------------------------------------------------------------------------
_pyHypothesisReader();
Handle(_pyHypothesis) GetHypothesis(const _AString& hypType,
const Handle(_pyCommand)& creationCmd) const;
- OCCT_DEFINE_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient)
+ DEFINE_STANDARD_RTTIEXT(_pyHypothesisReader,Standard_Transient)
};
#endif