mirror of
https://git.salome-platform.org/gitpub/modules/smesh.git
synced 2025-01-14 10:40:34 +05:00
Bug PAL11197: SMESH and VISU: In scalar bar preferences, there is no control that X+width<=1 and Y+height<=1
Warning messages was added.
This commit is contained in:
parent
96abbe1170
commit
aa036e33b7
@ -3000,6 +3000,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
{
|
||||
if( sect=="SMESH" ){
|
||||
float sbX1,sbY1,sbW,sbH;
|
||||
std::string aWarning;
|
||||
SUIT_ResourceMgr* aResourceMgr = SMESH::GetResourceMgr(this);
|
||||
if( name=="selection_object_color" || name=="selection_element_color" ||
|
||||
name=="selection_width" || name=="highlight_color" || name=="highlight_width" ||
|
||||
@ -3009,6 +3010,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_x", sbX1);
|
||||
sbW = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_width", sbW);
|
||||
if(sbX1+sbW > 1.0){
|
||||
aWarning = "Origin and Size Vertical: X+Width > 1\n";
|
||||
sbX1=0.01;
|
||||
sbW=0.05;
|
||||
aResourceMgr->setValue("SMESH", "scalar_bar_vertical_x", sbX1);
|
||||
@ -3019,6 +3021,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
sbY1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_y", sbY1);
|
||||
sbH = aResourceMgr->doubleValue("SMESH", "scalar_bar_vertical_height",sbH);
|
||||
if(sbY1+sbH > 1.0){
|
||||
aWarning = "Origin and Size Vertical: Y+Height > 1\n";
|
||||
sbY1=0.01;
|
||||
sbH=0.5;
|
||||
aResourceMgr->setValue("SMESH", "scalar_bar_vertical_y", sbY1);
|
||||
@ -3029,6 +3032,7 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
sbX1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_x", sbX1);
|
||||
sbW = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_width", sbW);
|
||||
if(sbX1+sbW > 1.0){
|
||||
aWarning = "Origin and Size Horizontal: X+Width > 1\n";
|
||||
sbX1=0.2;
|
||||
sbW=0.6;
|
||||
aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_x", sbX1);
|
||||
@ -3039,12 +3043,21 @@ void SMESHGUI::preferencesChanged( const QString& sect, const QString& name )
|
||||
sbY1 = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_y", sbY1);
|
||||
sbH = aResourceMgr->doubleValue("SMESH", "scalar_bar_horizontal_height",sbH);
|
||||
if(sbY1+sbH > 1.0){
|
||||
aWarning = "Origin and Size Horizontal: Y+Height > 1\n";
|
||||
sbY1=0.01;
|
||||
sbH=0.12;
|
||||
aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_y", sbY1);
|
||||
aResourceMgr->setValue("SMESH", "scalar_bar_horizontal_height",sbH);
|
||||
}
|
||||
}
|
||||
|
||||
if(aWarning.size() != 0){
|
||||
aWarning += "The default values are applied instead.";
|
||||
SUIT_MessageBox::warn1(SMESHGUI::desktop(),
|
||||
QObject::tr("SMESH_ERR_SCALARBAR_PARAMS"),
|
||||
QObject::tr(aWarning.c_str()),
|
||||
QObject::tr("SMESH_BUT_OK"));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -630,6 +630,10 @@ msgid "SMESH_UPDATEVIEW"
|
||||
msgstr "Update View"
|
||||
|
||||
|
||||
#Warning incorrect values
|
||||
msgid "SMESH_ERR_SCALARBAR_PARAMS"
|
||||
msgstr "Warning! The parameters is incorrect"
|
||||
|
||||
# -------------- Connectivity --------------
|
||||
|
||||
#Boundary Edges
|
||||
|
Loading…
Reference in New Issue
Block a user