From: mzn <mzn@opencascade.com>
Date: Wed, 29 Jun 2005 12:35:32 +0000 (+0000)
Subject: Fix for bug IPAL9242(3.0.0: Activation of OCC viewer breaks current VTK viewer in... 
X-Git-Tag: V3_0_1~32
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=53fd9e1ce57ad2741ec99c39723973b1633db672;p=modules%2Fsmesh.git

Fix for bug IPAL9242(3.0.0: Activation of OCC viewer breaks current VTK viewer in Mesh).
---

diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index 29840349b..6a7cd010a 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -3053,7 +3053,8 @@ void SMESHGUI::initialize( CAM_Application* app )
   // Display / Erase
   //-------------------------------------------------
   aClient = "($client in {'VTKViewer' 'ObjectBrowser'})";
-  QString aRule = aClient + " and " + aType + " and " + aSelCount;
+  QString anActiveVTK = QString("activeView = '%1'").arg(VTKViewer_Viewer::Type());
+  QString aRule = aClient + " and " + aType + " and " + aSelCount + " and " + anActiveVTK;
   popupMgr()->insert( action( 301 ), -1, -1 ); // DISPLAY
   popupMgr()->setRule( action( 301 ), aRule + "&&" + isNotEmpty + "&&" + isInvisible, true);