mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 01:35:53 +08:00
review comments fixing
CURA-11650
This commit is contained in:
parent
28997b0b14
commit
c4881641c3
@ -193,19 +193,16 @@ class Snapshot:
|
|||||||
preview_pass.setCamera(camera)
|
preview_pass.setCamera(camera)
|
||||||
preview_pass.render()
|
preview_pass.render()
|
||||||
pixel_output = preview_pass.getOutput()
|
pixel_output = preview_pass.getOutput()
|
||||||
if Snapshot._prereadSnapshot(pixel_output):
|
try:
|
||||||
try:
|
min_x, max_x, min_y, max_y = Snapshot.getImageBoundaries(pixel_output)
|
||||||
min_x, max_x, min_y, max_y = Snapshot.getImageBoundaries(pixel_output)
|
except (ValueError, AttributeError) as e:
|
||||||
except (ValueError, AttributeError) as e:
|
if number_of_attempts == 0:
|
||||||
Logger.logException("w", f"Failed to crop the snapshot! {e}")
|
Logger.warning( f"Failed to crop the snapshot even after {Snapshot.ATTEMPTS_FOR_SNAPSHOT} attempts!")
|
||||||
return None
|
return None
|
||||||
elif number_of_attempts == 0:
|
else:
|
||||||
Logger.warning( f"Failed to crop the snapshot even after {Snapshot.ATTEMPTS_FOR_SNAPSHOT} attempts!")
|
number_of_attempts = number_of_attempts - 1
|
||||||
return None
|
Logger.info("Trying to get the snapshot again.")
|
||||||
else:
|
return Snapshot.snapshot(width, height, number_of_attempts)
|
||||||
number_of_attempts = number_of_attempts - 1
|
|
||||||
Logger.info("Trying to get the snapshot again.")
|
|
||||||
return Snapshot.snapshot(width, height, number_of_attempts)
|
|
||||||
|
|
||||||
size = max((max_x - min_x) / render_width, (max_y - min_y) / render_height)
|
size = max((max_x - min_x) / render_width, (max_y - min_y) / render_height)
|
||||||
if size > 0.5 or satisfied:
|
if size > 0.5 or satisfied:
|
||||||
@ -230,8 +227,3 @@ class Snapshot:
|
|||||||
transformMode = QtCore.Qt.TransformationMode.SmoothTransformation)
|
transformMode = QtCore.Qt.TransformationMode.SmoothTransformation)
|
||||||
|
|
||||||
return scaled_image
|
return scaled_image
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _prereadSnapshot(snap = QImage):
|
|
||||||
nonzero_pixels = Snapshot.getNonZeroPixels(snap)
|
|
||||||
return all(len(nonzero_pixels[i]) != 0 for i in range(3))
|
|
Loading…
x
Reference in New Issue
Block a user