GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 05:49:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2017-07-21 10:41:03 +02:00
commit a768234cad
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
4 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/Settings/CuraContainerRegistry.py
View File

@ -282,7 +282,7 @@ class CuraContainerRegistry(ContainerRegistry):
profile.setDefinition(self._activeQualityDefinition())
if self._machineHasOwnMaterials():
active_material_id = self._activeMaterialId()
if active_material_id: # only update if there is an active material
if active_material_id and active_material_id != "empty": # only update if there is an active material
profile.addMetaDataEntry("material", active_material_id)
quality_type_criteria["material"] = active_material_id

10
plugins/3MFReader/ThreeMFWorkspaceReader.py
View File

@ -254,9 +254,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
for index, container_id in enumerate(id_list):
# take into account the old empty container IDs
container_id = self._old_empty_profile_id_dict.get(container_id, container_id)
# HACK: there used to be 5, now we have one more 5 - definition changes
if len(id_list) == 6 and index == 5:
index = 6
if global_stack.getContainer(index).getId() != container_id:
machine_conflict = True
break
@ -292,9 +289,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
for index, container_id in enumerate(id_list):
# take into account the old empty container IDs
container_id = self._old_empty_profile_id_dict.get(container_id, container_id)
# HACK: there used to be 5, now we have one more 5 - definition changes
if len(id_list) == 6 and index == 5:
index = 6
if existing_extruder_stack.getContainer(index).getId() != container_id:
machine_conflict = True
break
@ -869,6 +863,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
container_list = container_string.split(",")
container_ids = [container_id for container_id in container_list if container_id != ""]
if len(container_ids) == 5:
# Hack; We used to not save the definition changes. Fix this.
container_ids.insert(4, "empty")
return container_ids
def _getMachineNameFromSerializedStack(self, serialized):

8
plugins/UM3NetworkPrinting/NetworkPrinterOutputDevice.py
View File

@ -645,7 +645,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
# Only check for mistakes if there is material length information.
if print_information.materialLengths:
# Check if print cores / materials are loaded at all. Any failure in these results in an Error.
# Check if PrintCores / materials are loaded at all. Any failure in these results in an Error.
for index in range(0, self._num_extruders):
if index < len(print_information.materialLengths) and print_information.materialLengths[index] != 0:
if self._json_printer_state["heads"][0]["extruders"][index]["hotend"]["id"] == "":
@ -677,7 +677,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
if variant:
if variant.getName() != core_name:
Logger.log("w", "Extruder %s has a different Cartridge (%s) as Cura (%s)", index + 1, core_name, variant.getName())
warnings.append(i18n_catalog.i18nc("@label", "Different print core (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
warnings.append(i18n_catalog.i18nc("@label", "Different PrintCore (Cura: {0}, Printer: {1}) selected for extruder {2}".format(variant.getName(), core_name, index + 1)))
material = extruder_manager.getExtruderStack(index).findContainer({"type": "material"})
if material:
@ -699,7 +699,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
is_offset_calibrated = True
if not is_offset_calibrated:
warnings.append(i18n_catalog.i18nc("@label", "Print core {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
warnings.append(i18n_catalog.i18nc("@label", "PrintCore {0} is not properly calibrated. XY calibration needs to be performed on the printer.").format(index + 1))
else:
Logger.log("w", "There was no material usage found. No check to match used material with machine is done.")
@ -1176,7 +1176,7 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
i18n_catalog.i18nc("@label",
"Would you like to use your current printer configuration in Cura?"),
i18n_catalog.i18nc("@label",
"The print cores and/or materials on your printer differ from those within your current project. For the best result, always slice for the print cores and materials that are inserted in your printer."),
"The PrintCores and/or materials on your printer differ from those within your current project. For the best result, always slice for the PrintCores and materials that are inserted in your printer."),
buttons=QMessageBox.Yes + QMessageBox.No,
icon=QMessageBox.Question,
callback=callback

1
resources/qml/Menus/ContextMenu.qml
View File

@ -78,6 +78,7 @@ Menu
Dialog
{
id: multiplyDialog
modality: Qt.ApplicationModal
title: catalog.i18ncp("@title:window", "Multiply Selected Model", "Multiply Selected Models", UM.Selection.selectionCount)