From: nds <natalia.ermolaeva@opencascade.com>
Date: Mon, 31 Oct 2016 07:03:13 +0000 (+0300)
Subject: Do not update Annotation manager by erase source object presentation
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=aebbb9d4946373245182a32852ee6f0099e0fb7c;p=modules%2Fgeom.git

Do not update Annotation manager by erase source object presentation
---

diff --git a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
index 4c37abb47..91d063a07 100755
--- a/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
+++ b/src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx
@@ -270,7 +270,7 @@ void GEOMGUI_AnnotationMgr::setDisplayedIndicesInfo( const QString& theEntry, SA
 
   QStringList anIndices = theIndicesInfo.split( ";" );
   for ( int i = 0, aCount = anIndices.size(); i < aCount; i++ ) {
-    Display( theEntry, anIndices[i], theView );
+    Display( theEntry, anIndices[i].toInt(), theView );
   }
 }
 
diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx
index 4e8c747aa..2727281fc 100755
--- a/src/GEOMGUI/GEOM_Displayer.cxx
+++ b/src/GEOMGUI/GEOM_Displayer.cxx
@@ -2179,11 +2179,11 @@ void GEOM_Displayer::AfterErase( SALOME_View* v, const SALOME_OCCPrs* p )
   UpdateColorScale(false,false);
 
   // hide annotations for erased presentation
-  SUIT_Session* session = SUIT_Session::session();
-  SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( session->activeApplication() );
-  GeometryGUI* aModule = dynamic_cast<GeometryGUI*>( anApp->activeModule() );
-  if ( aModule )
-    aModule->GetAnnotationMgr()->EraseVisibleAnnotations(QString(p->GetEntry()), v);
+  //SUIT_Session* session = SUIT_Session::session();
+  //SalomeApp_Application* anApp = dynamic_cast<SalomeApp_Application*>( session->activeApplication() );
+  //GeometryGUI* aModule = dynamic_cast<GeometryGUI*>( anApp->activeModule() );
+  //if ( aModule )
+  //  aModule->GetAnnotationMgr()->EraseVisibleAnnotations(QString(p->GetEntry()), v);
 }
 
 //=================================================================