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

Windows compatibility.

Browse Source
This commit is contained in:
ana 2016-11-24 14:29:42 +03:00
parent 164f564028
commit 9c03aded93
7 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/OBJECT/SMESH_Actor.cxx
View File

@ -1940,9 +1940,9 @@ int SMESH_ActorDef::RenderTranslucentGeometry(vtkViewport *vp)
void SMESH_ActorDef::Render(vtkRenderer *ren) void SMESH_ActorDef::Render(vtkRenderer *ren)
{ {
unsigned long aTime = myTimeStamp->GetMTime(); vtkMTimeType aTime = myTimeStamp->GetMTime();
unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime(); vtkMTimeType anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
unsigned long aClippingTime = myImplicitBoolean->GetMTime(); vtkMTimeType aClippingTime = myImplicitBoolean->GetMTime();
if(anObjTime > aTime || aClippingTime > aTime) if(anObjTime > aTime || aClippingTime > aTime)
Update(); Update();
} }

4
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -615,7 +615,7 @@ SMESH_DeviceActor
unsigned long int vtkMTimeType
SMESH_DeviceActor SMESH_DeviceActor
::GetMTime() ::GetMTime()
{ {
@ -640,7 +640,7 @@ SMESH_DeviceActor
// << " " << myTransformFilter->GetMTime() // << " " << myTransformFilter->GetMTime()
// << " " << myFaceOrientationFilter->GetMTime() << endl; // << " " << myFaceOrientationFilter->GetMTime() << endl;
unsigned long mTime = this->Superclass::GetMTime(); vtkMTimeType mTime = this->Superclass::GetMTime();
mTime = max(mTime,myExtractGeometry->GetMTime()); mTime = max(mTime,myExtractGeometry->GetMTime());
mTime = max(mTime,myExtractUnstructuredGrid->GetMTime()); mTime = max(mTime,myExtractUnstructuredGrid->GetMTime());
mTime = max(mTime,myMergeFilter->GetMTime()); mTime = max(mTime,myMergeFilter->GetMTime());

2
src/OBJECT/SMESH_DeviceActor.h
View File

@ -75,7 +75,7 @@ class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{
virtual vtkCell* GetElemCell(int theObjID); virtual vtkCell* GetElemCell(int theObjID);
virtual void SetTransform(VTKViewer_Transform* theTransform); virtual void SetTransform(VTKViewer_Transform* theTransform);
virtual unsigned long int GetMTime(); virtual vtkMTimeType GetMTime();
virtual void SetFacesOriented(bool theIsFacesOriented); virtual void SetFacesOriented(bool theIsFacesOriented);
virtual bool GetFacesOriented() { return myIsFacesOriented; } virtual bool GetFacesOriented() { return myIsFacesOriented; }

2
src/SMDS/SMDS_Mesh.cxx
View File

@ -4708,7 +4708,7 @@ void SMDS_Mesh::Modified()
} }
//! get last modification timeStamp //! get last modification timeStamp
unsigned long SMDS_Mesh::GetMTime() const vtkMTimeType SMDS_Mesh::GetMTime() const
{ {
return this->myModifTime; return this->myModifTime;
} }

2
src/SMDS/SMDS_Mesh.hxx
View File

@ -750,7 +750,7 @@ public:
inline void setMyModified() { this->myModified = true; } inline void setMyModified() { this->myModified = true; }
void Modified(); void Modified();
unsigned long GetMTime() const; vtkMTimeType GetMTime() const;
bool isCompacted(); bool isCompacted();
protected: protected:

4
src/SMDS/SMDS_UnstructuredGrid.cxx
View File

@ -125,9 +125,9 @@ SMDS_UnstructuredGrid::~SMDS_UnstructuredGrid()
{ {
} }
unsigned long SMDS_UnstructuredGrid::GetMTime() vtkMTimeType SMDS_UnstructuredGrid::GetMTime()
{ {
unsigned long mtime = vtkUnstructuredGrid::GetMTime(); vtkMTimeType mtime = vtkUnstructuredGrid::GetMTime();
return mtime; return mtime;
} }

2
src/SMDS/SMDS_UnstructuredGrid.hxx
View File

@ -69,7 +69,7 @@ public:
int newNodeSize, int newNodeSize,
std::vector<int>& idCellsOldToNew, std::vector<int>& idCellsOldToNew,
int newCellSize); int newCellSize);
virtual unsigned long GetMTime(); virtual vtkMTimeType GetMTime();
virtual vtkPoints *GetPoints(); virtual vtkPoints *GetPoints();
int InsertNextLinkedCell(int type, int npts, vtkIdType *pts); int InsertNextLinkedCell(int type, int npts, vtkIdType *pts);