refs #550: fix crash when myObject is NULL

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

diff --git a/src/HYDROGUI/HYDROGUI_Shape.cxx b/src/HYDROGUI/HYDROGUI_Shape.cxx
index f9799da5530056ac4be7f9a127f7820cf30437a9..60962d74b4c78ad4418c94c0adfa31cfce3f8b1c 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_Shape.cxx
+++ b/src/HYDROGUI/HYDROGUI_Shape.cxx
@@ -444,7 +444,7 @@ QColor HYDROGUI_Shape::getFillingColor() const
 void HYDROGUI_Shape::setBorderColor( const QColor& theColor,
                                      const bool    theToDisplay,
                                      const bool    theIsUpdateViewer )
-{
+{ 
   myBorderColor = theColor;
   updateShape( theToDisplay, theIsUpdateViewer );
 }
@@ -476,15 +476,16 @@ void HYDROGUI_Shape::setZLayer( const int theZLayer )
 
 Handle_AIS_InteractiveObject HYDROGUI_Shape::createShape() const
 {
-  if( myTopoShape.IsNull() )
+  if( myTopoShape.IsNull() ) {
     return Handle_AIS_InteractiveObject();
-  else
-    if ( myObject->IsKind( STANDARD_TYPE(HYDROData_PolylineXY) ) ||
-        myObject->IsKind( STANDARD_TYPE(HYDROData_Polyline3D)) ||
-        myObject->IsKind( STANDARD_TYPE(HYDROData_Profile) ))
-      return new HYDROGUI_Polyline(myTopoShape);
-    else
-      return new AIS_Shape( myTopoShape );
+  }
+
+  TopAbs_ShapeEnum aShapeType = myTopoShape.ShapeType();
+  if ( aShapeType==TopAbs_EDGE || aShapeType==TopAbs_WIRE ) {
+    return new HYDROGUI_Polyline( myTopoShape );
+  } else {
+    return new AIS_Shape( myTopoShape );
+  }
 }
 
 void HYDROGUI_Shape::buildShape()
@@ -587,7 +588,9 @@ void HYDROGUI_Shape::displayShape( const bool theIsUpdateViewer )
   if ( myZLayer >= 0 )
     myContext->SetZLayer( myShape, myZLayer );
 
-  myContext->UpdateCurrentViewer();
+  if ( theIsUpdateViewer ) {
+    myContext->UpdateCurrentViewer();
+  }
 }
 
 QColor HYDROGUI_Shape::getActiveColor() const