Updated Color_map file and use the method

Lab/demo/Lab/Color_map.h

@@ -39,6 +39,30 @@ compute_color_map(QColor base_color,
   return out;
 }
 
+template <typename Output_color_iterator>
+Output_color_iterator
+compute_deterministic_color_map(QColor base_color,
+                                std::size_t nb_of_colors,
+                                Output_color_iterator out)
+{
+  qreal hue = base_color.hueF();
+  qreal saturation = base_color.saturationF();
+  qreal value = base_color.valueF();
+  const qreal hue_step = (hue == -1) ? 0 : (static_cast<qreal>(1)) / nb_of_colors;
+
+  if (hue == -1)
+    hue = 0;
+  for(std::size_t i=0; i<nb_of_colors; ++i)
+  {
+    hue += hue_step;
+    if(hue > 1)
+      hue -= 1;
+    *out++ = QColor::fromHsvF(hue, saturation, value);
+  }
+
+  return out;
+}
+
 inline QColor generate_random_color()
 {
   std::size_t h = static_cast<std::size_t>(std::rand() % 360);

Lab/demo/Lab/Scene_image_item.cpp

@@ -11,6 +11,8 @@
 #include <CGAL/use.h>
 #include <QApplication>
 
+#include "Color_map.h"
+
 // -----------------------------------
 // Internal classes
 // -----------------------------------
@@ -88,15 +90,15 @@ Image_accessor<Word_type>::Image_accessor(const Image& im, int dx, int dy, int d
     }
   }
 
-  const double nb_Colors = colors_.size()+1;
+  // Compute subdomains colors (the background has no color)
-  double i=0;
+
-  const double starting_hue = default_color.hueF();
+  std::vector<QColor> subdomain_colors;
-  for ( auto it = colors_.begin(),
+  compute_deterministic_color_map(default_color, colors_.size(), std::back_inserter(subdomain_colors));
-       end = colors_.end() ; it != end ; ++it, i += 1.)
+
+  int i = 0;
+  for (auto& it : colors_)
   {
-    double hue =  starting_hue + 1./nb_Colors * i;
+    it.second = subdomain_colors[i++];
-    if ( hue > 1. ) { hue -= 1.; }
-    it->second = QColor::fromHsvF(hue, default_color.saturationF(), default_color.valueF());
   }
 }
 

Lab/demo/Lab/Scene_triangulation_3_item.cpp

@@ -44,6 +44,7 @@
 #include <CGAL/IO/Color.h>
 
 #include "Scene_polygon_soup_item.h"
+#include "Color_map.h"
 
 
 typedef CGAL::AABB_triangulation_3_cell_primitive<EPICK,
@@ -941,49 +942,40 @@ Scene_triangulation_3_item::update_histogram()
 }
 
 void
-Scene_triangulation_3_item_priv::compute_color_map(const QColor& default_color)
+Scene_triangulation_3_item_priv::compute_color_map(const QColor& base_color)
 {
   typedef Indices::size_type size_type;
 
-  float default_hue = default_color.hueF();
+  // Set colors of surface patches
-  float default_saturation = default_color.saturationF();
+  std::vector<QColor> surface_colors;
-  float default_value = default_color.valueF();
+  // the first color is the background and is unused
-  if (default_hue < 0)
+  surface_colors.push_back(base_color);
+  float patch_hsv_value = use_subdomain_colors ? fmod(base_color.valueF() + .5, 1.) : base_color.valueF();
+  if (surface_patch_indices_.size() > 1)
+    compute_deterministic_color_map(
+            QColor::fromHsvF(base_color.hueF(), base_color.saturationF(), patch_hsv_value),
+            surface_patch_indices_.size()-1, std::back_inserter(surface_colors));
+
+  int i = 0;
+  for (Indices::iterator it = surface_patch_indices_.begin(); it != surface_patch_indices_.end(); ++it)
   {
-    default_hue = 0;
+    colors[*it] = surface_colors[i++];
   }
 
-  const size_type nb_patch_indices = surface_patch_indices_.size();
+  // Set colors of subdomains
-  float i = 0;
+  std::vector<QColor> subdomain_colors;
-  float patch_hsv_value = use_subdomain_colors ? fmod(default_value + .5, 1.) : default_value;
+  // the first color is either the background or the unique domain
-  Indices::iterator it = surface_patch_indices_.begin();
+  subdomain_colors.push_back(base_color);
-  if (it != surface_patch_indices_.end())
+  if (subdomain_indices_.size() > 1)
-  {
+    compute_deterministic_color_map(base_color, subdomain_indices_.size()-1, std::back_inserter(subdomain_colors));
-    // the first color is probably the background
-    colors[*it] = QColor::fromHsvF(default_hue, default_saturation, patch_hsv_value);
-    for (++it; it != surface_patch_indices_.end(); ++it, i += 1.)
-    {
-      float hue = default_hue + 1. / static_cast<float>(nb_patch_indices) * i;
-      if (hue > 1) { hue -= 1.; }
-      colors[*it] = QColor::fromHsvF(hue, default_saturation, patch_hsv_value);
-    }
-  }
 
-  const size_type nb_domains = subdomain_indices_.size();
   i = 0;
-  it = subdomain_indices_.begin();
+  for (Indices::iterator it = subdomain_indices_.begin(); it != subdomain_indices_.end(); ++it)
-  if (it != subdomain_indices_.end())
   {
-    // the first color is probably the background
+    colors_subdomains[*it] = subdomain_colors[i++];
-    colors_subdomains[*it] = QColor::fromHsvF(default_hue, default_saturation, default_value);
-    for (++it; it != subdomain_indices_.end(); ++it, i += 1.)
-    {
-      float hue = default_hue + 1. / static_cast<float>(nb_domains) * i;
-      if (hue > 1) { hue -= 1.; }
-      colors_subdomains[*it] = QColor::fromHsvF(hue, default_saturation, default_value);
-    }
   }
 
+  // Update surface patches colors to the domain
   if (use_subdomain_colors)
   {
     for (std::unordered_map<int, int>::iterator it = visible_surface_patch_to_subdomain.begin(),