3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 07:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add row for the adhesion setting in the recommended mode

Browse source 
Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-12-02 19:14:34 +01:00
parent 1cea36b08a
commit adabb833e0
3 changed files with 106 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

99
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml Normal file
View file

@ -0,0 +1,99 @@
// Copyright (c) 2018 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.7
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import UM 1.2 as UM
import Cura 1.0 as Cura
//
// Adhesion
//
Item
{
id: enableAdhesionRow
height: childrenRect.height
property real labelColumnWidth: Math.round(width / 3)
Cura.IconWithText
{
id: enableAdhesionRowTitle
anchors.top: parent.top
anchors.left: parent.left
source: UM.Theme.getIcon("category_adhesion")
text: catalog.i18nc("@label", "Adhesion")
width: labelColumnWidth
}
Item
{
id: enableAdhesionContainer
height: childrenRect.height
anchors
{
left: enableAdhesionRowTitle.right
right: parent.right
verticalCenter: enableAdhesionRowTitle.verticalCenter
}
CheckBox
{
id: enableAdhesionCheckBox
anchors.verticalCenter: parent.verticalCenter
//: Setting enable printing build-plate adhesion helper checkbox
style: UM.Theme.styles.checkbox
enabled: base.settingsEnabled
visible: platformAdhesionType.properties.enabled == "True"
checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none"
MouseArea
{
id: adhesionMouseArea
anchors.fill: parent
hoverEnabled: true
enabled: base.settingsEnabled
onClicked:
{
var adhesionType = "skirt"
if (!parent.checked)
{
// Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
platformAdhesionType.removeFromContainer(0)
adhesionType = platformAdhesionType.properties.value
if(adhesionType == "skirt" || adhesionType == "none")
{
// If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
adhesionType = "brim"
}
}
platformAdhesionType.setPropertyValue("value", adhesionType)
}
onEntered:
{
base.showTooltip(enableAdhesionCheckBox, Qt.point(-enableAdhesionContainer.x - UM.Theme.getSize("thick_margin").width, 0),
catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
}
onExited: base.hideTooltip()
}
}
}
UM.SettingPropertyProvider
{
id: platformAdhesionType
containerStack: Cura.MachineManager.activeMachine
removeUnusedValue: false //Doesn't work with settings that are resolved.
key: "adhesion_type"
watchedProperties: [ "value", "enabled" ]
storeIndex: 0
}
}

77
resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml
View file

@ -65,76 +65,11 @@ Item
labelColumnWidth: parent.firstColumnWidth
}
//
// // Adhesion
// Row
// {
// anchors.left: parent.left
// anchors.right: parent.right
// height: childrenRect.height
//
// Cura.IconWithText
// {
// id: adhesionHelperLabel
// visible: adhesionCheckBox.visible
// source: UM.Theme.getIcon("category_adhesion")
// text: catalog.i18nc("@label", "Adhesion")
// width: labelColumnWidth
// }
//
// CheckBox
// {
// id: adhesionCheckBox
// property alias _hovered: adhesionMouseArea.containsMouse
//
// //: Setting enable printing build-plate adhesion helper checkbox
// style: UM.Theme.styles.checkbox
// enabled: base.settingsEnabled
//
// visible: platformAdhesionType.properties.enabled == "True"
// checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none"
//
// MouseArea
// {
// id: adhesionMouseArea
// anchors.fill: parent
// hoverEnabled: true
// enabled: base.settingsEnabled
// onClicked:
// {
// var adhesionType = "skirt"
// if(!parent.checked)
// {
// // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
// platformAdhesionType.removeFromContainer(0)
// adhesionType = platformAdhesionType.properties.value
// if(adhesionType == "skirt" || adhesionType == "none")
// {
// // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
// adhesionType = "brim"
// }
// }
// platformAdhesionType.setPropertyValue("value", adhesionType)
// }
// onEntered:
// {
// base.showTooltip(adhesionCheckBox, Qt.point(-adhesionCheckBox.x, 0),
// catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
// }
// onExited: base.hideTooltip()
// }
// }
// }
}
UM.SettingPropertyProvider
{
id: platformAdhesionType
containerStack: Cura.MachineManager.activeMachine
removeUnusedValue: false //Doesn't work with settings that are resolved.
key: "adhesion_type"
watchedProperties: [ "value", "enabled" ]
storeIndex: 0
RecommendedAdhesionSelector
{
width: parent.width
// TODO Create a reusable component with these properties to not define them separately for each component
labelColumnWidth: parent.firstColumnWidth
}
}
}

2
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View file

@ -33,7 +33,7 @@ Item
Item
{
id: enableSupportContainer
height: childrenRect.height
height: enableSupportCheckBox.height
anchors
{