mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-03-01 11:15:37 +05:00
Fix for Bug NPAL16771 (EDF 556 SMESH : Can't select some groups of nodes in the VTK view).
This commit is contained in:
parent
a78f064b8c
commit
9010d190b3
@ -16,6 +16,7 @@
|
|||||||
<parameter name="selection_object_color" value="255, 255, 255"/>
|
<parameter name="selection_object_color" value="255, 255, 255"/>
|
||||||
<parameter name="selection_precision_element" value="0.005"/>
|
<parameter name="selection_precision_element" value="0.005"/>
|
||||||
<parameter name="selection_precision_node" value="0.005"/>
|
<parameter name="selection_precision_node" value="0.005"/>
|
||||||
|
<parameter name="selection_precision_object" value="0.005"/>
|
||||||
<parameter name="selection_width" value="5"/>
|
<parameter name="selection_width" value="5"/>
|
||||||
<parameter name="highlight_width" value="5"/>
|
<parameter name="highlight_width" value="5"/>
|
||||||
<parameter name="controls_precision" value="0"/>
|
<parameter name="controls_precision" value="0"/>
|
||||||
|
@ -3077,6 +3077,7 @@ void SMESHGUI::createPreferences()
|
|||||||
|
|
||||||
addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" );
|
addPreference( tr( "PREF_NODES" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_node" );
|
||||||
addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
|
addPreference( tr( "PREF_ELEMENTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_element" );
|
||||||
|
addPreference( tr( "PREF_OBJECTS" ), precSelGroup, LightApp_Preferences::Double, "SMESH", "selection_precision_object" );
|
||||||
|
|
||||||
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
|
int sbarTab = addPreference( tr( "SMESH_SCALARBAR" ) );
|
||||||
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
|
int fontGr = addPreference( tr( "SMESH_FONT_SCALARBAR" ), sbarTab );
|
||||||
@ -3167,7 +3168,8 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
|||||||
SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
|
SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
|
||||||
if( name=="selection_object_color" || name=="selection_element_color" ||
|
if( name=="selection_object_color" || name=="selection_element_color" ||
|
||||||
name=="selection_width" || name=="highlight_color" || name=="highlight_width" ||
|
name=="selection_width" || name=="highlight_color" || name=="highlight_width" ||
|
||||||
name=="selection_precision_node" || name=="selection_precision_element" )
|
name=="selection_precision_node" || name=="selection_precision_element" ||
|
||||||
|
name=="selection_precision_object")
|
||||||
SMESH::UpdateSelectionProp( this );
|
SMESH::UpdateSelectionProp( this );
|
||||||
else if (name == QString("scalar_bar_vertical_x") || name == QString("scalar_bar_vertical_width")){
|
else if (name == QString("scalar_bar_vertical_x") || name == QString("scalar_bar_vertical_width")){
|
||||||
sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_x", sbX1);
|
sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_x", sbX1);
|
||||||
|
@ -652,7 +652,8 @@ namespace SMESH {
|
|||||||
PW = mgr->integerValue( "SMESH", "highlight_width", 5 );
|
PW = mgr->integerValue( "SMESH", "highlight_width", 5 );
|
||||||
|
|
||||||
double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ),
|
double SP1 = mgr->doubleValue( "SMESH", "selection_precision_node", 0.025 ),
|
||||||
SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 );
|
SP2 = mgr->doubleValue( "SMESH", "selection_precision_element", 0.001 ),
|
||||||
|
SP3 = mgr->doubleValue( "SMESH", "selection_precision_object", 0.025 );
|
||||||
|
|
||||||
for ( int i=0, n=views.count(); i<n; i++ ){
|
for ( int i=0, n=views.count(); i<n; i++ ){
|
||||||
// update VTK viewer properties
|
// update VTK viewer properties
|
||||||
@ -663,7 +664,7 @@ namespace SMESH {
|
|||||||
aSelColor.blue()/255.,
|
aSelColor.blue()/255.,
|
||||||
SW );
|
SW );
|
||||||
// tolerances
|
// tolerances
|
||||||
aVtkView->SetSelectionTolerance(SP1, SP2);
|
aVtkView->SetSelectionTolerance(SP1, SP2, SP3);
|
||||||
|
|
||||||
// pre-selection
|
// pre-selection
|
||||||
aVtkView->SetPreselectionProp(aPreColor.red()/255.,
|
aVtkView->SetPreselectionProp(aPreColor.red()/255.,
|
||||||
|
@ -3232,6 +3232,9 @@ msgstr "Nodes"
|
|||||||
msgid "SMESHGUI::PREF_ELEMENTS"
|
msgid "SMESHGUI::PREF_ELEMENTS"
|
||||||
msgstr "Elements"
|
msgstr "Elements"
|
||||||
|
|
||||||
|
msgid "SMESHGUI::PREF_OBJECTS"
|
||||||
|
msgstr "Objects"
|
||||||
|
|
||||||
msgid "SMESHGUI::PREF_DISPLAY_MODE"
|
msgid "SMESHGUI::PREF_DISPLAY_MODE"
|
||||||
msgstr "Display mode"
|
msgstr "Display mode"
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user