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

Merge branch 'main' into CURA-10896_improve_add_printer_wizard

Browse Source
This commit is contained in:
Saumya Jain 2023-09-04 10:13:58 +02:00 committed by GitHub
commit f3c7b0f6f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
packaging/MacOS/cura_background_dmg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 381 KiB

After

Width:  |  Height:  |  Size: 417 KiB

6
plugins/3MFWriter/ThreeMFWorkspaceWriter.py
View File

@ -40,7 +40,9 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
# Indicate that the 3mf mesh writer should not close the archive just yet (we still need to add stuff to it). # Indicate that the 3mf mesh writer should not close the archive just yet (we still need to add stuff to it).
mesh_writer.setStoreArchive(True) mesh_writer.setStoreArchive(True)
mesh_writer.write(stream, nodes, mode) if not mesh_writer.write(stream, nodes, mode):
self.setInformation(mesh_writer.getInformation())
return False
archive = mesh_writer.getArchive() archive = mesh_writer.getArchive()
if archive is None: # This happens if there was no mesh data to write. if archive is None: # This happens if there was no mesh data to write.
@ -98,7 +100,7 @@ class ThreeMFWorkspaceWriter(WorkspaceWriter):
Logger.error("No permission to write workspace to this stream.") Logger.error("No permission to write workspace to this stream.")
return False return False
except EnvironmentError as e: except EnvironmentError as e:
self.setInformation(catalog.i18nc("@error:zip", "The operating system does not allow saving a project file to this location or with this file name.")) self.setInformation(catalog.i18nc("@error:zip", str(e)))
Logger.error("EnvironmentError when writing workspace to this stream: {err}".format(err = str(e))) Logger.error("EnvironmentError when writing workspace to this stream: {err}".format(err = str(e)))
return False return False
mesh_writer.setStoreArchive(False) mesh_writer.setStoreArchive(False)

4
plugins/3MFWriter/ThreeMFWriter.py
View File

@ -237,9 +237,9 @@ class ThreeMFWriter(MeshWriter):
archive.writestr(model_file, scene_string) archive.writestr(model_file, scene_string)
archive.writestr(content_types_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(content_types)) archive.writestr(content_types_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(content_types))
archive.writestr(relations_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(relations_element)) archive.writestr(relations_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(relations_element))
except Exception as e: except Exception as error:
Logger.logException("e", "Error writing zip file") Logger.logException("e", "Error writing zip file")
self.setInformation(catalog.i18nc("@error:zip", "Error writing 3mf file.")) self.setInformation(str(error))
return False return False
finally: finally:
if not self._store_archive: if not self._store_archive:

12
resources/definitions/fdmprinter.def.json
View File

@ -5514,7 +5514,9 @@
"unit": "mm", "unit": "mm",
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_interface_extruder_nr", "limit_to_extruder": "support_interface_extruder_nr",
"enabled": "support_interface_enable and (support_enable or support_meshes_present)", "enabled": "support_interface_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5529,7 +5531,9 @@
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')", "value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_roof_extruder_nr", "limit_to_extruder": "support_roof_extruder_nr",
"enabled": "support_roof_enable and (support_enable or support_meshes_present)", "enabled": "support_roof_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false, "settable_per_mesh": false,
@ -5543,7 +5547,9 @@
"type": "float", "type": "float",
"default_value": 0.0, "default_value": 0.0,
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')", "value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')",
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')", "maximum_value": "extruderValue(support_extruder_nr, 'support_offset') if support_structure == 'normal' else None",
"minimum_value_warning": "-1 * machine_nozzle_size",
"maximum_value_warning": "10 * machine_nozzle_size",
"limit_to_extruder": "support_bottom_extruder_nr", "limit_to_extruder": "support_bottom_extruder_nr",
"enabled": "support_bottom_enable and (support_enable or support_meshes_present)", "enabled": "support_bottom_enable and (support_enable or support_meshes_present)",
"settable_per_mesh": false, "settable_per_mesh": false,

5
resources/qml/Preferences/SettingVisibilityItem.qml
View File

@ -20,6 +20,7 @@ Item
width: childrenRect.width; width: childrenRect.width;
height: childrenRect.height; height: childrenRect.height;
id: checkboxTooltipArea id: checkboxTooltipArea
x: check.height
UM.CheckBox UM.CheckBox
{ {
id: check id: check
@ -40,7 +41,7 @@ Item
{ {
width: height width: height
height: check.height height: check.height
anchors.left: checkboxTooltipArea.right anchors.right: checkboxTooltipArea.left
anchors.leftMargin: 2 * screenScaleFactor anchors.leftMargin: 2 * screenScaleFactor
text: text:
@ -82,7 +83,7 @@ Item
source: UM.Theme.getIcon("Information") source: UM.Theme.getIcon("Information")
color: UM.Theme.getColor("primary_button_text") color: UM.Theme.getColor("small_button_text")
} }
visible: provider.properties.enabled == "False" visible: provider.properties.enabled == "False"

4
resources/qml/Settings/SettingView.qml
View File

@ -40,7 +40,7 @@ Item
Cura.TextField Cura.TextField
{ {
id: filter id: filter
height: parent.height implicitHeight: parent.height
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
topPadding: height / 4 topPadding: height / 4
@ -337,7 +337,7 @@ Item
} }
function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) } function onShowTooltip(text) { base.showTooltip(delegate, Qt.point(-settingsView.x - UM.Theme.getSize("default_margin").width, 0), text) }
function onHideTooltip() { base.hideTooltip() } function onHideTooltip() { base.hideTooltip() }
function onShowAllHiddenInheritedSettings() function onShowAllHiddenInheritedSettings(category_id)
{ {
var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id) var children_with_override = Cura.SettingInheritanceManager.getChildrenKeysWithOverride(category_id)
for(var i = 0; i < children_with_override.length; i++) for(var i = 0; i < children_with_override.length; i++)