ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-27 20:30:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Regression: outline is not shown if selection disabled before showing

Browse Source
This commit is contained in:
eap 2016-11-14 15:44:16 +03:00
parent 1f79871a68
commit 7ee75034e2
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/OBJECT/SMESH_Actor.cxx
View File

@ -1142,7 +1142,7 @@ void SMESH_ActorDef::AddToRender(vtkRenderer* theRenderer)
if ( !mySelector || !mySelector->IsSelectionEnabled() ) if ( !mySelector || !mySelector->IsSelectionEnabled() )
{ {
myBaseActor->SetUnstructuredGrid( NULL ); myBaseActor->SetUnstructuredGrid( NULL );
myHighlitableActor->SetUnstructuredGrid( NULL ); //myHighlitableActor->SetUnstructuredGrid( NULL );
} }
theRenderer->AddActor(myBaseActor); theRenderer->AddActor(myBaseActor);
theRenderer->AddActor(myNodeExtActor); theRenderer->AddActor(myNodeExtActor);
@ -1858,11 +1858,6 @@ void SMESH_ActorDef::UpdateHighlight()
case SMESH_DeviceActor::eSurface: case SMESH_DeviceActor::eSurface:
case SMESH_DeviceActor::eWireframe: case SMESH_DeviceActor::eWireframe:
{ {
// if ( !mySelector || !mySelector->IsSelectionEnabled() )
// myHighlitableActor->SetUnstructuredGrid( NULL );
// else if ( !myHighlitableActor->myExtractUnstructuredGrid->GetInput() )
// myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
if(myIsHighlighted) { if(myIsHighlighted) {
myHighlitableActor->SetProperty(myHighlightProp); myHighlitableActor->SetProperty(myHighlightProp);
}else if(myIsPreselected){ }else if(myIsPreselected){
@ -1902,16 +1897,16 @@ void SMESH_ActorDef::EnableSelection( bool enable )
if ( enable && ! myBaseActor->myExtractUnstructuredGrid->GetInput() ) if ( enable && ! myBaseActor->myExtractUnstructuredGrid->GetInput() )
{ {
myBaseActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid()); myBaseActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid()); //myHighlitableActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());
myBaseActor->myExtractUnstructuredGrid->Update(); myBaseActor->myExtractUnstructuredGrid->Update();
myHighlitableActor->myExtractUnstructuredGrid->Update(); //myHighlitableActor->myExtractUnstructuredGrid->Update();
} }
if ( !enable && myBaseActor->myExtractUnstructuredGrid->GetInput() ) if ( !enable && myBaseActor->myExtractUnstructuredGrid->GetInput() )
{ {
myBaseActor->SetUnstructuredGrid( NULL ); myBaseActor->SetUnstructuredGrid( NULL );
myHighlitableActor->SetUnstructuredGrid( NULL ); //myHighlitableActor->SetUnstructuredGrid( NULL );
myBaseActor->myExtractUnstructuredGrid->Update(); myBaseActor->myExtractUnstructuredGrid->Update();
myHighlitableActor->myExtractUnstructuredGrid->Update(); //myHighlitableActor->myExtractUnstructuredGrid->Update();
} }
} }
@ -2348,7 +2343,7 @@ void SMESH_ActorDef::SetOpenGLClippingPlane()
if ( !mySelector || !mySelector->IsSelectionEnabled() ) if ( !mySelector || !mySelector->IsSelectionEnabled() )
{ {
myBaseActor->SetUnstructuredGrid( NULL ); myBaseActor->SetUnstructuredGrid( NULL );
myHighlitableActor->SetUnstructuredGrid( NULL ); //myHighlitableActor->SetUnstructuredGrid( NULL );
} }
my1DActor->SetPlaneCollection( myPlaneCollection ); my1DActor->SetPlaneCollection( myPlaneCollection );
my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid()); my1DActor->SetUnstructuredGrid(myVisualObj->GetUnstructuredGrid());