3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-29 13:51:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'feature_support_meshes_present' of https://github.com/fieldOfView/Cura into fieldOfView-feature_support_meshes_present

Browse source
This commit is contained in:
Ghostkeeper 2020-06-05 13:20:31 +02:00
commit 7ec681a04d
No known key found for this signature in database
GPG key ID: D2A8871EE34EC59A
4 changed files with 141 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

17
plugins/PerObjectSettingsTool/PerObjectSettingsPanel.qml
View file

@ -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