0019819: EDF 643 VISU : Scalar bar ergonomics. Default origin and size of scalar...

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 4a3effb5ddbbe2fce146483a9b3a5e5d1bd407a1..af06b9dd357bbf52092fcaf8e5688d9ea4ca5e64 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -33,9 +33,9 @@
     <parameter name="show_manifold_edges"      value="false"/>
     <parameter name="show_non_manifold_edges"  value="false"/>
     <parameter name="feature_edges_coloring"   value="false"/>
-    <parameter name="scalar_bar_horizontal_height" value="0.05"/>
-    <parameter name="scalar_bar_horizontal_width"  value="0.5" />
-    <parameter name="scalar_bar_horizontal_x" value="0.01"/>
+    <parameter name="scalar_bar_horizontal_height" value="0.08"/>
+    <parameter name="scalar_bar_horizontal_width"  value="0.8" />
+    <parameter name="scalar_bar_horizontal_x" value="0.1"/>
     <parameter name="scalar_bar_horizontal_y" value="0.01"/>
     <parameter name="scalar_bar_horizontal_title_size" value="0"/>
     <parameter name="scalar_bar_horizontal_label_size" value="0"/>
@@ -58,10 +58,10 @@
     <parameter name="scalar_bar_title_color"  value="255, 255, 255"/>
     <parameter name="scalar_bar_title_font"   value="Arial,Bold,Italic,Shadow,12"/>
     <parameter name="scalar_bar_display_units"   value="true"/>
-    <parameter name="scalar_bar_vertical_height" value="0.5" />
-    <parameter name="scalar_bar_vertical_width"  value="0.05"/>
+    <parameter name="scalar_bar_vertical_height" value="0.8" />
+    <parameter name="scalar_bar_vertical_width"  value="0.08"/>
     <parameter name="scalar_bar_vertical_x"      value="0.01"/>
-    <parameter name="scalar_bar_vertical_y"      value="0.01"/>
+    <parameter name="scalar_bar_vertical_y"      value="0.1"/>
     <parameter name="scalar_bar_vertical_title_height" value="0"/>
     <parameter name="scalar_bar_vertical_title_width" value="0"/>
     <parameter name="scalar_bar_vertical_label_height" value="0"/>

diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index 0ec8c5bd173eb563dfa4ab7fa01af2c61d710d1e..bcc76d29d56b761a26f13b362525b222095ce9d6 100644 (file)
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -80,8 +80,8 @@ using namespace std;
 VisuGUI_GaussScalarBarPane::VisuGUI_GaussScalarBarPane (QWidget * parent):
   QWidget(parent)
 {
-  myVerX = 0.01;  myVerY = 0.10;  myVerW = 0.10;  myVerH = 0.80;
-  myHorX = 0.20;  myHorY = 0.01;  myHorW = 0.60;  myHorH = 0.12;
+  myVerX = 0.01;  myVerY = 0.10;  myVerW = 0.08;  myVerH = 0.80;
+  myHorX = 0.10;  myHorY = 0.01;  myHorW = 0.80;  myHorH = 0.08;
   myVerTS = myVerLS = myVerBW = myVerBH = 0;
   myHorTS = myHorLS = myHorBW = myHorBH = 0;
   Imin = 0.0; Imax = 0.0;

diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
index 756e6114b5b89ce5ed6a3e47a283b6648044428f..5405386588eb4d64520092c32fa93eadfe851a62 100644 (file)
--- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
@@ -679,7 +679,7 @@ VisuGUI_ScalarBarPane::VisuGUI_ScalarBarPane( QWidget* parent, bool thePreview )
   VISU::initSpinBox(YSpin, 0.0, +1.0);
   YSpin->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
   //YSpin->setMinimumWidth( 70 );
-  YSpin->setValue( 0.01 );
+  YSpin->setValue( 0.1 );
 
   OriginGroupLayout->addWidget( XLabel, 0, 0);
   OriginGroupLayout->addWidget( XSpin,  0, 1);
@@ -803,13 +803,13 @@ void VisuGUI_ScalarBarPane::storeToResources() {
     if(orient == 0) {
       sbX1=0.01;
       sbY1=0.1;
-      sbW=0.17;
+      sbW=0.1;
       sbH=0.8;
     } else {
-      sbX1=0.2;
+      sbX1=0.1;
       sbY1=0.01;
-      sbW=0.6;
-      sbH=0.12;
+      sbW=0.8;
+      sbH=0.08;
     }
   }
 

diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
index 9bae09a89c8615311b86e0b6e3c4fc558ed80ed2..3af14b3303fd023e2ffdbaed2aaeb985ff1d322b 100644 (file)
--- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
@@ -305,7 +305,7 @@ VisuGUI_TableScalarBarPane::VisuGUI_TableScalarBarPane( QWidget* parent )
   QLabel* YLabel = new QLabel( tr( "LBL_Y" ), OriginGroup );
   YSpin = new QtxDoubleSpinBox( 0.0, 1.0, 0.1, OriginGroup );
   YSpin->setMinimumWidth( 70 );
-  YSpin->setValue( 0.01 );
+  YSpin->setValue( 0.1 );
 
   OriginGroupLayout->addWidget( XLabel );
   OriginGroupLayout->addWidget( XSpin );

diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 132724975cf9459dc1b6a30562e0d090a733ed9d..9a9f742d04237e695e7a2f5beb2d4fa4d62cff21 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -1503,19 +1503,19 @@ VISU::ColoredPrs3d_i
   // Scalar Bar origin
   QString propertyName = QString( "scalar_bar_%1_" ).arg( anOrientation == 0 ? "vertical" : "horizontal" );
 
-  vtkFloatingPointType aXorigin = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL) ? 0.01 : 0.2;
+  vtkFloatingPointType aXorigin = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL) ? 0.01 : 0.1;
   aXorigin = aResourceMgr->doubleValue("VISU", propertyName + "x", aXorigin);
   myPosition[0] = aXorigin;
 
-  vtkFloatingPointType aYorigin = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL) ? 0.1 : 0.012;
+  vtkFloatingPointType aYorigin = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL) ? 0.1 : 0.01;
   aYorigin = aResourceMgr->doubleValue("VISU", propertyName + "y", aYorigin);
   myPosition[1] = aYorigin;
 
   // Scalar Bar size
-  myWidth = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL)? 0.1 : 0.6;
+  myWidth = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL)? 0.08 : 0.8;
   myWidth = aResourceMgr->doubleValue("VISU", propertyName + "width", myWidth);
 
-  myHeight = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL)? 0.8:0.12;
+  myHeight = (myOrientation == VISU::ColoredPrs3dBase::VERTICAL)? 0.8:0.08;
   myHeight = aResourceMgr->doubleValue("VISU", propertyName + "height", myHeight);
 
   myTitleSize = 0;