Variable layer height enabled, nozzle diameters properly passed to the wipe tower generator

xs/src/libslic3r/GCode/WipeTowerPrusaMM.cpp

@@ -1104,7 +1104,7 @@ void WipeTowerPrusaMM::plan_tower()
 		if (this_layer_depth > m_wipe_tower_depth - m_perimeter_width)
 			m_wipe_tower_depth = this_layer_depth + m_perimeter_width;
 
-		for (int i = layer_index - 1; i >= 0 /*&& m_plan[i].depth < this_layer_depth*/; i--)
+		for (int i = layer_index - 1; i >= 0 ; i--)
 		{
 			if (m_plan[i].depth - this_layer_depth < 2*m_perimeter_width )
 				m_plan[i].depth = this_layer_depth;

xs/src/libslic3r/GCode/WipeTowerPrusaMM.hpp

@@ -67,7 +67,7 @@ public:
 
 	// Set the extruder properties.
 	void set_extruder(size_t idx, material_type material, int temp, int first_layer_temp, float loading_speed,
-                      float unloading_speed, float delay, float cooling_time, std::string ramming_parameters)
+                      float unloading_speed, float delay, float cooling_time, std::string ramming_parameters, float nozzle_diameter)
 	{
         //while (m_filpar.size() < idx+1)   // makes sure the required element is in the vector
         m_filpar.push_back(FilamentParameters());
@@ -79,6 +79,9 @@ public:
         m_filpar[idx].unloading_speed = unloading_speed;
         m_filpar[idx].delay = delay;
         m_filpar[idx].cooling_time = cooling_time;
+        m_filpar[idx].nozzle_diameter = nozzle_diameter; // to be used in future with (non-single) multiextruder MM
+
+        m_perimeter_width = nozzle_diameter * Width_To_Nozzle_Ratio; // all extruders are now assumed to have the same diameter
 
         std::stringstream stream{ramming_parameters};
         float speed = 0.f;
@@ -171,8 +174,7 @@ private:
 
 
     const bool  m_peters_wipe_tower   = false; // sparse wipe tower inspired by Peter's post processor - not finished yet
-    const float Filament_Area         = M_PI * 1.75f * 1.75f / 4.f; // filament area in mm^3
+    const float Filament_Area         = M_PI * 1.75f * 1.75f / 4.f; // filament area in mm^2
-    const float Nozzle_Diameter       = 0.4f;  // nozzle diameter in mm
     const float Width_To_Nozzle_Ratio = 1.25f; // desired line width (oval) in multiples of nozzle diameter - may not be actually neccessary to adjust
     const float WT_EPSILON            = 1e-3f;
 
@@ -194,7 +196,7 @@ private:
     float           m_bridging                  = 0.f;
     bool            m_adhesion                  = true;
 
-	float m_perimeter_width = Nozzle_Diameter * Width_To_Nozzle_Ratio; // Width of an extrusion line, also a perimeter spacing for 100% infill.
+	float m_perimeter_width = 0.4 * Width_To_Nozzle_Ratio; // Width of an extrusion line, also a perimeter spacing for 100% infill.
 	float m_extrusion_flow = 0.038; //0.029f;// Extrusion flow is derived from m_perimeter_width, layer height and filament diameter.
 
 
@@ -209,6 +211,7 @@ private:
         float               ramming_line_width_multiplicator = 0.f;
         float               ramming_step_multiplicator = 0.f;
         std::vector<float>  ramming_speed;
+        float               nozzle_diameter;
     };
 
 	// Extruder specific parameters.
@@ -235,7 +238,7 @@ private:
 	{
 		if ( layer_height < 0 )
 			return m_extrusion_flow;
-		return layer_height * ( Width_To_Nozzle_Ratio * Nozzle_Diameter - layer_height * (1-M_PI/4.f)) / (Filament_Area);
+		return layer_height * ( m_perimeter_width - layer_height * (1-M_PI/4.f)) / Filament_Area;
 	}
 
 	// Calculates length of extrusion line to extrude given volume

xs/src/libslic3r/Print.cpp

@@ -581,6 +581,12 @@ std::string Print::validate() const
             return "The Spiral Vase option can only be used when printing single material objects.";
     }
 
+    if (this->config.single_extruder_multi_material) {
+        for (size_t i=1; i<this->config.nozzle_diameter.values.size(); ++i)
+            if (this->config.nozzle_diameter.values[i] != this->config.nozzle_diameter.values[i-1])
+                return "All extruders must have the same diameter for single extruder multimaterial printer.";
+    }
+
     if (this->has_wipe_tower() && ! this->objects.empty()) {
         #if 0
         for (auto dmr : this->config.nozzle_diameter.values)
@@ -606,10 +612,10 @@ std::string Print::validate() const
             bool was_layer_height_profile_valid = object->layer_height_profile_valid;
             object->update_layer_height_profile();
             object->layer_height_profile_valid = was_layer_height_profile_valid;
-            for (size_t i = 5; i < object->layer_height_profile.size(); i += 2)
+            /*for (size_t i = 5; i < object->layer_height_profile.size(); i += 2)
                 if (object->layer_height_profile[i-1] > slicing_params.object_print_z_min + EPSILON &&
                     std::abs(object->layer_height_profile[i] - object->config.layer_height) > EPSILON)
-                    return "The Wipe Tower is currently only supported with constant Z layer spacing. Layer editing is not allowed.";
+                    return "The Wipe Tower is currently only supported with constant Z layer spacing. Layer editing is not allowed.";*/
         }
     }
     
@@ -1066,7 +1072,8 @@ void Print::_make_wipe_tower()
             this->config.filament_unloading_speed.get_at(i),
             this->config.filament_toolchange_delay.get_at(i),
             this->config.filament_cooling_time.get_at(i),
-            this->config.filament_ramming_parameters.get_at(i));
+            this->config.filament_ramming_parameters.get_at(i),
+            this->config.nozzle_diameter.get_at(i));
 
     // When printing the first layer's wipe tower, the first extruder is expected to be active and primed.
     // Therefore the number of wipe sections at the wipe tower will be (m_tool_ordering.front().extruders-1) at the 1st layer.