This commit is contained in:
eap 2011-11-17 08:34:15 +00:00
parent c59b4d47bb
commit 5ced91ed62

View File

@ -1637,18 +1637,18 @@ void SMESH_ActorDef::UpdateHighlight(){
case SMESH_DeviceActor::eWireframe: case SMESH_DeviceActor::eWireframe:
{ {
if(myIsHighlighted) { if(myIsHighlighted) {
myHighlitableActor->SetProperty(myHighlightProp); myHighlitableActor->SetProperty(myHighlightProp);
}else if(myIsPreselected){ }else if(myIsPreselected){
myHighlitableActor->SetProperty(myPreselectProp); myHighlitableActor->SetProperty(myPreselectProp);
} else if(anIsVisible){ } else if(anIsVisible){
(myRepresentation == eSurface) ? (myRepresentation == eSurface) ?
myHighlitableActor->SetProperty(myOutLineProp) : myHighlitableActor->SetProperty(myEdgeProp); myHighlitableActor->SetProperty(myOutLineProp) : myHighlitableActor->SetProperty(myEdgeProp);
} }
if(GetUnstructuredGrid()->GetNumberOfCells()) { if(GetUnstructuredGrid()->GetNumberOfCells()) {
myHighlitableActor->SetHighlited(anIsVisible); myHighlitableActor->SetHighlited(anIsVisible);
myHighlitableActor->GetExtractUnstructuredGrid()-> myHighlitableActor->GetExtractUnstructuredGrid()->
SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::eCells); SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::eCells);
myHighlitableActor->SetRepresentation(SMESH_DeviceActor::eWireframe); myHighlitableActor->SetRepresentation(SMESH_DeviceActor::eWireframe);
} }
myHighlitableActor->SetVisibility(anIsVisible); myHighlitableActor->SetVisibility(anIsVisible);
break; break;
@ -1656,11 +1656,11 @@ void SMESH_ActorDef::UpdateHighlight(){
case SMESH_DeviceActor::ePoint: case SMESH_DeviceActor::ePoint:
{ {
if(myIsHighlighted) { if(myIsHighlighted) {
myNodeActor->SetProperty(myHighlightProp); myNodeActor->SetProperty(myHighlightProp);
}else if(myIsPreselected) { }else if(myIsPreselected) {
myNodeActor->SetProperty(myPreselectProp); myNodeActor->SetProperty(myPreselectProp);
} else if(anIsVisible) { } else if(anIsVisible) {
myNodeActor->SetProperty(myNodeProp); myNodeActor->SetProperty(myNodeProp);
} }
myNodeActor->SetRepresentation(SMESH_DeviceActor::ePoint); myNodeActor->SetRepresentation(SMESH_DeviceActor::ePoint);
myNodeActor->GetExtractUnstructuredGrid()->SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::ePoints); myNodeActor->GetExtractUnstructuredGrid()->SetModeOfExtraction(VTKViewer_ExtractUnstructuredGrid::ePoints);