mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-14 10:45:54 +08:00
Merge branch 'master' into CURA-7454_Add_remove_printers_button_in_removed_printers_from_account_message
This commit is contained in:
Kostas Karmas
commit
d662c607dd
@ -1909,7 +1909,6 @@ class CuraApplication(QtApplication):
|
||||
return
|
||||
selection_pass = cast(SelectionPass, self.getRenderer().getRenderPass("selection"))
|
||||
if not selection_pass: # If you right-click before the rendering has been initialised there might not be a selection pass yet.
|
||||
print("--------------ding! Got the crash.")
|
||||
return
|
||||
node = self.getController().getScene().findObject(selection_pass.getIdAtPosition(x, y))
|
||||
if not node:
|
||||
|
||||
@ -96,11 +96,12 @@ class LocalAuthorizationServer:
|
||||
|
||||
:return: None
|
||||
"""
|
||||
if sys.platform == "win32":
|
||||
try:
|
||||
if self._web_server:
|
||||
if sys.platform == "win32":
|
||||
try:
|
||||
self._web_server.serve_forever()
|
||||
except OSError as e:
|
||||
Logger.warning(str(e))
|
||||
else:
|
||||
# Leave the default behavior in non-windows platforms
|
||||
self._web_server.serve_forever()
|
||||
except OSError as e:
|
||||
Logger.warning(str(e))
|
||||
else:
|
||||
# Leave the default behavior in non-windows platforms
|
||||
self._web_server.serve_forever()
|
||||
|
||||
@ -6,6 +6,7 @@ from PyQt5.QtWidgets import QApplication
|
||||
from UM.Scene.Camera import Camera
|
||||
from cura.UI.ObjectsModel import ObjectsModel
|
||||
from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
|
||||
from cura.Scene.CuraSceneNode import CuraSceneNode
|
||||
|
||||
from UM.Application import Application
|
||||
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
|
||||
@ -43,6 +44,26 @@ class CuraSceneController(QObject):
|
||||
self._change_timer.start()
|
||||
|
||||
def updateMaxBuildPlate(self, *args):
|
||||
global_stack = Application.getInstance().getGlobalContainerStack()
|
||||
if global_stack:
|
||||
scene_has_support_meshes = self._sceneHasSupportMeshes() # TODO: see if this can be cached
|
||||
|
||||
if scene_has_support_meshes != global_stack.getProperty("support_meshes_present", "value"):
|
||||
# Adjust the setting without having the setting value in an InstanceContainer
|
||||
setting_definitions = global_stack.definition.findDefinitions(key="support_meshes_present")
|
||||
if setting_definitions:
|
||||
# Recreate the setting definition because the default_value is readonly
|
||||
definition_dict = setting_definitions[0].serialize_to_dict()
|
||||
definition_dict["enabled"] = False # The enabled property has a value that would need to be evaluated
|
||||
definition_dict["default_value"] = scene_has_support_meshes
|
||||
relations = setting_definitions[0].relations # Relations are wiped when deserializing from a dict
|
||||
setting_definitions[0].deserialize(definition_dict)
|
||||
|
||||
# Restore relations and notify them that the setting has changed
|
||||
for relation in relations:
|
||||
setting_definitions[0].relations.append(relation)
|
||||
global_stack.propertyChanged.emit(relation.target.key, "enabled")
|
||||
|
||||
max_build_plate = self._calcMaxBuildPlate()
|
||||
changed = False
|
||||
if max_build_plate != self._max_build_plate:
|
||||
@ -72,6 +93,15 @@ class CuraSceneController(QObject):
|
||||
max_build_plate = max(build_plate_number, max_build_plate)
|
||||
return max_build_plate
|
||||
|
||||
def _sceneHasSupportMeshes(self):
|
||||
root = Application.getInstance().getController().getScene().getRoot()
|
||||
for node in root.getAllChildren():
|
||||
if isinstance(node, CuraSceneNode):
|
||||
per_mesh_stack = node.callDecoration("getStack")
|
||||
if per_mesh_stack and per_mesh_stack.getProperty("support_mesh", "value"):
|
||||
return True
|
||||
return False
|
||||
|
||||
@pyqtSlot(int)
|
||||
def changeSelection(self, index):
|
||||
"""Either select or deselect an item"""
|
||||
|
||||
@ -38,6 +38,12 @@ class CuraSceneNode(SceneNode):
|
||||
def isSelectable(self) -> bool:
|
||||
return super().isSelectable() and self.callDecoration("getBuildPlateNumber") == cura.CuraApplication.CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
||||
|
||||
def isSupportMesh(self) -> bool:
|
||||
per_mesh_stack = self.callDecoration("getStack")
|
||||
if not per_mesh_stack:
|
||||
return False
|
||||
return per_mesh_stack.getProperty("support_mesh", "value")
|
||||
|
||||
def getPrintingExtruder(self) -> Optional[ExtruderStack]:
|
||||
"""Get the extruder used to print this node. If there is no active node, then the extruder in position zero is returned
|
||||
|
||||
|
||||
@ -466,10 +466,10 @@ class ThreeMFWorkspaceReader(WorkspaceReader):
|
||||
extruder_info.intent_info = instance_container_info_dict[intent_id]
|
||||
|
||||
if not machine_conflict and containers_found_dict["machine"]:
|
||||
if position not in global_stack.extruders:
|
||||
if int(position) >= len(global_stack.extrurderList):
|
||||
continue
|
||||
|
||||
existing_extruder_stack = global_stack.extruders[position]
|
||||
existing_extruder_stack = global_stack.extruderList[int(position)]
|
||||
# check if there are any changes at all in any of the container stacks.
|
||||
id_list = self._getContainerIdListFromSerialized(serialized)
|
||||
for index, container_id in enumerate(id_list):
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (c) 2018 Ultimaker B.V.
|
||||
# Copyright (c) 2020 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
from UM.Application import Application
|
||||
@ -114,7 +114,7 @@ class FirmwareUpdateCheckerJob(Job):
|
||||
# notify the user when no new firmware version is available.
|
||||
if (checked_version != "") and (checked_version != current_version):
|
||||
Logger.log("i", "Showing firmware update message for new version: {version}".format(version = current_version))
|
||||
message = FirmwareUpdateCheckerMessage(machine_id, self._machine_name,
|
||||
message = FirmwareUpdateCheckerMessage(machine_id, self._machine_name, current_version,
|
||||
self._lookups.getRedirectUserUrl())
|
||||
message.actionTriggered.connect(self._callback)
|
||||
message.show()
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright (c) 2018 Ultimaker B.V.
|
||||
# Copyright (c) 2020 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
from UM.i18n import i18nCatalog
|
||||
@ -11,11 +11,12 @@ i18n_catalog = i18nCatalog("cura")
|
||||
class FirmwareUpdateCheckerMessage(Message):
|
||||
STR_ACTION_DOWNLOAD = "download"
|
||||
|
||||
def __init__(self, machine_id: int, machine_name: str, download_url: str) -> None:
|
||||
def __init__(self, machine_id: int, machine_name: str, latest_version: str, download_url: str) -> None:
|
||||
super().__init__(i18n_catalog.i18nc(
|
||||
"@info Don't translate {machine_name}, since it gets replaced by a printer name!",
|
||||
"New features are available for your {machine_name}! It is recommended to update the firmware on your printer.").format(
|
||||
machine_name = machine_name),
|
||||
"New features or bug-fixes may be available for your {machine_name}! If not already at the latest version, "
|
||||
"it is recommended to update the firmware on your printer to version {latest_version}.").format(
|
||||
machine_name = machine_name, latest_version = latest_version),
|
||||
title = i18n_catalog.i18nc(
|
||||
"@info:title The %s gets replaced with the printer name.",
|
||||
"New %s firmware available") % machine_name)
|
||||
|
||||
@ -32,10 +32,7 @@ Item
|
||||
var type = currentMeshType
|
||||
|
||||
// set checked state of mesh type buttons
|
||||
normalButton.checked = type === normalMeshType
|
||||
supportMeshButton.checked = type === supportMeshType
|
||||
overhangMeshButton.checked = type === infillMeshType || type === cuttingMeshType
|
||||
antiOverhangMeshButton.checked = type === antiOverhangMeshType
|
||||
updateMeshTypeCheckedState(type)
|
||||
|
||||
// update active type label
|
||||
for (var button in meshTypeButtons.children)
|
||||
@ -49,9 +46,19 @@ Item
|
||||
visibility_handler.addSkipResetSetting(currentMeshType)
|
||||
}
|
||||
|
||||
function updateMeshTypeCheckedState(type)
|
||||
{
|
||||
// set checked state of mesh type buttons
|
||||
normalButton.checked = type === normalMeshType
|
||||
supportMeshButton.checked = type === supportMeshType
|
||||
overlapMeshButton.checked = type === infillMeshType || type === cuttingMeshType
|
||||
antiOverhangMeshButton.checked = type === antiOverhangMeshType
|
||||
}
|
||||
|
||||
function setMeshType(type)
|
||||
{
|
||||
UM.ActiveTool.setProperty("MeshType", type)
|
||||
updateMeshTypeCheckedState(type)
|
||||
}
|
||||
|
||||
UM.I18nCatalog { id: catalog; name: "cura"}
|
||||
@ -95,7 +102,7 @@ Item
|
||||
|
||||
Button
|
||||
{
|
||||
id: overhangMeshButton
|
||||
id: overlapMeshButton
|
||||
text: catalog.i18nc("@label", "Modify settings for overlaps")
|
||||
iconSource: UM.Theme.getIcon("pos_modify_overlaps");
|
||||
property bool needBorder: true
|
||||
|
||||
@ -101,7 +101,7 @@ class SliceInfo(QObject, Extension):
|
||||
|
||||
user_modified_setting_keys = set() # type: Set[str]
|
||||
|
||||
for stack in [global_stack] + list(global_stack.extruders.values()):
|
||||
for stack in [global_stack] + global_stack.extruderList:
|
||||
# Get all settings in user_changes and quality_changes
|
||||
all_keys = stack.userChanges.getAllKeys() | stack.qualityChanges.getAllKeys()
|
||||
user_modified_setting_keys |= all_keys
|
||||
@ -152,7 +152,7 @@ class SliceInfo(QObject, Extension):
|
||||
|
||||
# add extruder specific data to slice info
|
||||
data["extruders"] = []
|
||||
extruders = list(global_stack.extruders.values())
|
||||
extruders = global_stack.extruderList
|
||||
extruders = sorted(extruders, key = lambda extruder: extruder.getMetaDataEntry("position"))
|
||||
|
||||
for extruder in extruders:
|
||||
|
||||
@ -97,7 +97,7 @@ class UFPWriter(MeshWriter):
|
||||
Logger.log("w", "The material extension: %s was already added", material_extension)
|
||||
|
||||
added_materials = []
|
||||
for extruder_stack in global_stack.extruders.values():
|
||||
for extruder_stack in global_stack.extruderList:
|
||||
material = extruder_stack.material
|
||||
try:
|
||||
material_file_name = material.getMetaData()["base_file"] + ".xml.fdm_material"
|
||||
|
||||
@ -91,8 +91,6 @@ class CloudOutputDeviceManager:
|
||||
if self._syncing:
|
||||
return
|
||||
|
||||
Logger.info("Syncing cloud printer clusters")
|
||||
|
||||
self._syncing = True
|
||||
self._account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING)
|
||||
self._api.getClusters(self._onGetRemoteClustersFinished, self._onGetRemoteClusterFailed)
|
||||
|
||||
@ -887,7 +887,7 @@
|
||||
"maximum_value_warning": "3 * machine_nozzle_size",
|
||||
"default_value": 0.4,
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable)",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present)",
|
||||
"value": "line_width",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
@ -903,7 +903,7 @@
|
||||
"minimum_value_warning": "0.1 + 0.4 * machine_nozzle_size",
|
||||
"maximum_value_warning": "2 * machine_nozzle_size",
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_interface_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"value": "line_width",
|
||||
"settable_per_mesh": false,
|
||||
@ -920,7 +920,7 @@
|
||||
"minimum_value_warning": "0.4 * machine_nozzle_size",
|
||||
"maximum_value_warning": "2 * machine_nozzle_size",
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_roof_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_line_width')",
|
||||
"settable_per_mesh": false,
|
||||
@ -936,7 +936,7 @@
|
||||
"minimum_value_warning": "0.4 * machine_nozzle_size",
|
||||
"maximum_value_warning": "2 * machine_nozzle_size",
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_bottom_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_line_width')",
|
||||
"settable_per_mesh": false,
|
||||
@ -2846,7 +2846,7 @@
|
||||
"maximum_value_warning": "150",
|
||||
"default_value": 60,
|
||||
"value": "speed_print",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": false,
|
||||
"limit_to_extruder": "support_extruder_nr",
|
||||
"settable_per_extruder": true,
|
||||
@ -2863,7 +2863,7 @@
|
||||
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
||||
"maximum_value_warning": "150",
|
||||
"value": "speed_support",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -2878,7 +2878,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"value": "speed_support / 1.5",
|
||||
"settable_per_mesh": false,
|
||||
@ -2895,7 +2895,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'speed_support_interface')",
|
||||
"settable_per_mesh": false,
|
||||
@ -2911,7 +2911,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"maximum_value": "math.sqrt(machine_max_feedrate_x ** 2 + machine_max_feedrate_y ** 2)",
|
||||
"maximum_value_warning": "150",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'speed_support_interface')",
|
||||
"settable_per_mesh": false,
|
||||
@ -3186,7 +3186,7 @@
|
||||
"maximum_value_warning": "10000",
|
||||
"default_value": 3000,
|
||||
"value": "acceleration_print",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"limit_to_extruder": "support_extruder_nr",
|
||||
"settable_per_extruder": true,
|
||||
@ -3203,7 +3203,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3219,7 +3219,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('acceleration_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -3236,7 +3236,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "acceleration_enabled and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3252,7 +3252,7 @@
|
||||
"minimum_value": "0.1",
|
||||
"minimum_value_warning": "100",
|
||||
"maximum_value_warning": "10000",
|
||||
"enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "acceleration_enabled and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3471,7 +3471,7 @@
|
||||
"maximum_value_warning": "50",
|
||||
"default_value": 20,
|
||||
"value": "jerk_print",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"limit_to_extruder": "support_extruder_nr",
|
||||
@ -3487,7 +3487,7 @@
|
||||
"value": "jerk_support",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3502,7 +3502,7 @@
|
||||
"value": "jerk_support",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -3518,7 +3518,7 @@
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3533,7 +3533,7 @@
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'jerk_support_interface')",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "50",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('jerk_enabled') and support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -3777,7 +3777,7 @@
|
||||
"description": "Omit retraction when moving from support to support in a straight line. Enabling this setting saves print time, but can lead to excessive stringing within the support structure.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "retraction_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "retraction_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
@ -4107,7 +4107,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "int(defaultExtruderPosition())",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"children": {
|
||||
@ -4118,7 +4118,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "support_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
@ -4129,7 +4129,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "support_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
@ -4140,7 +4140,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "support_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"children":
|
||||
@ -4152,7 +4152,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "support_interface_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
@ -4163,7 +4163,7 @@
|
||||
"type": "extruder",
|
||||
"default_value": "0",
|
||||
"value": "support_interface_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and extruders_enabled_count > 1",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and extruders_enabled_count > 1",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
}
|
||||
@ -4217,7 +4217,7 @@
|
||||
"gyroid": "Gyroid"
|
||||
},
|
||||
"default_value": "zigzag",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4232,7 +4232,7 @@
|
||||
"maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3",
|
||||
"type": "int",
|
||||
"value": "1 if support_tree_enable else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4244,7 +4244,7 @@
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"value": "support_pattern == 'cross' or support_pattern == 'gyroid'",
|
||||
"enabled": "(support_enable or support_tree_enable) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'cross' or support_pattern == 'gyroid')",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4255,7 +4255,7 @@
|
||||
"description": "Connect the ZigZags. This will increase the strength of the zig zag support structure.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "(support_enable or support_tree_enable) and support_pattern == 'zigzag'",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern == 'zigzag'",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4270,7 +4270,7 @@
|
||||
"maximum_value_warning": "100",
|
||||
"default_value": 15,
|
||||
"value": "15 if support_enable else 0 if support_tree_enable else 15",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -4285,7 +4285,7 @@
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "support_line_width",
|
||||
"default_value": 2.66,
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"value": "0 if support_infill_rate == 0 else (support_line_width * 100) / support_infill_rate * (2 if support_pattern == 'grid' else (3 if support_pattern == 'triangles' else 1))",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
@ -4300,7 +4300,7 @@
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "support_line_width",
|
||||
"default_value": 2.66,
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"value": "support_line_distance",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
@ -4314,7 +4314,7 @@
|
||||
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the default angle 0 degrees.",
|
||||
"type": "[int]",
|
||||
"default_value": "[ ]",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_pattern != 'concentric' and support_infill_rate > 0",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_pattern != 'concentric' and support_infill_rate > 0",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4325,7 +4325,7 @@
|
||||
"description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -4339,7 +4339,7 @@
|
||||
"default_value": 8.0,
|
||||
"minimum_value": "0.0",
|
||||
"maximum_value_warning": "50.0",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_brim_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
@ -4354,7 +4354,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "50 / skirt_brim_line_width",
|
||||
"value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_brim_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_brim_enable",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"limit_to_extruder": "support_infill_extruder_nr"
|
||||
@ -4371,7 +4371,7 @@
|
||||
"maximum_value_warning": "machine_nozzle_size",
|
||||
"default_value": 0.1,
|
||||
"limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
@ -4384,7 +4384,7 @@
|
||||
"maximum_value_warning": "machine_nozzle_size",
|
||||
"default_value": 0.1,
|
||||
"type": "float",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')",
|
||||
"limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
@ -4400,7 +4400,7 @@
|
||||
"value": "extruderValue(support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr, 'support_z_distance') if support_type == 'everywhere' else 0",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable) and resolveOrValue('support_type') == 'everywhere'",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and resolveOrValue('support_type') == 'everywhere'",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
@ -4415,7 +4415,7 @@
|
||||
"maximum_value_warning": "1.5 * machine_nozzle_tip_outer_diameter",
|
||||
"default_value": 0.7,
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_xy_overrides_z":
|
||||
@ -4430,7 +4430,7 @@
|
||||
},
|
||||
"default_value": "z_overrides_xy",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_xy_distance_overhang":
|
||||
@ -4445,7 +4445,7 @@
|
||||
"default_value": 0.2,
|
||||
"value": "machine_nozzle_size / 2",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"enabled": "support_enable and support_xy_overrides_z == 'z_overrides_xy'",
|
||||
"enabled": "(support_enable or support_meshes_present) and support_xy_overrides_z == 'z_overrides_xy'",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_bottom_stair_step_height":
|
||||
@ -4458,7 +4458,7 @@
|
||||
"limit_to_extruder": "support_bottom_extruder_nr if support_bottom_enable else support_infill_extruder_nr",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "1.0",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_bottom_stair_step_width":
|
||||
@ -4471,7 +4471,7 @@
|
||||
"limit_to_extruder": "support_interface_extruder_nr if support_interface_enable else support_infill_extruder_nr",
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "10.0",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_join_distance":
|
||||
@ -4484,7 +4484,7 @@
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"minimum_value_warning": "0",
|
||||
"maximum_value_warning": "10",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_offset":
|
||||
@ -4497,7 +4497,7 @@
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"minimum_value_warning": "-1 * machine_nozzle_size",
|
||||
"maximum_value_warning": "10 * machine_nozzle_size",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_infill_sparse_thickness":
|
||||
@ -4511,7 +4511,7 @@
|
||||
"maximum_value_warning": "0.75 * machine_nozzle_size",
|
||||
"maximum_value": "resolveOrValue('layer_height') * 8",
|
||||
"value": "resolveOrValue('layer_height')",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false
|
||||
},
|
||||
@ -4524,7 +4524,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "1 if (support_pattern == 'cross' or support_pattern == 'lines' or support_pattern == 'zigzag' or support_pattern == 'concentric') else 5",
|
||||
"maximum_value": "999999 if support_line_distance == 0 else (20 - math.log(support_line_distance) / math.log(2))",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false
|
||||
},
|
||||
@ -4537,7 +4537,7 @@
|
||||
"default_value": 1,
|
||||
"minimum_value": "0.0001",
|
||||
"minimum_value_warning": "3 * resolveOrValue('layer_height')",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_infill_rate > 0 and gradual_support_infill_steps > 0",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_infill_rate > 0 and gradual_support_infill_steps > 0",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false
|
||||
},
|
||||
@ -4550,7 +4550,7 @@
|
||||
"default_value": 0.0,
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "5",
|
||||
"enabled": "support_enable",
|
||||
"enabled": "support_enable or support_meshes_present",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
@ -4561,7 +4561,7 @@
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
@ -4573,7 +4573,7 @@
|
||||
"default_value": false,
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_enable')",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_bottom_enable":
|
||||
@ -4584,7 +4584,7 @@
|
||||
"default_value": false,
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_enable')",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
@ -4600,7 +4600,7 @@
|
||||
"minimum_value_warning": "0.2 + layer_height",
|
||||
"maximum_value_warning": "10",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
@ -4616,7 +4616,7 @@
|
||||
"maximum_value_warning": "10",
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_height')",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_bottom_height":
|
||||
@ -4631,7 +4631,7 @@
|
||||
"minimum_value_warning": "min(support_bottom_distance + layer_height, support_bottom_stair_step_height)",
|
||||
"maximum_value_warning": "10",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
@ -4645,7 +4645,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "support_interface_height",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"support_interface_density":
|
||||
@ -4658,7 +4658,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value_warning": "100",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children":
|
||||
@ -4673,7 +4673,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value": "100",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_density')",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -4690,7 +4690,7 @@
|
||||
"minimum_value_warning": "support_roof_line_width - 0.0001",
|
||||
"value": "0 if support_roof_density == 0 else (support_roof_line_width * 100) / support_roof_density * (2 if support_roof_pattern == 'grid' else (3 if support_roof_pattern == 'triangles' else 1))",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
@ -4706,7 +4706,7 @@
|
||||
"minimum_value": "0",
|
||||
"maximum_value": "100",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_density')",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -4723,7 +4723,7 @@
|
||||
"minimum_value_warning": "support_bottom_line_width - 0.0001",
|
||||
"value": "0 if support_bottom_density == 0 else (support_bottom_line_width * 100) / support_bottom_density * (2 if support_bottom_pattern == 'grid' else (3 if support_bottom_pattern == 'triangles' else 1))",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
@ -4746,7 +4746,7 @@
|
||||
},
|
||||
"default_value": "concentric",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children":
|
||||
@ -4767,7 +4767,7 @@
|
||||
"default_value": "concentric",
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_pattern')",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
@ -4787,7 +4787,7 @@
|
||||
"default_value": "concentric",
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_pattern')",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
@ -4803,7 +4803,7 @@
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "minimum_support_area",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true,
|
||||
"children":
|
||||
{
|
||||
@ -4818,7 +4818,7 @@
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "minimum_support_area",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true
|
||||
},
|
||||
"minimum_bottom_area":
|
||||
@ -4832,7 +4832,7 @@
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "minimum_support_area",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": true
|
||||
}
|
||||
}
|
||||
@ -4846,7 +4846,7 @@
|
||||
"default_value": 0.0,
|
||||
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_interface_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children":
|
||||
@ -4861,7 +4861,7 @@
|
||||
"value": "extruderValue(support_roof_extruder_nr, 'support_interface_offset')",
|
||||
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_roof_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
@ -4875,7 +4875,7 @@
|
||||
"value": "extruderValue(support_bottom_extruder_nr, 'support_interface_offset')",
|
||||
"maximum_value": "extruderValue(support_extruder_nr, 'support_offset')",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable)",
|
||||
"enabled": "support_bottom_enable and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
@ -4888,7 +4888,7 @@
|
||||
"type": "[int]",
|
||||
"default_value": "[ ]",
|
||||
"limit_to_extruder": "support_interface_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_interface_enable and support_interface_pattern != 'concentric'",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_interface_enable and support_interface_pattern != 'concentric'",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"children":
|
||||
@ -4901,7 +4901,7 @@
|
||||
"default_value": "[ ]",
|
||||
"value": "support_interface_angles",
|
||||
"limit_to_extruder": "support_roof_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_roof_enable and support_roof_pattern != 'concentric'",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_roof_enable and support_roof_pattern != 'concentric'",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
},
|
||||
@ -4913,7 +4913,7 @@
|
||||
"default_value": "[ ]",
|
||||
"value": "support_interface_angles",
|
||||
"limit_to_extruder": "support_bottom_extruder_nr",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_bottom_enable and support_bottom_pattern != 'concentric'",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_bottom_enable and support_bottom_pattern != 'concentric'",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
}
|
||||
@ -4925,7 +4925,7 @@
|
||||
"description": "When enabled, the print cooling fan speed is altered for the skin regions immediately above the support.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "support_enable or support_tree_enable",
|
||||
"enabled": "support_enable or support_tree_enable or support_meshes_present",
|
||||
"settable_per_mesh": false
|
||||
},
|
||||
"support_supported_skin_fan_speed":
|
||||
@ -4937,7 +4937,7 @@
|
||||
"maximum_value": "100",
|
||||
"default_value": 100,
|
||||
"type": "float",
|
||||
"enabled": "(support_enable or support_tree_enable) and support_fan_enable",
|
||||
"enabled": "(support_enable or support_tree_enable or support_meshes_present) and support_fan_enable",
|
||||
"settable_per_mesh": false
|
||||
},
|
||||
"support_use_towers":
|
||||
@ -5003,6 +5003,17 @@
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false,
|
||||
"settable_globally": false
|
||||
},
|
||||
"support_meshes_present":
|
||||
{
|
||||
"label": "Scene Has Support Meshes",
|
||||
"description": "There are support meshes present in the scene. This setting is controlled by Cura.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": false,
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false,
|
||||
"settable_per_meshgroup": false
|
||||
}
|
||||
}
|
||||
},
|
||||
@ -5173,7 +5184,7 @@
|
||||
"description": "Enforce brim to be printed around the model even if that space would otherwise be occupied by support. This replaces some regions of the first layer of support by brim regions.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_tree_enable)",
|
||||
"enabled": "resolveOrValue('adhesion_type') == 'brim' and (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
"limit_to_extruder": "support_infill_extruder_nr"
|
||||
@ -5957,7 +5968,7 @@
|
||||
"description": "Remove empty layers beneath the first printed layer if they are present. Disabling this setting can cause empty first layers if the Slicing Tolerance setting is set to Exclusive or Middle.",
|
||||
"type": "bool",
|
||||
"default_value": true,
|
||||
"enabled": "not (support_enable or support_tree_enable)",
|
||||
"enabled": "not (support_enable or support_tree_enable or support_meshes_present)",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": false
|
||||
},
|
||||
@ -6369,7 +6380,7 @@
|
||||
"description": "Skip some support line connections to make the support structure easier to break away. This setting is applicable to the Zig Zag support infill pattern.",
|
||||
"type": "bool",
|
||||
"default_value": false,
|
||||
"enabled": "support_enable and (support_pattern == 'zigzag')",
|
||||
"enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag'",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
@ -6383,7 +6394,7 @@
|
||||
"default_value": 20,
|
||||
"minimum_value": "0",
|
||||
"minimum_value_warning": "support_line_distance",
|
||||
"enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",
|
||||
"enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag' and support_skip_some_zags",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true,
|
||||
@ -6398,7 +6409,7 @@
|
||||
"value": "0 if support_line_distance == 0 else round(support_skip_zag_per_mm / support_line_distance)",
|
||||
"minimum_value": "1",
|
||||
"minimum_value_warning": "3",
|
||||
"enabled": "support_enable and (support_pattern == 'zigzag') and support_skip_some_zags",
|
||||
"enabled": "(support_enable or support_meshes_present) and support_pattern == 'zigzag' and support_skip_some_zags",
|
||||
"limit_to_extruder": "support_infill_extruder_nr",
|
||||
"settable_per_mesh": false,
|
||||
"settable_per_extruder": true
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Copyright (c) 2020 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
@ -98,7 +98,7 @@ Button
|
||||
target: buttonText
|
||||
property: "width"
|
||||
value: button.fixedWidthMode ? button.width - button.leftPadding - button.rightPadding
|
||||
: ((maximumWidth != 0 && contentWidth > maximumWidth) ? maximumWidth : undefined)
|
||||
: ((maximumWidth != 0 && button.contentWidth > maximumWidth) ? maximumWidth : undefined)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -96,7 +96,7 @@ Item
|
||||
id: configurationList
|
||||
spacing: UM.Theme.getSize("narrow_margin").height
|
||||
width: container.width - ((height > container.maximumHeight) ? container.ScrollBar.vertical.background.width : 0) //Make room for scroll bar if there is any.
|
||||
height: childrenRect.height
|
||||
height: contentHeight
|
||||
interactive: false // let the ScrollView process scroll events.
|
||||
|
||||
section.property: "modelData.printerType"
|
||||
|
||||
@ -73,8 +73,6 @@ Item
|
||||
height: textLabel.contentHeight + 2 * UM.Theme.getSize("narrow_margin").height
|
||||
hoverEnabled: true
|
||||
|
||||
baselineOffset: null // If we don't do this, there is a binding loop. WHich is a bit weird, since we override the contentItem anyway...
|
||||
|
||||
contentItem: RowLayout
|
||||
{
|
||||
spacing: 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user