Merge remote-tracking branch 'remotes/origin/hydro/imps_2017_salome_83' into HEAD

[modules/geom.git] / src / GEOMGUI / GEOMGUI_AnnotationMgr.cxx

diff --git a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
index f46d527d3234957b78df5834b6b0e662f926138f..1c2e59e50eacfab8c5121c20eed1d4964bdcac64 100755 (executable)
--- a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
+++ b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
@@ -61,7 +61,7 @@ GEOMGUI_AnnotationMgr::GEOMGUI_AnnotationMgr( SalomeApp_Application* theApplicat
 
 QString GEOMGUI_AnnotationMgr::GetEntrySeparator()
 {
-       return "_annotation:";
+        return "_annotation:";
 }
 
 //================================================================
@@ -113,7 +113,7 @@ SALOME_Prs* GEOMGUI_AnnotationMgr::CreatePresentation( const GEOMGUI_AnnotationA
   setDisplayProperties( aPresentation, aView, getEntry( theObject ).c_str() );
 
   // add Prs to preview
-  SUIT_ViewWindow* vw = getApplication()->desktop()->activeWindow();
+  //SUIT_ViewWindow* vw = getApplication()->desktop()->activeWindow();
   SOCC_Prs* aPrs =
       dynamic_cast<SOCC_Prs*>( ( aView )->CreatePrs( 0 ) );
 
@@ -251,7 +251,7 @@ void GEOMGUI_AnnotationMgr::Redisplay( const QString& theEntry, const int theInd
       Handle(GEOM_Annotation) aPresentation = Handle(GEOM_Annotation)::DownCast( aPrs );
 
       GEOMGUI_AnnotationAttrs::SetupPresentation( aPresentation, theProperty, aShapeLCS );
-      aView->getAISContext()->Redisplay( aPresentation );
+      aView->getAISContext()->Redisplay( aPresentation, Standard_True );
     }
   }
 }
@@ -424,7 +424,6 @@ void GEOMGUI_AnnotationMgr::UpdateVisibleAnnotations( const QString& theEntry, S
 
       if ( !aShape.IsNull() ) {
 
-        gp_Ax3 aShapeLCS = gp_Ax3().Transformed( aShape.Location().Transformation() );
         GEOMGUI_AnnotationAttrs::SetupPresentation( aPresentation, aProperty, aShapeLCS );
         if ( aProperty.ShapeType == TopAbs_SHAPE ) {
           aPresentation->SetHilightShape( aShape );
@@ -440,7 +439,7 @@ void GEOMGUI_AnnotationMgr::UpdateVisibleAnnotations( const QString& theEntry, S
 
       setDisplayProperties( aPresentation, aView, theEntry );
 
-      aView->getAISContext()->Redisplay( aPresentation );
+      aView->getAISContext()->Redisplay( aPresentation, Standard_True );
     }
   }
   getDisplayer()->UpdateViewer();