From aebbb9d4946373245182a32852ee6f0099e0fb7c Mon Sep 17 00:00:00 2001 From: nds Date: Mon, 31 Oct 2016 10:03:13 +0300 Subject: [PATCH] Do not update Annotation manager by erase source object presentation --- src/GEOMGUI/GEOMGUI_AnnotationMgr.cxx | 2 +- src/GEOMGUI/GEOM_Displayer.cxx | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) 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( session->activeApplication() ); - GeometryGUI* aModule = dynamic_cast( anApp->activeModule() ); - if ( aModule ) - aModule->GetAnnotationMgr()->EraseVisibleAnnotations(QString(p->GetEntry()), v); + //SUIT_Session* session = SUIT_Session::session(); + //SalomeApp_Application* anApp = dynamic_cast( session->activeApplication() ); + //GeometryGUI* aModule = dynamic_cast( anApp->activeModule() ); + //if ( aModule ) + // aModule->GetAnnotationMgr()->EraseVisibleAnnotations(QString(p->GetEntry()), v); } //================================================================= -- 2.39.2