3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-06 13:34:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Add the labels of the layer height to the slider

Browse source 
Contributes to CURA-5941.
This commit is contained in:
Diego Prado Gesto 2018-11-30 15:38:28 +01:00
parent 47b7d7bed8
commit 2c5f5170c2
1 changed files with 108 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

205
resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml
View file

@ -158,78 +158,116 @@ Item
}
}
Cura.IconWithText
Item
{
id: qualityRowTitle
source: UM.Theme.getIcon("category_layer_height")
text: catalog.i18nc("@label", "Layer Height")
id: titleRow
width: labelColumnWidth
height: childrenRect.height
Cura.IconWithText
{
id: qualityRowTitle
source: UM.Theme.getIcon("category_layer_height")
text: catalog.i18nc("@label", "Layer Height")
anchors.left: parent.left
anchors.right: customisedSettings.left
}
UM.SimpleButton
{
id: customisedSettings
visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.SimpleModeSettingsManager.isProfileUserCreated
height: visible ? Math.round(0.8 * qualityRowTitle.height) : 0
width: height
anchors
{
right: parent.right
rightMargin: UM.Theme.getSize("default_margin").width
leftMargin: UM.Theme.getSize("default_margin").width
verticalCenter: parent.verticalCenter
}
color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button")
iconSource: UM.Theme.getIcon("reset")
onClicked:
{
// if the current profile is user-created, switch to a built-in quality
Cura.MachineManager.resetToUseDefaultQuality()
}
onEntered:
{
var tooltipContent = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), tooltipContent)
}
onExited: base.hideTooltip()
}
}
// Show titles for the each quality slider ticks
Item
{
anchors.left: speedSlider.left
anchors.top: speedSlider.bottom
Repeater
{
model: qualityModel
Label
{
anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top
color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
text:
{
var result = ""
if(Cura.MachineManager.activeMachine != null)
{
result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height
if(result == undefined)
{
result = "";
}
else
{
result = Number(Math.round(result + "e+2") + "e-2"); //Round to 2 decimals. Javascript makes this difficult...
if (result == undefined || result != result) //Parse failure.
{
result = "";
}
}
}
return result
}
x:
{
// Make sure the text aligns correctly with each tick
if (qualityModel.totalTicks == 0)
{
// If there is only one tick, align it centrally
return Math.round(((settingsColumnWidth) - width) / 2)
}
else if (index == 0)
{
return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index
}
else if (index == qualityModel.totalTicks)
{
return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index - width
}
else
{
return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2))
}
}
}
}
}
//
// // Show titles for the each quality slider ticks
// Item
// {
// anchors.left: speedSlider.left
// anchors.top: speedSlider.bottom
//
// Repeater
// {
// model: qualityModel
//
// Label
// {
// anchors.verticalCenter: parent.verticalCenter
// anchors.top: parent.top
// color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
// text:
// {
// var result = ""
// if(Cura.MachineManager.activeMachine != null)
// {
// result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height
//
// if(result == undefined)
// {
// result = "";
// }
// else
// {
// result = Number(Math.round(result + "e+2") + "e-2"); //Round to 2 decimals. Javascript makes this difficult...
// if (result == undefined || result != result) //Parse failure.
// {
// result = "";
// }
// }
// }
// return result
// }
//
// x:
// {
// // Make sure the text aligns correctly with each tick
// if (qualityModel.totalTicks == 0)
// {
// // If there is only one tick, align it centrally
// return Math.round(((settingsColumnWidth) - width) / 2)
// }
// else if (index == 0)
// {
// return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index
// }
// else if (index == qualityModel.totalTicks)
// {
// return Math.round(settingsColumnWidth / qualityModel.totalTicks) * index - width
// }
// else
// {
// return Math.round((settingsColumnWidth / qualityModel.totalTicks) * index - (width / 2))
// }
// }
// }
// }
// }
//
//Print speed slider
// Two sliders are created, one at the bottom with the unavailable qualities
// and the other at the top with the available quality profiles and so the handle to select them.
@ -240,8 +278,9 @@ Item
anchors
{
left: qualityRowTitle.right
left: titleRow.right
right: parent.right
verticalCenter: titleRow.verticalCenter
}
// Draw unavailable slider
@ -401,32 +440,4 @@ Item
onExited: base.hideTooltip()
}
}
UM.SimpleButton
{
id: customisedSettings
visible: Cura.SimpleModeSettingsManager.isProfileCustomized || Cura.SimpleModeSettingsManager.isProfileUserCreated
height: Math.round(speedSlider.height * 0.8)
width: Math.round(speedSlider.height * 0.8)
anchors.verticalCenter: speedSlider.verticalCenter
anchors.right: speedSlider.left
anchors.rightMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
color: hovered ? UM.Theme.getColor("setting_control_button_hover") : UM.Theme.getColor("setting_control_button");
iconSource: UM.Theme.getIcon("reset");
onClicked:
{
// if the current profile is user-created, switch to a built-in quality
Cura.MachineManager.resetToUseDefaultQuality()
}
onEntered:
{
var tooltipContent = catalog.i18nc("@tooltip","You have modified some profile settings. If you want to change these go to custom mode.")
base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), tooltipContent)
}
onExited: base.hideTooltip()
}
}