Access to 'Invalid value' of altitude from Bathymetry is added.

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

diff --git a/src/HYDROGUI/HYDROGUI_PrsImage.cxx b/src/HYDROGUI/HYDROGUI_PrsImage.cxx
index d92d0e373e7d91633aab28534b6b2e3a2c099f69..4c749d571e9cb3645bfb4564cda42d0be0784e51 100644 (file)
--- a/src/HYDROGUI/HYDROGUI_PrsImage.cxx
+++ b/src/HYDROGUI/HYDROGUI_PrsImage.cxx
@@ -39,7 +39,6 @@ HYDROGUI_PrsImage::HYDROGUI_PrsImage( const Handle(HYDROData_Object)& theObject
   myIsTransformationPointPreview( false ),
   myTransformationPointMode( None )
 {
-  myHighlightCursor = new QCursor( Qt::PointingHandCursor );
   myTransformationPointCursor = new QCursor( Qt::CrossCursor );
 }
 
@@ -49,12 +48,6 @@ HYDROGUI_PrsImage::HYDROGUI_PrsImage( const Handle(HYDROData_Object)& theObject
 //=======================================================================
 HYDROGUI_PrsImage::~HYDROGUI_PrsImage()
 {
-  if( myHighlightCursor )
-  {
-    delete myHighlightCursor;
-    myHighlightCursor = 0;
-  }
-
   if( myTransformationPointCursor )
   {
     delete myTransformationPointCursor;
@@ -155,20 +148,8 @@ void HYDROGUI_PrsImage::compute()
 //================================================================
 void HYDROGUI_PrsImage::addTo( GraphicsView_ViewPort* theViewPort )
 {
-  GraphicsView_Object::addTo( theViewPort );
+  HYDROGUI_Prs::addTo( theViewPort );
   theViewPort->addItem( myPrsImageFrame );
-
-  double aZValue = 0;
-  GraphicsView_ObjectListIterator anIter( theViewPort->getObjects() );
-  while( anIter.hasNext() )
-  {
-    if( HYDROGUI_PrsImage* aPrs = dynamic_cast<HYDROGUI_PrsImage*>( anIter.next() ) )
-    {
-      double aZValueRef = aPrs->zValue();
-      aZValue = qMax( aZValue, aZValueRef );
-    }
-  }
-  setZValue( aZValue + 1 );
 }
 
 //================================================================
@@ -177,7 +158,7 @@ void HYDROGUI_PrsImage::addTo( GraphicsView_ViewPort* theViewPort )
 //================================================================
 void HYDROGUI_PrsImage::removeFrom( GraphicsView_ViewPort* theViewPort )
 {
-  GraphicsView_Object::removeFrom( theViewPort );
+  HYDROGUI_Prs::removeFrom( theViewPort );
   theViewPort->removeItem( myPrsImageFrame );
 }
 
@@ -220,7 +201,7 @@ bool HYDROGUI_PrsImage::select( double theX, double theY, const QRectF& theRect
     return true;
   }
 
-  bool anIsSelected = GraphicsView_Object::select( theX, theY, theRect );
+  bool anIsSelected = HYDROGUI_Prs::select( theX, theY, theRect );
   myPrsImageFrame->updateVisibility();
   return anIsSelected;
 }
@@ -231,8 +212,9 @@ bool HYDROGUI_PrsImage::select( double theX, double theY, const QRectF& theRect
 //================================================================
 void HYDROGUI_PrsImage::unselect()
 {
-  GraphicsView_Object::unselect();
-  myPrsImageFrame->updateVisibility();
+  HYDROGUI_Prs::unselect();
+  if( !myIsTransformationPointPreview )
+    myPrsImageFrame->updateVisibility();
 }
 
 //================================================================
@@ -241,8 +223,9 @@ void HYDROGUI_PrsImage::unselect()
 //================================================================
 void HYDROGUI_PrsImage::setSelected( bool theState )
 {
-  GraphicsView_Object::setSelected( theState );
-  myPrsImageFrame->updateVisibility();
+  HYDROGUI_Prs::setSelected( theState );
+  if( !myIsTransformationPointPreview )
+    myPrsImageFrame->updateVisibility();
 }
 
 //================================================================