From 11144d3576787257423072dc60502f1a9cdc2557 Mon Sep 17 00:00:00 2001
From: ouv <ouv@opencascade.com>
Date: Fri, 23 Oct 2009 08:51:26 +0000
Subject: [PATCH] Bug IPAL21436 - TC5.1.3 Call of Pop-up onLocal Coordinate
 System is Attempt to access to null object, SIGSEGV. Regress

---
 src/DisplayGUI/DisplayGUI.cxx     | 52 ++++++++++++++++---------------
 src/GEOMGUI/GEOMGUI_Selection.cxx | 43 ++++++++++++-------------
 2 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx
index 952007b0a..44a14839c 100644
--- a/src/DisplayGUI/DisplayGUI.cxx
+++ b/src/DisplayGUI/DisplayGUI.cxx
@@ -511,18 +511,18 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
       SVTK_Prs* vtkPrs =
         stvkViewer ? dynamic_cast<SVTK_Prs*>( stvkViewer->CreatePrs( It.Value()->getEntry() ) ) : 0;
       if ( vtkPrs && !vtkPrs->IsNull() ) {
-	if ( mode == 0 )
-	  aView->ChangeRepresentationToWireframe( vtkPrs->GetObjects() );
-	else if ( mode == 1 )
-	  aView->ChangeRepresentationToSurface( vtkPrs->GetObjects() );
-	else if ( mode == 2 ) {
-	  vtkActorCollection* anActors = vtkPrs->GetObjects();
-	  anActors->InitTraversal();
-	  while (vtkActor* anAct = anActors->GetNextActor()) {
-	    GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(anAct);
-	    aGeomActor->SetVectorMode(!aGeomActor->GetVectorMode());
-	  }
-	}
+        if ( mode == 0 )
+          aView->ChangeRepresentationToWireframe( vtkPrs->GetObjects() );
+        else if ( mode == 1 )
+          aView->ChangeRepresentationToSurface( vtkPrs->GetObjects() );
+        else if ( mode == 2 ) {
+          vtkActorCollection* anActors = vtkPrs->GetObjects();
+          anActors->InitTraversal();
+          while (vtkActor* anAct = anActors->GetNextActor()) {
+            GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(anAct);
+            aGeomActor->SetVectorMode(!aGeomActor->GetVectorMode());
+          }
+        }
       }
     }
     aView->Repaint();
@@ -538,19 +538,21 @@ void DisplayGUI::ChangeDisplayMode( const int mode, SUIT_ViewWindow* viewWindow
       SOCC_Viewer* soccViewer = (SOCC_Viewer*)(viewWindow->getViewManager()->getViewModel());
       SOCC_Prs* occPrs = dynamic_cast<SOCC_Prs*>( soccViewer->CreatePrs( It.Value()->getEntry() ) );
       if ( occPrs && !occPrs->IsNull() ) {
-	AIS_ListOfInteractive shapes; occPrs->GetObjects( shapes );
-	AIS_ListIteratorOfListOfInteractive interIter( shapes );
-	for ( ; interIter.More(); interIter.Next() ) {
-	  if ( mode == 0 )
-	    ic->SetDisplayMode( interIter.Value(), AIS_WireFrame, false );
-	  else if ( mode == 1 )
-	    ic->SetDisplayMode( interIter.Value(), AIS_Shaded, false );
-	  if (mode == 2 ) {
-	    Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast( interIter.Value() );
-	    aSh->SetDisplayVectors(!aSh->isShowVectors());
-	    ic->RecomputePrsOnly(interIter.Value());
-	  }
-	}
+        AIS_ListOfInteractive shapes; occPrs->GetObjects( shapes );
+        AIS_ListIteratorOfListOfInteractive interIter( shapes );
+        for ( ; interIter.More(); interIter.Next() ) {
+          if ( mode == 0 )
+            ic->SetDisplayMode( interIter.Value(), AIS_WireFrame, false );
+          else if ( mode == 1 )
+            ic->SetDisplayMode( interIter.Value(), AIS_Shaded, false );
+          if (mode == 2 ) {
+            Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast( interIter.Value() );
+            if ( !aSh.IsNull() ) {
+              aSh->SetDisplayVectors(!aSh->isShowVectors());
+              ic->RecomputePrsOnly(interIter.Value());
+            }
+          }
+        }
       }
     }
     ic->UpdateCurrentViewer();
diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx
index 593d80550..f17dfceeb 100644
--- a/src/GEOMGUI/GEOMGUI_Selection.cxx
+++ b/src/GEOMGUI/GEOMGUI_Selection.cxx
@@ -195,28 +195,29 @@ bool GEOMGUI_Selection::isVectorsMode( const int index ) const
     SALOME_Prs* prs = view->CreatePrs( entry( index ).toLatin1().constData() );
     if ( prs ) {
       if ( viewType == OCCViewer_Viewer::Type() ) { // assuming OCC
-	SOCC_Prs* occPrs = (SOCC_Prs*) prs;
-	AIS_ListOfInteractive lst;
-	occPrs->GetObjects( lst );
-	if ( lst.Extent() ) {
-	  Handle(AIS_InteractiveObject) io = lst.First();
-	  if ( !io.IsNull() ) {
-	    Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io);
-	    ret = aSh->isShowVectors();
-	  }
-	}
+        SOCC_Prs* occPrs = (SOCC_Prs*) prs;
+        AIS_ListOfInteractive lst;
+        occPrs->GetObjects( lst );
+        if ( lst.Extent() ) {
+          Handle(AIS_InteractiveObject) io = lst.First();
+          if ( !io.IsNull() ) {
+            Handle(GEOM_AISShape) aSh = Handle(GEOM_AISShape)::DownCast(io);
+            if ( !aSh.IsNull() )
+              ret = aSh->isShowVectors();
+          }
+        }
       } else if ( viewType == SVTK_Viewer::Type() ) { // assuming VTK
-	SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( prs );
-	vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0;
-	if ( lst ) {
-	  lst->InitTraversal();
-	  vtkActor* actor = lst->GetNextActor();
-	  if ( actor ) {
-	    GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(actor);
-	    if ( aGeomActor )
-	      ret = aGeomActor->GetVectorMode();
-	  }
-	}
+        SVTK_Prs* vtkPrs = dynamic_cast<SVTK_Prs*>( prs );
+        vtkActorCollection* lst = vtkPrs ? vtkPrs->GetObjects() : 0;
+        if ( lst ) {
+          lst->InitTraversal();
+          vtkActor* actor = lst->GetNextActor();
+          if ( actor ) {
+            GEOM_Actor* aGeomActor = GEOM_Actor::SafeDownCast(actor);
+            if ( aGeomActor )
+              ret = aGeomActor->GetVectorMode();
+          }
+        }
       }
     }
   }