ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-12 00:29:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

IPAL53692: Display Entity menu item is available for groups and sub-meshes

Browse Source
This commit is contained in:
eap 2016-10-06 18:13:56 +03:00
parent f08f994ee3
commit b6bea82aa0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/SMESHGUI/SMESHGUI.cxx
View File

@ -4380,7 +4380,7 @@ void SMESHGUI::initialize( CAM_Application* app )
isNotEmpty("numberOfNodes <> 0"), isNotEmpty("numberOfNodes <> 0"),
// has nodes, edges, etc in VISIBLE! actor // has nodes, edges, etc in VISIBLE! actor
hasNodes("(numberOfNodes > 0 )"),//&& isVisible)"), hasNodes("(numberOfNodes > 0 ) && hasActor"),
hasElems("(count( elemTypes ) > 0)"), hasElems("(count( elemTypes ) > 0)"),
hasDifferentElems("(count( elemTypes ) > 1)"), hasDifferentElems("(count( elemTypes ) > 1)"),
hasBalls("({'BallElem'} in elemTypes)"), hasBalls("({'BallElem'} in elemTypes)"),
@ -4532,7 +4532,7 @@ void SMESHGUI::initialize( CAM_Application* app )
popupMgr()->insert( separator(), anId, -1 ); popupMgr()->insert( separator(), anId, -1 );
popupMgr()->insert( action( SMESHOp::OpDEChoose ), anId, -1 ); popupMgr()->insert( action( SMESHOp::OpDEChoose ), anId, -1 );
popupMgr()->setRule( action( SMESHOp::OpDEChoose ), aClient + "&&" + aType + "&&" + isNotEmpty, QtxPopupMgr::VisibleRule ); popupMgr()->setRule( action( SMESHOp::OpDEChoose ), aClient + "&& $type in {" + mesh + "} &&" + isNotEmpty, QtxPopupMgr::VisibleRule );
popupMgr()->insert( separator(), anId, -1 ); popupMgr()->insert( separator(), anId, -1 );

1
src/SMESHGUI/SMESHGUI_Selection.cxx
View File

@ -118,6 +118,7 @@ QVariant SMESHGUI_Selection::parameter( const int ind, const QString& p ) const
QVariant val; QVariant val;
if ( p=="client" ) val = QVariant( LightApp_Selection::parameter( p ) ); if ( p=="client" ) val = QVariant( LightApp_Selection::parameter( p ) );
else if ( p=="type" ) val = QVariant( myTypes[ind] ); else if ( p=="type" ) val = QVariant( myTypes[ind] );
else if ( p=="hasActor" ) val = QVariant( getActor( ind ) != 0 );
else if ( p=="elemTypes" ) val = QVariant( elemTypes( ind ) ); else if ( p=="elemTypes" ) val = QVariant( elemTypes( ind ) );
else if ( p=="isAutoColor" ) val = QVariant( isAutoColor( ind ) ); else if ( p=="isAutoColor" ) val = QVariant( isAutoColor( ind ) );
else if ( p=="numberOfNodes" ) val = QVariant( numberOfNodes( ind ) ); else if ( p=="numberOfNodes" ) val = QVariant( numberOfNodes( ind ) );