mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-13 18:20:34 +05:00
Fix on Bug PAL7606
Controls operation aren't work during Clipping
This commit is contained in:
parent
959198f20f
commit
a809677ab6
@ -1263,35 +1263,28 @@ int SMESH_ActorDef::RenderTranslucentGeometry(vtkViewport *vp)
|
|||||||
|
|
||||||
|
|
||||||
void SMESH_ActorDef::Render(vtkRenderer *ren){
|
void SMESH_ActorDef::Render(vtkRenderer *ren){
|
||||||
unsigned long mTime = myTimeStamp->GetMTime();
|
unsigned long aTime = myTimeStamp->GetMTime();
|
||||||
unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
|
unsigned long anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
|
||||||
if(anObjTime > mTime)
|
unsigned long aClippingTime = myImplicitBoolean->GetMTime();
|
||||||
|
if(anObjTime > aTime || aClippingTime > aTime)
|
||||||
Update();
|
Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SMESH_ActorDef::Update(){
|
void SMESH_ActorDef::Update(){
|
||||||
SetVisibility(GetVisibility());
|
|
||||||
unsigned long int anObjTime = myVisualObj->GetUnstructuredGrid()->GetMTime();
|
|
||||||
unsigned long int aClippingTime = myImplicitBoolean->GetMTime();
|
|
||||||
unsigned long int aTime = myTimeStamp->GetMTime();
|
|
||||||
if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update");
|
if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update");
|
||||||
|
|
||||||
if(GetControlMode() != eNone) {
|
if(GetControlMode() != eNone) {
|
||||||
if(anObjTime > aTime || aClippingTime > aTime){
|
SetControlMode(GetControlMode());
|
||||||
SetControlMode(GetControlMode());
|
|
||||||
SetVisibility(GetVisibility());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
if(myIsPointsLabeled){
|
if(myIsPointsLabeled){
|
||||||
if(anObjTime > aTime || aClippingTime > aTime)
|
SetPointsLabeled(myIsPointsLabeled);
|
||||||
SetPointsLabeled(myIsPointsLabeled);
|
|
||||||
}
|
}
|
||||||
if(myIsCellsLabeled){
|
if(myIsCellsLabeled){
|
||||||
if(anObjTime > aTime || aClippingTime > aTime)
|
SetCellsLabeled(myIsCellsLabeled);
|
||||||
SetCellsLabeled(myIsCellsLabeled);
|
|
||||||
}
|
}
|
||||||
|
SetVisibility(GetVisibility());
|
||||||
|
|
||||||
myTimeStamp->Modified();
|
myTimeStamp->Modified();
|
||||||
Modified();
|
Modified();
|
||||||
}
|
}
|
||||||
@ -1498,7 +1491,6 @@ void SMESH_ActorDef::SetPlaneParam(float theDir[3], float theDist, vtkPlane* the
|
|||||||
float anOrigin[3];
|
float anOrigin[3];
|
||||||
::DistanceToPosition(GetUnstructuredGrid(),theDir,theDist,anOrigin);
|
::DistanceToPosition(GetUnstructuredGrid(),theDir,theDist,anOrigin);
|
||||||
thePlane->SetOrigin(anOrigin);
|
thePlane->SetOrigin(anOrigin);
|
||||||
Update();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user