Also track Z coordinates and retract extra for the distance travelled then

Otherwise if a retracted move had a different Z coordinate, this would not be put in the final print. It's pretty simple to extend it this way.

Fixes #7458.

plugins/PostProcessingPlugin/scripts/RetractContinue.py

@@ -29,14 +29,16 @@ class RetractContinue(Script):
         current_e = 0
         current_x = 0
         current_y = 0
+        current_z = 0
         extra_retraction_speed = self.getSettingValueByKey("extra_retraction_speed")
 
         for layer_number, layer in enumerate(data):
             lines = layer.split("\n")
             for line_number, line in enumerate(lines):
-                if self.getValue(line, "G") in {0, 1}:  # Track X,Y location.
+                if self.getValue(line, "G") in {0, 1}:  # Track X,Y,Z location.
                     current_x = self.getValue(line, "X", current_x)
                     current_y = self.getValue(line, "Y", current_y)
+                    current_z = self.getValue(line, "Z", current_z)
                 if self.getValue(line, "G") == 1:
                     if not self.getValue(line, "E"):  # Either None or 0: Not a retraction then.
                         continue
@@ -49,6 +51,7 @@ class RetractContinue(Script):
                     delta_line = 1
                     dx = current_x  # Track the difference in X for this move only to compute the length of the travel.
                     dy = current_y
+                    dz = current_z
                     while line_number + delta_line < len(lines) and self.getValue(lines[line_number + delta_line], "G") != 1:
                         travel_move = lines[line_number + delta_line]
                         if self.getValue(travel_move, "G") != 0:
@@ -56,18 +59,20 @@ class RetractContinue(Script):
                             continue
                         travel_x = self.getValue(travel_move, "X", dx)
                         travel_y = self.getValue(travel_move, "Y", dy)
+                        travel_z = self.getValue(travel_move, "Z", dz)
                         f = self.getValue(travel_move, "F", "no f")
-                        length = math.sqrt((travel_x - dx) * (travel_x - dx) + (travel_y - dy) * (travel_y - dy))  # Length of the travel move.
+                        length = math.sqrt((travel_x - dx) * (travel_x - dx) + (travel_y - dy) * (travel_y - dy) + (travel_z - dz) * (travel_z - dz))  # Length of the travel move.
                         new_e -= length * extra_retraction_speed  # New retraction is by ratio of this travel move.
                         if f == "no f":
-                            new_travel_move = "G1 X{travel_x} Y{travel_y} E{new_e}".format(travel_x = travel_x, travel_y = travel_y, new_e = new_e)
+                            new_travel_move = "G1 X{travel_x} Y{travel_y} Z{travel_z} E{new_e}".format(travel_x = travel_x, travel_y = travel_y, travel_z = travel_z, new_e = new_e)
                         else:
-                            new_travel_move = "G1 F{f} X{travel_x} Y{travel_y} E{new_e}".format(f = f, travel_x = travel_x, travel_y = travel_y, new_e = new_e)
+                            new_travel_move = "G1 F{f} X{travel_x} Y{travel_y} Z{travel_z} E{new_e}".format(f = f, travel_x = travel_x, travel_y = travel_y, travel_z = travel_z, new_e = new_e)
                         lines[line_number + delta_line] = new_travel_move
 
                         delta_line += 1
                         dx = travel_x
                         dy = travel_y
+                        dz = travel_z
 
                     current_e = new_e