mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 15:44:04 -06:00
Merge branch '2.3' of github.com:Ultimaker/Cura into 2.3
This commit is contained in:
commit
1999e587b6
6 changed files with 12 additions and 9 deletions
|
@ -16,7 +16,7 @@ class LayerPolygon:
|
||||||
MoveRetractionType = 9
|
MoveRetractionType = 9
|
||||||
SupportInterfaceType = 10
|
SupportInterfaceType = 10
|
||||||
|
|
||||||
__jump_map = numpy.logical_or( numpy.arange(11) == NoneType, numpy.arange(11) >= MoveRetractionType )
|
__jump_map = numpy.logical_or(numpy.logical_or(numpy.arange(11) == NoneType, numpy.arange(11) == MoveCombingType), numpy.arange(11) == MoveRetractionType)
|
||||||
|
|
||||||
def __init__(self, mesh, extruder, line_types, data, line_widths):
|
def __init__(self, mesh, extruder, line_types, data, line_widths):
|
||||||
self._mesh = mesh
|
self._mesh = mesh
|
||||||
|
@ -42,7 +42,7 @@ class LayerPolygon:
|
||||||
|
|
||||||
# When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType
|
# When type is used as index returns true if type == LayerPolygon.InfillType or type == LayerPolygon.SkinType or type == LayerPolygon.SupportInfillType
|
||||||
# Should be generated in better way, not hardcoded.
|
# Should be generated in better way, not hardcoded.
|
||||||
self._isInfillOrSkinTypeMap = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0], dtype=numpy.bool)
|
self._isInfillOrSkinTypeMap = numpy.array([0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1], dtype=numpy.bool)
|
||||||
|
|
||||||
self._build_cache_line_mesh_mask = None
|
self._build_cache_line_mesh_mask = None
|
||||||
self._build_cache_needed_points = None
|
self._build_cache_needed_points = None
|
||||||
|
|
|
@ -49,7 +49,7 @@ class RemovableDrivePlugin(OutputDevicePlugin):
|
||||||
message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName()))
|
message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName()))
|
||||||
message.show()
|
message.show()
|
||||||
else:
|
else:
|
||||||
message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Maybe it is still in use?").format(device.getName()))
|
message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(device.getName()))
|
||||||
message.show()
|
message.show()
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
|
@ -140,7 +140,7 @@ class USBPrinterOutputDevice(PrinterOutputDevice):
|
||||||
# \param gcode_list List with gcode (strings).
|
# \param gcode_list List with gcode (strings).
|
||||||
def printGCode(self, gcode_list):
|
def printGCode(self, gcode_list):
|
||||||
if self._progress or self._connection_state != ConnectionState.connected:
|
if self._progress or self._connection_state != ConnectionState.connected:
|
||||||
self._error_message = Message(catalog.i18nc("@info:status", "Printer is busy or not connected. Unable to start a new job."))
|
self._error_message = Message(catalog.i18nc("@info:status", "Unable to start a new job because the printer is busy or not connected."))
|
||||||
self._error_message.show()
|
self._error_message.show()
|
||||||
Logger.log("d", "Printer is busy or not connected, aborting print")
|
Logger.log("d", "Printer is busy or not connected, aborting print")
|
||||||
self.writeError.emit(self)
|
self.writeError.emit(self)
|
||||||
|
|
|
@ -107,7 +107,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
|
||||||
def updateAllFirmware(self, file_name):
|
def updateAllFirmware(self, file_name):
|
||||||
file_name = file_name.replace("file://", "") # File dialogs prepend the path with file://, which we don't need / want
|
file_name = file_name.replace("file://", "") # File dialogs prepend the path with file://, which we don't need / want
|
||||||
if not self._usb_output_devices:
|
if not self._usb_output_devices:
|
||||||
Message(i18n_catalog.i18nc("@info", "Cannot update firmware, there were no connected printers found.")).show()
|
Message(i18n_catalog.i18nc("@info", "Unable to update firmware because there are no printers connected.")).show()
|
||||||
return
|
return
|
||||||
|
|
||||||
for printer_connection in self._usb_output_devices:
|
for printer_connection in self._usb_output_devices:
|
||||||
|
|
|
@ -403,7 +403,7 @@
|
||||||
"description": "The maximum speed of the filament.",
|
"description": "The maximum speed of the filament.",
|
||||||
"unit": "mm/s",
|
"unit": "mm/s",
|
||||||
"type": "float",
|
"type": "float",
|
||||||
"default_value": 25,
|
"default_value": 299792458000,
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
"settable_per_extruder": false,
|
"settable_per_extruder": false,
|
||||||
"settable_per_meshgroup": false
|
"settable_per_meshgroup": false
|
||||||
|
@ -1161,7 +1161,7 @@
|
||||||
"default_value": 25,
|
"default_value": 25,
|
||||||
"minimum_value": "0",
|
"minimum_value": "0",
|
||||||
"maximum_value": "machine_max_feedrate_e",
|
"maximum_value": "machine_max_feedrate_e",
|
||||||
"maximum_value_warning": "100",
|
"maximum_value_warning": "25",
|
||||||
"enabled": "retraction_enable",
|
"enabled": "retraction_enable",
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
"settable_per_extruder": true,
|
"settable_per_extruder": true,
|
||||||
|
@ -1174,7 +1174,7 @@
|
||||||
"default_value": 25,
|
"default_value": 25,
|
||||||
"minimum_value": "0",
|
"minimum_value": "0",
|
||||||
"maximum_value": "machine_max_feedrate_e",
|
"maximum_value": "machine_max_feedrate_e",
|
||||||
"maximum_value_warning": "100",
|
"maximum_value_warning": "25",
|
||||||
"enabled": "retraction_enable",
|
"enabled": "retraction_enable",
|
||||||
"value": "retraction_speed",
|
"value": "retraction_speed",
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
|
@ -1188,7 +1188,7 @@
|
||||||
"default_value": 25,
|
"default_value": 25,
|
||||||
"minimum_value": "0",
|
"minimum_value": "0",
|
||||||
"maximum_value": "machine_max_feedrate_e",
|
"maximum_value": "machine_max_feedrate_e",
|
||||||
"maximum_value_warning": "100",
|
"maximum_value_warning": "25",
|
||||||
"enabled": "retraction_enable",
|
"enabled": "retraction_enable",
|
||||||
"value": "retraction_speed",
|
"value": "retraction_speed",
|
||||||
"settable_per_mesh": false,
|
"settable_per_mesh": false,
|
||||||
|
|
|
@ -9,6 +9,9 @@
|
||||||
"visible": false
|
"visible": false
|
||||||
},
|
},
|
||||||
"overrides": {
|
"overrides": {
|
||||||
|
"machine_max_feedrate_e": {
|
||||||
|
"default_value": 45
|
||||||
|
},
|
||||||
"material_print_temperature": {
|
"material_print_temperature": {
|
||||||
"minimum_value": "0"
|
"minimum_value": "0"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue