Implementation of the issue 21285: EDF 1877 SMESH: Color of groups is only visible...

diff --git a/doc/salome/gui/images/pref22.png b/doc/salome/gui/images/pref22.png
index 318d36deffff570906925a63626329ff093ca76e..821e7ace5fb806aea5d7ac889b3016d8f8324895 100755 (executable)
Binary files a/doc/salome/gui/images/pref22.png and b/doc/salome/gui/images/pref22.png differ

diff --git a/doc/salome/gui/input/mesh_preferences.doc b/doc/salome/gui/input/mesh_preferences.doc
index 67fd2f31a704de38f0475e02afefd119ffad60c3..f5550a37a59c455725e7523183b13d35e4d16494 100644 (file)
--- a/doc/salome/gui/input/mesh_preferences.doc
+++ b/doc/salome/gui/input/mesh_preferences.doc
@@ -99,15 +99,15 @@ dialog box.</li>
 </ul>
 <li><b>Elements</b></li>
 <ul>
-<li><b>Fill</b>  - allows to select the color of surface of elements
+<li><b>Surface color</b>  - allows to select the color of surface of elements
 (seen in Shading mode). Click on the colored line to access to the
 \ref select_color_and_font_page "Select Color" dialog box.</li>
+<li><b>Back surface color</b> - allows to select the color of interior surface
+of elements. Use slider to select this color.  This color generated on base 
+of the <b>Surface color</b> by changing it's brightness and saturation.</li>
 <li><b>Outline</b> - allows to select the color of borders of
 elements. Click on the colored line to access to the 
 \ref select_color_and_font_page "Select Color" dialog box.</li>
-<li><b>Back Face</b> - allows to select the color of interior surface
-of elements. Click on the colored line to access to the 
-\ref select_color_and_font_page "Select Color" dialog box.</li>
 <li><b>Width</b> - allows to define the width of lines (edges and borders of elements).</li>
 <li><b>Shrink coef.</b> - allows to define relative space of elements
 compared to gaps between them in shrink mode.</li>

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index a877c5c2a5a5fdf4967cc182a1ca726f6bdf496c..5f3c83c41ae0ed104d4921f913f893e21de7f51c 100755 (executable)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.cxx
@@ -47,6 +47,8 @@
 #include <stdarg.h>
 #include <clocale>
 
+#define BICOLOR_CHANGE_HUE
+
 /*!
   \class Qtx
   \brief A set of helpful utility functions.
@@ -1197,7 +1199,13 @@ QColor Qtx::mainColorToSecondary( const QColor& color, int delta )
     int val = qMin( 255, qMax( cs.value() + delta, 0 ) );
     int sat = qMin( 255, qMax( cs.saturation() + delta-(val-cs.value()), 0 ) );
 #ifdef BICOLOR_CHANGE_HUE
-    int hue = qMin( 359, qMax( cs.hue() + delta-(val-cs.value())-(sat-cs.saturation()), 0 ) );
+    const int BICOLOR_HUE_MAXDELTA = 40;
+    int dh = delta-(val-cs.value())-(sat-cs.saturation());
+    dh = qMin( BICOLOR_HUE_MAXDELTA, qAbs( dh ) ) * ( dh > 0 ? 1 : -1 );
+    //int hue = qMin( 359, qMax( cs.hue() + delta-(val-cs.value())-(sat-cs.saturation()), 0 ) );
+    //int hue = qMin( 359, qMax( cs.hue() + delta-(val-cs.value())-ds, 0 ) );
+    int hue = cs.hue() + dh;
+    if ( hue < 0 ) hue = 360 - hue;
 #else
     int hue = cs.hue();
 #endif