Merge branch 'main'

This commit is contained in:
Remco Burema 2022-11-04 08:47:50 +01:00
commit b1138e12d9
5455 changed files with 203722 additions and 208531 deletions

View file

@ -2,7 +2,7 @@ import base64
from UM.Logger import Logger
from cura.Snapshot import Snapshot
from PyQt5.QtCore import QByteArray, QIODevice, QBuffer
from PyQt6.QtCore import QByteArray, QIODevice, QBuffer
from ..Script import Script
@ -22,7 +22,7 @@ class CreateThumbnail(Script):
Logger.log("d", "Encoding thumbnail image...")
try:
thumbnail_buffer = QBuffer()
thumbnail_buffer.open(QBuffer.ReadWrite)
thumbnail_buffer.open(QBuffer.OpenModeFlag.ReadWrite)
thumbnail_image = snapshot
thumbnail_image.save(thumbnail_buffer, "PNG")
base64_bytes = base64.b64encode(thumbnail_buffer.data())

View file

@ -358,7 +358,7 @@ class PauseAtHeight(Script):
current_height = current_z - layer_0_z
if current_height < pause_height:
continue # Scan the enitre layer, z-changes are not always on the same/first line.
continue # Scan the entire layer, z-changes are not always on the same/first line.
# Pause at layer
else:

View file

@ -432,7 +432,7 @@ class Stretcher:
"""
dist_palp = self.line_width # Palpation distance to seek for a wall
mrot = np.array([[0, -1], [1, 0]]) # Rotation matrix for a quarter turn
for i in range(len(orig_seq)):
for i, _ in enumerate(orig_seq):
ibeg = i # Index of the first point of the segment
iend = i + 1 # Index of the last point of the segment
if iend == len(orig_seq):