ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-08 09:47:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

Temporary fix for '23552: Unable to use the contextual menu of Object Browser window' issue.

Browse Source
This commit is contained in:
rnv 2018-05-29 16:00:15 +03:00
parent a3a641c09a
commit 1be0dcd9a7
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/SalomeApp.xml.in
View File

@ -69,7 +69,7 @@
<parameter name="geom_preview" value="true" /> <parameter name="geom_preview" value="true" />
<parameter name="hide_input_object" value="true" /> <parameter name="hide_input_object" value="true" />
<parameter name="material" value="[ Default ]" /> <parameter name="material" value="[ Default ]" />
<parameter name="predef_materials" value="true" /> <parameter name="predef_materials" value="false" />
<parameter name="edge_width" value="1" /> <parameter name="edge_width" value="1" />
<parameter name="isolines_width" value="1" /> <parameter name="isolines_width" value="1" />
<parameter name="preview_edge_width" value="1" /> <parameter name="preview_edge_width" value="1" />

11
src/GEOMGUI/GeometryGUI.cxx
View File

@ -2266,7 +2266,11 @@ void GeometryGUI::contextMenuPopup( const QString& client, QMenu* menu, QString&
getApp()->selectionMgr()->selectedObjects( lst ); getApp()->selectionMgr()->selectedObjects( lst );
//Add submenu for predefined materials //Add submenu for predefined materials
bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" ); // RNV: '#23552: Unable to use the contextual menu of Object Browser window' issue:
// Temporary solution: do not show 'Materials' submenu forcibly
//bool isPredefMat = SUIT_Session::session()->resourceMgr()->booleanValue( "Geometry", "predef_materials" );
bool isPredefMat = false;
if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() > 0 ) { if ( ( client == "OCCViewer" || client == "VTKViewer" ) && lst.Extent() > 0 ) {
QtxPopupMgr* mgr = popupMgr(); QtxPopupMgr* mgr = popupMgr();
//get parrent for submenu //get parrent for submenu
@ -2386,8 +2390,9 @@ void GeometryGUI::createPreferences()
int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup, int defl = addPreference( tr( "PREF_DEFLECTION" ), genGroup,
LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" ); LightApp_Preferences::DblSpin, "Geometry", "deflection_coeff" );
addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup, // RNV: Temporary hide this preference, because of the '#23552: Unable to use the contextual menu of Object Browser window' issue
LightApp_Preferences::Bool, "Geometry", "predef_materials" ); //addPreference( tr( "PREF_PREDEF_MATERIALS" ), genGroup,
// LightApp_Preferences::Bool, "Geometry", "predef_materials" );
int material = addPreference( tr( "PREF_MATERIAL" ), genGroup, int material = addPreference( tr( "PREF_MATERIAL" ), genGroup,
LightApp_Preferences::Selector, LightApp_Preferences::Selector,