Follow-up b3074ad2cc

Change random values of the S and V in HSV colors.
To avoid generation of the extremely light or dark colors we use now generated values from the range [0.65; 0.1]

src/slic3r/GUI/DoubleSlider.cpp

@@ -1,6 +1,5 @@
 #include "libslic3r/libslic3r.h"
 #include "DoubleSlider.hpp"
-#include "DoubleSlider_Utils.hpp"
 #include "libslic3r/GCode.hpp"
 #include "GUI.hpp"
 #include "GUI_App.hpp"
@@ -27,7 +26,6 @@
 #include <cmath>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
-#include <random>
 #include "Field.hpp"
 #include "format.hpp"
 #include "NotificationManager.hpp"
@@ -2562,7 +2560,7 @@ std::string TickCodeInfo::get_color_for_tick(TickCode tick, Type type, const int
     if (mode == SingleExtruder && type == ColorChange && m_use_default_colors) {
 #if 1
         if (ticks.empty())
-            return get_opposite_color((*m_colors)[0]);
+            return color_generator.get_opposite_color((*m_colors)[0]);
         
         auto before_tick_it = std::lower_bound(ticks.begin(), ticks.end(), tick);
         if (before_tick_it == ticks.end()) 
@@ -2571,24 +2569,24 @@ std::string TickCodeInfo::get_color_for_tick(TickCode tick, Type type, const int
                 if (--before_tick_it; before_tick_it->type == ColorChange)
                     break;
             if (before_tick_it->type == ColorChange)
-                return get_opposite_color(before_tick_it->color);
+                return color_generator.get_opposite_color(before_tick_it->color);
-            return get_opposite_color((*m_colors)[0]);
+            return color_generator.get_opposite_color((*m_colors)[0]);
         }
 
         if (before_tick_it == ticks.begin())
         {
             const std::string& frst_color = (*m_colors)[0];
             if (before_tick_it->type == ColorChange)
-                return get_opposite_color(frst_color, before_tick_it->color);
+                return color_generator.get_opposite_color(frst_color, before_tick_it->color);
 
             auto next_tick_it = before_tick_it;
             while (next_tick_it != ticks.end())
                 if (++next_tick_it; next_tick_it->type == ColorChange)
                     break;
             if (next_tick_it->type == ColorChange)
-                return get_opposite_color(frst_color, next_tick_it->color);
+                return color_generator.get_opposite_color(frst_color, next_tick_it->color);
 
-            return get_opposite_color(frst_color);
+            return color_generator.get_opposite_color(frst_color);
         }
 
         std::string frst_color = "";
@@ -2609,13 +2607,13 @@ std::string TickCodeInfo::get_color_for_tick(TickCode tick, Type type, const int
 
         if (before_tick_it->type == ColorChange) {
             if (frst_color.empty())
-                return get_opposite_color(before_tick_it->color);
+                return color_generator.get_opposite_color(before_tick_it->color);
-            return get_opposite_color(before_tick_it->color, frst_color);
+            return color_generator.get_opposite_color(before_tick_it->color, frst_color);
         }
 
         if (frst_color.empty())
-            return get_opposite_color((*m_colors)[0]);
+            return color_generator.get_opposite_color((*m_colors)[0]);
-        return get_opposite_color((*m_colors)[0], frst_color);
+        return color_generator.get_opposite_color((*m_colors)[0], frst_color);
 #else
         const std::vector<std::string>& colors = ColorPrintColors::get();
         if (ticks.empty())

src/slic3r/GUI/DoubleSlider.hpp

@@ -3,6 +3,7 @@
 
 #include "libslic3r/CustomGCode.hpp"
 #include "wxExtensions.hpp"
+#include "DoubleSlider_Utils.hpp"
 
 #include <wx/window.h>
 #include <wx/control.h>
@@ -118,6 +119,7 @@ class TickCodeInfo
 //    int         m_default_color_idx = 0;
 
     std::vector<std::string>* m_colors {nullptr};
+    ColorGenerator color_generator;
 
     std::string get_color_for_tick(TickCode tick, Type type, const int extruder);
 

src/slic3r/GUI/DoubleSlider_Utils.hpp

@@ -1,8 +1,11 @@
 #include <stdio.h>
+#include <random>
+
 #include "wx/colour.h"
 
-// next code is borrowed from https://stackoverflow.com/questions/3018313/algorithm-to-convert-rgb-to-hsv-and-hsv-to-rgb-in-range-0-255-for-both
+class ColorGenerator
-
+{
+    // Some of next code is borrowed from https://stackoverflow.com/questions/3018313/algorithm-to-convert-rgb-to-hsv-and-hsv-to-rgb-in-range-0-255-for-both
     typedef struct {
         double r;       // a fraction between 0 and 1
         double g;       // a fraction between 0 and 1
@@ -15,8 +18,8 @@ typedef struct {
         double v;       // a fraction between 0 and 1
     } hsv;
 
-static hsv   rgb2hsv(rgb in);
+    //static hsv   rgb2hsv(rgb in);
-static rgb   hsv2rgb(hsv in);
+    //static rgb   hsv2rgb(hsv in);
 
     hsv rgb2hsv(rgb in)
     {
@@ -39,7 +42,8 @@ hsv rgb2hsv(rgb in)
         }
         if (max > 0.0) { // NOTE: if Max is == 0, this divide would cause a crash
             out.s = (delta / max);                  // s
-    } else {
+        }
+        else {
             // if max is 0, then r = g = b = 0              
             // s = 0, h is undefined
             out.s = 0.0;
@@ -128,11 +132,24 @@ rgb hsv2rgb(hsv in)
         return out;
     }
 
+    std::random_device rd;
+
+public:
+
+    ColorGenerator() {}
+    ~ColorGenerator() {}
+
     double rand_val()
     {
-    return 0.1 * (10 - rand() % 8);
+        std::mt19937 rand_generator(rd());
+
+        // this value will be used for Saturation and Value
+        // to avoid extremely light/dark colors, take this value from range [0.65; 1.0]
+        std::uniform_real_distribution<double> distrib(0.65, 1.0);
+        return distrib(rand_generator);
     }
 
+
     std::string get_opposite_color(const std::string& color)
     {
         std::string opp_color = "";
@@ -171,3 +188,4 @@ std::string get_opposite_color(const std::string& color_frst, const std::string&
 
         return opp_color;
     }
+};