refs #550: fix crash when myObject is NULL

[modules/hydro.git] / src / HYDROGUI / HYDROGUI_AISTrihedron.cxx

diff --git a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
index edc6b5520c548b71358f6bea83b2412746a226ca..3642aaa88fedf61912cdb1156fc55eaf3c267d4d 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
+++ b/src/HYDROGUI/HYDROGUI_AISTrihedron.cxx
@@ -1,12 +1,8 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015  EDF-R&D
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -26,7 +22,7 @@
 #include <Prs3d_DatumAspect.hxx>
 #include <Prs3d_LineAspect.hxx>
 #include <Prs3d_Presentation.hxx>
-#include <AIS_Drawer.hxx>
+#include <Prs3d_Drawer.hxx>
 #include <DsgPrs_XYZAxisPresentation.hxx>
 #include <gp_Ax2.hxx>
 
@@ -46,13 +42,14 @@ Handle(AIS_Trihedron) HYDROGUI_AISTrihedron::createTrihedron( double theSize )
   aTrihedron->SetArrowColor( aCol.Name() );
   aTrihedron->SetSize( theSize );
 
-  Handle(AIS_Drawer) aDrawer = aTrihedron->Attributes();
-  if ( aDrawer->HasDatumAspect() ) {
+  Handle(Prs3d_Drawer) aDrawer = aTrihedron->Attributes();
+  if ( aDrawer->HasOwnDatumAspect() ) {
     Handle(Prs3d_DatumAspect) aDaspect = aDrawer->DatumAspect();
     aDaspect->FirstAxisAspect()->SetColor( Quantity_Color( 1.0, 0.0, 0.0, Quantity_TOC_RGB ) );
     aDaspect->SecondAxisAspect()->SetColor( Quantity_Color( 0.0, 1.0, 0.0, Quantity_TOC_RGB ) );
     aDaspect->ThirdAxisAspect()->SetColor( Quantity_Color( 0.0, 0.0, 1.0, Quantity_TOC_RGB ) );
   }
+  
   aTrihedron->SetAxis2Placement();
   return aTrihedron;
 }