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

fix bug with Smesh Create Group select

Browse Source
This commit is contained in:
Viktor Uzlov 2021-02-19 19:51:05 +03:00
parent 79fe25c5be
commit 442b3d1c8b
6 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/OBJECT/SMESH_Actor.cxx
View File

@ -1453,27 +1453,27 @@ void SMESH_ActorDef::UnShrink()
} }
int SMESH_ActorDef::GetNodeObjId(int theVtkID) vtkIdType SMESH_ActorDef::GetNodeObjId(vtkIdType theVtkID)
{ {
return myPickableActor->GetNodeObjId(theVtkID); return myPickableActor->GetNodeObjId(theVtkID);
} }
double* SMESH_ActorDef::GetNodeCoord(int theObjID) double* SMESH_ActorDef::GetNodeCoord(vtkIdType theObjID)
{ {
return myPickableActor->GetNodeCoord(theObjID); return myPickableActor->GetNodeCoord(theObjID);
} }
int SMESH_ActorDef::GetNodeVtkId(int theObjID) vtkIdType SMESH_ActorDef::GetNodeVtkId(vtkIdType theObjID)
{ {
return myPickableActor->GetNodeVtkId(theObjID); return myPickableActor->GetNodeVtkId(theObjID);
} }
int SMESH_ActorDef::GetElemObjId(int theVtkID) vtkIdType SMESH_ActorDef::GetElemObjId(vtkIdType theVtkID)
{ {
return myPickableActor->GetElemObjId(theVtkID); return myPickableActor->GetElemObjId(theVtkID);
} }
vtkCell* SMESH_ActorDef::GetElemCell(int theObjID) vtkCell* SMESH_ActorDef::GetElemCell(vtkIdType theObjID)
{ {
return myPickableActor->GetElemCell(theObjID); return myPickableActor->GetElemCell(theObjID);
} }

10
src/OBJECT/SMESH_ActorDef.h
View File

@ -144,12 +144,12 @@ class SMESH_ActorDef : public SMESH_Actor
virtual void SetBallScale(double size); virtual void SetBallScale(double size);
virtual double GetBallScale(); virtual double GetBallScale();
virtual int GetNodeObjId(int theVtkID); virtual vtkIdType GetNodeObjId(vtkIdType theVtkID);
virtual double* GetNodeCoord(int theObjID); virtual double* GetNodeCoord(vtkIdType theObjID);
virtual int GetNodeVtkId(int theObjID); virtual vtkIdType GetNodeVtkId(vtkIdType theObjID);
virtual int GetElemObjId(int theVtkID); virtual vtkIdType GetElemObjId(vtkIdType theVtkID);
virtual vtkCell* GetElemCell(int theObjID); virtual vtkCell* GetElemCell(vtkIdType theObjID);
virtual int GetObjDimension( const int theObjId ); virtual int GetObjDimension( const int theObjId );

16
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -839,9 +839,9 @@ SMESH_DeviceActor
} }
int vtkIdType
SMESH_DeviceActor SMESH_DeviceActor
::GetNodeObjId(int theVtkID) ::GetNodeObjId(vtkIdType theVtkID)
{ {
vtkIdType anID = theVtkID; vtkIdType anID = theVtkID;
@ -855,7 +855,7 @@ SMESH_DeviceActor
double* double*
SMESH_DeviceActor SMESH_DeviceActor
::GetNodeCoord(int theObjID) ::GetNodeCoord(vtkIdType theObjID)
{ {
vtkDataSet* aDataSet = myMergeFilter->GetOutput(); vtkDataSet* aDataSet = myMergeFilter->GetOutput();
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID); vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
@ -864,16 +864,16 @@ SMESH_DeviceActor
return aCoord; return aCoord;
} }
int vtkIdType
SMESH_DeviceActor SMESH_DeviceActor
::GetNodeVtkId(int theObjID) ::GetNodeVtkId(vtkIdType theObjID)
{ {
return myVisualObj->GetNodeVTKId(theObjID); return myVisualObj->GetNodeVTKId(theObjID);
} }
int vtkIdType
SMESH_DeviceActor SMESH_DeviceActor
::GetElemObjId(int theVtkID) ::GetElemObjId(vtkIdType theVtkID)
{ {
vtkIdType anId = myGeomFilter->GetElemObjId(theVtkID); vtkIdType anId = myGeomFilter->GetElemObjId(theVtkID);
if(anId < 0) if(anId < 0)
@ -897,7 +897,7 @@ SMESH_DeviceActor
vtkCell* vtkCell*
SMESH_DeviceActor SMESH_DeviceActor
::GetElemCell(int theObjID) ::GetElemCell(vtkIdType theObjID)
{ {
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid(); vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID); vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);

10
src/OBJECT/SMESH_DeviceActor.h
View File

@ -68,12 +68,12 @@ class SMESHOBJECT_EXPORT SMESH_DeviceActor: public vtkLODActor{
void SetStoreGemetryMapping(bool theStoreMapping); void SetStoreGemetryMapping(bool theStoreMapping);
void SetStoreIDMapping(bool theStoreMapping); void SetStoreIDMapping(bool theStoreMapping);
virtual int GetNodeObjId(int theVtkID); virtual vtkIdType GetNodeObjId(vtkIdType theVtkID);
virtual double* GetNodeCoord(int theObjID); virtual double* GetNodeCoord(vtkIdType theObjID);
virtual int GetNodeVtkId(int theObjID); virtual vtkIdType GetNodeVtkId(vtkIdType theObjID);
virtual int GetElemObjId(int theVtkID); virtual vtkIdType GetElemObjId(vtkIdType theVtkID);
virtual vtkCell* GetElemCell(int theObjID); virtual vtkCell* GetElemCell(vtkIdType theObjID);
virtual void SetTransform(VTKViewer_Transform* theTransform); virtual void SetTransform(VTKViewer_Transform* theTransform);
virtual vtkMTimeType GetMTime(); virtual vtkMTimeType GetMTime();

2
src/SMESH_I/SMESH_PythonDump.cxx
View File

@ -141,7 +141,7 @@ namespace SMESH
TPythonDump& TPythonDump&
TPythonDump:: TPythonDump::
operator<<(SMESH::smIdType theArg){ operator<<(long long theArg){
myStream<<theArg; myStream<<theArg;
return *this; return *this;
} }

2
src/SMESH_I/SMESH_PythonDump.hxx
View File

@ -135,7 +135,7 @@ namespace SMESH
operator<<(int theArg); operator<<(int theArg);
TPythonDump& TPythonDump&
operator<<(SMESH::smIdType theArg); operator<<(long long theArg);
TPythonDump& TPythonDump&
operator<<(double theArg); operator<<(double theArg);