Set color pattern length to match calibration json being used

src/libslic3r/Fill/Fill.cpp

@@ -8852,12 +8852,19 @@ static std::vector<TopSurfaceImageRegionPlan> top_surface_image_region_plans(
         plan.colored_top_layers = std::clamp(zone->top_surface_image_colored_top_layers,
                                              TextureMappingZone::MinTopSurfaceImageColoredTopLayers,
                                              TextureMappingZone::MaxTopSurfaceImageColoredTopLayers);
-        plan.contoning_stack_layers = std::clamp(zone->top_surface_contoning_stack_layers,
-                                                 TextureMappingZone::MinTopSurfaceContoningStackLayers,
-                                                 TextureMappingZone::MaxTopSurfaceContoningStackLayers);
-        plan.contoning_pattern_filaments = std::clamp(zone->top_surface_contoning_pattern_filaments,
-                                                      TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
-                                                      TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
+        const int calibrated_pattern_filaments =
+            texture_mapping_top_surface_contoning_calibrated_pattern_filaments(*zone);
+        plan.contoning_pattern_filaments =
+            calibrated_pattern_filaments > 0 ?
+                calibrated_pattern_filaments :
+                std::clamp(zone->top_surface_contoning_pattern_filaments,
+                           TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
+                           TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
+        plan.contoning_stack_layers =
+            std::max(plan.contoning_pattern_filaments,
+                     std::clamp(zone->top_surface_contoning_stack_layers,
+                                TextureMappingZone::MinTopSurfaceContoningStackLayers,
+                                TextureMappingZone::MaxTopSurfaceContoningStackLayers));
         plan.contoning_external_width_mm = float(layerm->flow(frExternalPerimeter).width());
         plan.contoning_min_feature_mm =
             texture_mapping_contoning_min_feature_mm(*zone, print_config, components, plan.contoning_external_width_mm);

src/libslic3r/TextureMapping.cpp

@@ -2193,6 +2193,26 @@ int texture_mapping_top_surface_color_calibration_first_supported_mode(const std
     return best_mode;
 }
 
+int texture_mapping_top_surface_contoning_calibrated_pattern_filaments(const TextureMappingZone &zone)
+{
+    const int mode = TextureMappingZone::effective_top_surface_contoning_color_prediction_mode(
+        zone.top_surface_contoning_color_prediction_mode);
+    if (!TextureMappingZone::top_surface_contoning_color_prediction_mode_is_calibrated(mode))
+        return 0;
+
+    std::optional<TextureMappingColorCalibration> calibration =
+        texture_mapping_parse_top_surface_color_calibration(zone.top_surface_color_calibration_json);
+    if (!calibration ||
+        !calibration->has_mode(mode) ||
+        !calibration->nearest_measured_sample.valid() ||
+        calibration->nearest_measured_sample.measured_stack_depth <= 0)
+        return 0;
+
+    return std::clamp(calibration->nearest_measured_sample.measured_stack_depth,
+                      TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
+                      TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
+}
+
 std::string texture_mapping_top_surface_color_calibration_display_name(const std::string &json_text)
 {
     std::optional<TextureMappingColorCalibration> calibration =
@@ -2820,10 +2840,14 @@ std::string TextureMappingManager::serialize_entries()
                                  TextureMappingZone::DefaultTopSurfaceContoningAngleThresholdDeg),
                        TextureMappingZone::MinTopSurfaceContoningAngleThresholdDeg,
                        TextureMappingZone::MaxTopSurfaceContoningAngleThresholdDeg);
+        const int calibrated_pattern_filaments =
+            texture_mapping_top_surface_contoning_calibrated_pattern_filaments(zone);
         const int top_surface_contoning_pattern_filaments =
-            clamp_int(zone.top_surface_contoning_pattern_filaments,
-                      TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
-                      TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
+            calibrated_pattern_filaments > 0 ?
+                calibrated_pattern_filaments :
+                clamp_int(zone.top_surface_contoning_pattern_filaments,
+                          TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
+                          TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
         texture["top_surface_contoning_stack_layers"] =
             std::max(top_surface_contoning_pattern_filaments,
                      clamp_int(zone.top_surface_contoning_stack_layers,
@@ -3281,6 +3305,14 @@ void TextureMappingManager::load_entries(const std::string &serialized,
                 zone.top_surface_contoning_color_prediction_mode =
                     texture_mapping_top_surface_color_calibration_first_supported_mode(zone.top_surface_color_calibration_json);
         }
+        if (const int calibrated_pattern_filaments =
+                texture_mapping_top_surface_contoning_calibrated_pattern_filaments(zone);
+            calibrated_pattern_filaments > 0) {
+            zone.top_surface_contoning_pattern_filaments = calibrated_pattern_filaments;
+            zone.top_surface_contoning_stack_layers =
+                std::max(zone.top_surface_contoning_stack_layers,
+                         zone.top_surface_contoning_pattern_filaments);
+        }
         zone.side_surface_color_calibration_name =
             texture.value("side_surface_color_calibration_name", std::string());
         zone.side_surface_color_calibration_json.clear();

src/libslic3r/TextureMapping.hpp

@@ -946,6 +946,7 @@ std::optional<TextureMappingSideSurfaceColorCalibration> texture_mapping_parse_s
     std::string       *error = nullptr);
 std::vector<int> texture_mapping_top_surface_color_calibration_supported_modes(const std::string &json_text);
 int texture_mapping_top_surface_color_calibration_first_supported_mode(const std::string &json_text);
+int texture_mapping_top_surface_contoning_calibrated_pattern_filaments(const TextureMappingZone &zone);
 std::string texture_mapping_top_surface_color_calibration_display_name(const std::string &json_text);
 std::string texture_mapping_side_surface_color_calibration_display_name(const std::string &json_text);
 std::string texture_mapping_top_surface_color_calibration_warning(const TextureMappingZone                  &zone,

src/slic3r/GUI/Plater.cpp

@@ -3640,7 +3640,7 @@ public:
         }
         if (m_top_surface_contoning_td_correction_choice != nullptr) {
             m_top_surface_contoning_td_correction_choice->Bind(wxEVT_CHOICE, [this](wxCommandEvent &) {
-                sync_top_surface_contoning_nearest_measured_sample_pattern_length();
+                sync_top_surface_contoning_calibrated_pattern_length();
                 update_top_surface_color_calibration_label();
                 update_top_surface_image_options_visibility(false);
                 queue_top_surface_contoning_message_update(true);
@@ -4037,7 +4037,7 @@ public:
     }
     int top_surface_contoning_pattern_filaments() const
     {
-        if (const int fixed_pattern_filaments = top_surface_contoning_nearest_measured_sample_pattern_filaments(); fixed_pattern_filaments > 0)
+        if (const int fixed_pattern_filaments = top_surface_contoning_calibrated_pattern_filaments(); fixed_pattern_filaments > 0)
             return fixed_pattern_filaments;
         return m_top_surface_contoning_pattern_filaments_spin ?
             std::clamp(m_top_surface_contoning_pattern_filaments_spin->GetValue(),
@@ -4219,21 +4219,12 @@ public:
             m_top_surface_contoning_color_prediction_modes[size_t(selection)] :
             TextureMappingZone::DefaultTopSurfaceContoningColorPredictionMode;
     }
-    int top_surface_contoning_nearest_measured_sample_pattern_filaments() const
+    int top_surface_contoning_calibrated_pattern_filaments() const
     {
-        if (TextureMappingZone::effective_top_surface_contoning_color_prediction_mode(
-                top_surface_contoning_color_prediction_mode()) !=
-            int(TextureMappingZone::ContoningColorPredictionCalibratedNearestMeasuredSample))
-            return 0;
-        std::optional<TextureMappingColorCalibration> calibration =
-            texture_mapping_parse_top_surface_color_calibration(m_top_surface_color_calibration_json);
-        if (!calibration ||
-            !calibration->nearest_measured_sample.valid() ||
-            calibration->nearest_measured_sample.measured_stack_depth <= 0)
-            return 0;
-        return std::clamp(calibration->nearest_measured_sample.measured_stack_depth,
-                          TextureMappingZone::MinTopSurfaceContoningPatternFilaments,
-                          TextureMappingZone::MaxTopSurfaceContoningPatternFilaments);
+        TextureMappingZone zone;
+        zone.top_surface_contoning_color_prediction_mode = top_surface_contoning_color_prediction_mode();
+        zone.top_surface_color_calibration_json = m_top_surface_color_calibration_json;
+        return texture_mapping_top_surface_contoning_calibrated_pattern_filaments(zone);
     }
     std::string top_surface_color_calibration_name() const
     {
@@ -4618,14 +4609,14 @@ private:
             it != m_top_surface_contoning_color_prediction_modes.end() ?
                 int(it - m_top_surface_contoning_color_prediction_modes.begin()) :
                 0);
-        sync_top_surface_contoning_nearest_measured_sample_pattern_length();
+        sync_top_surface_contoning_calibrated_pattern_length();
     }
 
-    void sync_top_surface_contoning_nearest_measured_sample_pattern_length()
+    void sync_top_surface_contoning_calibrated_pattern_length()
     {
         if (m_top_surface_contoning_pattern_filaments_spin == nullptr)
             return;
-        const int fixed_pattern_filaments = top_surface_contoning_nearest_measured_sample_pattern_filaments();
+        const int fixed_pattern_filaments = top_surface_contoning_calibrated_pattern_filaments();
         if (fixed_pattern_filaments > 0) {
             m_top_surface_contoning_pattern_filaments_spin->SetValue(fixed_pattern_filaments);
             enforce_top_surface_contoning_stack_depth_at_least_pattern();
@@ -5604,11 +5595,11 @@ private:
             m_top_surface_contoning_angle_threshold_spin->Enable(contoning);
         if (m_top_surface_contoning_stack_layers_spin != nullptr)
             m_top_surface_contoning_stack_layers_spin->Enable(contoning);
-        const bool nearest_measured_sample_fixed_pattern =
-            top_surface_contoning_nearest_measured_sample_pattern_filaments() > 0;
+        const bool calibrated_fixed_pattern =
+            top_surface_contoning_calibrated_pattern_filaments() > 0;
         if (m_top_surface_contoning_pattern_filaments_spin != nullptr) {
-            sync_top_surface_contoning_nearest_measured_sample_pattern_length();
-            m_top_surface_contoning_pattern_filaments_spin->Enable(contoning && !nearest_measured_sample_fixed_pattern);
+            sync_top_surface_contoning_calibrated_pattern_length();
+            m_top_surface_contoning_pattern_filaments_spin->Enable(contoning && !calibrated_fixed_pattern);
         }
         if (m_top_surface_contoning_flat_surface_infill_choice != nullptr)
             m_top_surface_contoning_flat_surface_infill_choice->Enable(contoning);