From: vsv <vsv@opencascade.com>
Date: Mon, 27 Jun 2005 08:43:13 +0000 (+0000)
Subject: Bug 9328: Popup menu correction
X-Git-Tag: T3_0_0_a4~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a4344e4de5d289d078de2be26027922ca0f74799;p=modules%2Fvisu.git

Bug 9328: Popup menu correction
---

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index 4ccc0765..e7215415 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2177,16 +2177,16 @@ createPopupMenus()
   mgr->setRule( action( VISU_EXPORT_TABLE ), aRule, true );
   mgr->insert( separator(), -1, -1, -1 );
   aRule = "(client='ObjectBrowser' and selcount>0 and ((type='VISU::TTABLE' and nbChildren>0) "
-          "or (type='VISU::TCURVE'%1) or (type='VISU::TCONTAINER'))) "
+          "or (type='VISU::TCURVE') or (type='VISU::TCONTAINER'))) "
 	  " or (selcount>0 and $type in {"
           "'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' "
 	  "'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TVECTORS' 'VISU::TSTREAMLINES'})";
   mgr->insert( action(  VISU_ERASE ), -1, -1, -1 ); // erase
-  mgr->setRule( action( VISU_ERASE ), aRule.arg(""), true );// TODO: aRule.arg(" and isVisible=1"), true );
+  mgr->setRule( action( VISU_ERASE ), aRule + "and (isVisible=true)", true );// TODO: aRule.arg(" and isVisible=1"), true );
   mgr->insert( action(  VISU_DISPLAY ), -1, -1, -1 ); // display
-  mgr->setRule( action( VISU_DISPLAY ), aRule.arg(""), true );// TODO: aRule.arg(" and isVisible=0"), true );
+  mgr->setRule( action( VISU_DISPLAY ), aRule + "and (isVisible=false)", true );// TODO: aRule.arg(" and isVisible=0"), true );
   mgr->insert( action(  VISU_DISPLAY_ONLY ), -1, -1, -1 ); // display only
-  mgr->setRule( action( VISU_DISPLAY_ONLY ), aRule.arg(""), true );
+  mgr->setRule( action( VISU_DISPLAY_ONLY ), aRule, true );
 
   aRule = "client='ObjectBrowser' and selcount=1 and $type in {'VISU::TTABLE' "
           "'VISU::TCURVE' 'VISU::TCONTAINER' 'VISU::TMESH' 'VISU::TSCALARMAP' "
@@ -2292,9 +2292,9 @@ createPopupMenus()
   mgr->setRule( action( VISU_SWEEP ), aRule, true );
 
   // Selection info popup item
-  //  aRule = "client='ObjectBrowser' and selcount=1" + aInsideType;
-  //  mgr->insert( action(  VISU_SELECTION_INFO ), -1, -1, -1 ); // Selection info
-  //  mgr->setRule( action( VISU_SELECTION_INFO ), aRule, true );
+  aRule = "client='ObjectBrowser' and selcount=1" + aInsideType;
+  mgr->insert( action(  VISU_SELECTION_INFO ), -1, -1, -1 ); // Selection info
+  mgr->setRule( action( VISU_SELECTION_INFO ), aRule, true );
 
   aRule = "client='ObjectBrowser' and selcount>0 and $type in {'VISU::TFIELD'} and nbTimeStamps>1";
   mgr->insert( action(  VISU_ANIMATION ), -1, -1, -1 ); // animation