Bug PAL11197: SMESH and VISU: In scalar bar preferences, there is no control that...

Warning messages was added.

diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po
index 0cd7807bb5eae8b6cc376926f8099c13a23b05c7..eb50916fbfffa6d6a0d46405da72ae53bd25756a 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.po
+++ b/src/VISUGUI/VISU_msg_en.po
@@ -389,6 +389,8 @@ msgstr "Error has been occured during exporting to file"
 msgid "VisuGUI::ERR_ACTIVATE_VIEW3D"
 msgstr "Please activate 3D view before"
 
+msgid "VisuGUI::ERR_SCALARBAR_PARAMS"
+msgstr "Warning! The parameters is incorrect"
 
 msgid "VisuGUI::FLT_ALL_FILES"
 msgstr "All Files (*.*)"

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index f59460c8e0fde02dab29521691116725a4be7432..f5f1a2ed5a7726e2fb2c890fc8c23b4dc205fd46 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -2993,10 +2993,12 @@ void VisuGUI::preferencesChanged( const QString& a, const QString& b)
   if (b == QString("scalar_bar_orientation")) return;
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
   float sbX1,sbY1,sbW,sbH;
+  std::string aWarning;
   if(b == QString("scalar_bar_vertical_x") || b == QString("scalar_bar_vertical_width")){
     sbX1 = aResourceMgr->doubleValue("VISU", "scalar_bar_vertical_x", sbX1);
     sbW = aResourceMgr->doubleValue("VISU", "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("VISU", "scalar_bar_vertical_x", sbX1);
@@ -3007,6 +3009,7 @@ void VisuGUI::preferencesChanged( const QString& a, const QString& b)
     sbY1 = aResourceMgr->doubleValue("VISU", "scalar_bar_vertical_y", sbY1);
     sbH = aResourceMgr->doubleValue("VISU", "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("VISU", "scalar_bar_vertical_y", sbY1);
@@ -3017,6 +3020,7 @@ void VisuGUI::preferencesChanged( const QString& a, const QString& b)
     sbX1 = aResourceMgr->doubleValue("VISU", "scalar_bar_horizontal_x", sbX1);
     sbW = aResourceMgr->doubleValue("VISU", "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("VISU", "scalar_bar_horizontal_x", sbX1);
@@ -3027,12 +3031,20 @@ void VisuGUI::preferencesChanged( const QString& a, const QString& b)
     sbY1 = aResourceMgr->doubleValue("VISU", "scalar_bar_horizontal_y", sbY1);
     sbH = aResourceMgr->doubleValue("VISU", "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("VISU", "scalar_bar_horizontal_y", sbY1);
       aResourceMgr->setValue("VISU", "scalar_bar_horizontal_height",sbH);
     }
   }
+  if (aWarning.size() != 0){
+    aWarning += "The default values are applied instead.";
+    SUIT_MessageBox::warn1(GetDesktop(this),
+                          tr("ERR_SCALARBAR_PARAMS"),
+                          tr(aWarning.c_str()),
+                          tr("BUT_OK") );
+  }
 }
 
 SUIT_ViewManager*