Merge remote-tracking branch 'origin/BR_1321_ECW' into BR_DEMO

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

diff --git a/src/HYDROGUI/HYDROGUI_ImagePrs.cxx b/src/HYDROGUI/HYDROGUI_ImagePrs.cxx
index a96f76301941d1e9ef89c38302b19f39b895e0c8..9ebb95a148043548222315aff38e2f8e048ade61 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_ImagePrs.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImagePrs.cxx
@@ -33,21 +33,10 @@
 
 #include <TColgp_Array1OfPnt.hxx>
 
-IMPLEMENT_STANDARD_TYPE(HYDROGUI_ImagePrs)
-    IMPLEMENT_STANDARD_SUPERTYPE_ARRAY()
-    STANDARD_TYPE(AIS_InteractiveObject),
-    STANDARD_TYPE(SelectMgr_SelectableObject),
-    STANDARD_TYPE(PrsMgr_PresentableObject),
-    STANDARD_TYPE(MMgt_TShared),
-    STANDARD_TYPE(Standard_Transient),
-    IMPLEMENT_STANDARD_SUPERTYPE_ARRAY_END()
-    IMPLEMENT_STANDARD_TYPE_END(HYDROGUI_ImagePrs)
-
-    IMPLEMENT_DOWNCAST(HYDROGUI_ImagePrs,Standard_Transient)
-    IMPLEMENT_STANDARD_RTTI(HYDROGUI_ImagePrs)
-
-    HYDROGUI_ImagePrs::HYDROGUI_ImagePrs()
-    : AIS_InteractiveObject()
+IMPLEMENT_STANDARD_RTTIEXT(HYDROGUI_ImagePrs, AIS_InteractiveObject)
+
+HYDROGUI_ImagePrs::HYDROGUI_ImagePrs()
+  : AIS_InteractiveObject()
 {
 }
 
@@ -101,7 +90,7 @@ void HYDROGUI_ImagePrs::ComputeSelection( const Handle(SelectMgr_Selection)& the
         for ( int i = 0; i < myContour.size(); i++ )
             aPoints.SetValue( aPoints.Lower() + i, convert( myContour[i] ) );
 
-        Handle(Select3D_SensitiveFace) aSensitiveFace = new Select3D_SensitiveFace( anOwner, aPoints );
+        Handle(Select3D_SensitiveFace) aSensitiveFace = new Select3D_SensitiveFace( anOwner, aPoints, Select3D_TOS_INTERIOR );
         theSelection->Add( aSensitiveFace );
     }
 }
@@ -113,6 +102,9 @@ void HYDROGUI_ImagePrs::Compute( const Handle(PrsMgr_PresentationManager3d)&,
     aPrs->Clear();
     Handle(Graphic3d_Group) aGroup = Prs3d_Root::CurrentGroup( aPrs );
 
+    if( myImage.IsNull() )
+      return;
+
     if ( aMode == 0 )
     {
         Handle(Graphic3d_ArrayOfPolylines) aSegments = new Graphic3d_ArrayOfPolylines( 5 );