mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-06-30 19:15:12 +08:00
Merge branch '3.2'
This commit is contained in:
commit
4ee36404cc
@ -344,7 +344,12 @@ class SimulationView(View):
|
|||||||
self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate)
|
self._max_feedrate = max(float(p.lineFeedrates.max()), self._max_feedrate)
|
||||||
self._min_feedrate = min(float(p.lineFeedrates.min()), self._min_feedrate)
|
self._min_feedrate = min(float(p.lineFeedrates.min()), self._min_feedrate)
|
||||||
self._max_thickness = max(float(p.lineThicknesses.max()), self._max_thickness)
|
self._max_thickness = max(float(p.lineThicknesses.max()), self._max_thickness)
|
||||||
self._min_thickness = min(float(p.lineThicknesses[numpy.nonzero(p.lineThicknesses)].min()), self._min_thickness)
|
try:
|
||||||
|
self._min_thickness = min(float(p.lineThicknesses[numpy.nonzero(p.lineThicknesses)].min()), self._min_thickness)
|
||||||
|
except:
|
||||||
|
# Sometimes, when importing a GCode the line thicknesses are zero and so the minimum (avoiding
|
||||||
|
# the zero) can't be calculated
|
||||||
|
Logger.log("i", "Min thickness can't be calculated because all the values are zero")
|
||||||
if max_layer_number < layer_id:
|
if max_layer_number < layer_id:
|
||||||
max_layer_number = layer_id
|
max_layer_number = layer_id
|
||||||
if min_layer_number > layer_id:
|
if min_layer_number > layer_id:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user