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

CURA-4182 better variable names

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-22 11:14:13 +02:00
parent 7f909df84a
commit ae6b1a9f15
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
resources/qml/SidebarSimple.qml
View File

@ -73,17 +73,15 @@ Item
property var totalTicks: 0 property var totalTicks: 0
property var availableTotalTicks: 0 property var availableTotalTicks: 0
property var qualitySliderStepWidth: qualityModel.totalTicks != 0 ? (base.width * 0.55) / (qualityModel.totalTicks) : 0
property var activeQualityId: 0 property var activeQualityId: 0
property var sliderAvailableMin : 0 property var qualitySliderStepWidth: qualityModel.totalTicks != 0 ? (base.width * 0.55) / (qualityModel.totalTicks) : 0
property var sliderAvailableMax : 0 property var qualitySliderAvailableMin : 0
property var sliderMarginRight : 0 property var qualitySliderAvailableMax : 0
property var qualitySliderMarginRight : 0
function update () { function update () {
qualityModel.clear() reset()
qualityModel.totalTicks = Cura.ProfilesModel.rowCount() - 1 // minus one, because slider starts from 0
var availableMin = -1 var availableMin = -1
var availableMax = -1 var availableMax = -1
@ -117,8 +115,8 @@ Item
calculateSliderStepWidth(qualityModel.totalTicks) calculateSliderStepWidth(qualityModel.totalTicks)
calculateSliderMargins(availableMin, availableMax) calculateSliderMargins(availableMin, availableMax)
qualityModel.sliderAvailableMin = availableMin qualityModel.qualitySliderAvailableMin = availableMin
qualityModel.sliderAvailableMax = availableMax qualityModel.qualitySliderAvailableMax = availableMax
} }
function calculateSliderStepWidth (totalTicks) { function calculateSliderStepWidth (totalTicks) {
@ -128,21 +126,27 @@ Item
function calculateSliderMargins (availableMin, availableMax) { function calculateSliderMargins (availableMin, availableMax) {
if(availableMin == -1) if(availableMin == -1)
{ {
qualityModel.sliderMarginRight = base.width * 0.55 qualityModel.qualitySliderMarginRight = base.width * 0.55
} }
else if (availableMin == 0 && availableMax == 0) else if (availableMin == 0 && availableMax == 0)
{ {
qualityModel.sliderMarginRight = base.width * 0.55 qualityModel.qualitySliderMarginRight = base.width * 0.55
} }
else if(availableMin == availableMax) else if(availableMin == availableMax)
{ {
qualityModel.sliderMarginRight = (qualityModel.totalTicks - availableMin) * qualitySliderStepWidth qualityModel.qualitySliderMarginRight = (qualityModel.totalTicks - availableMin) * qualitySliderStepWidth
} }
else if(availableMin != availableMax) else if(availableMin != availableMax)
{ {
qualityModel.sliderMarginRight = (qualityModel.totalTicks - availableMax) * qualitySliderStepWidth qualityModel.qualitySliderMarginRight = (qualityModel.totalTicks - availableMax) * qualitySliderStepWidth
} }
} }
function reset () {
qualityModel.clear()
qualityModel.totalTicks = Cura.ProfilesModel.rowCount() - 1 // minus one, because slider starts from 0
qualityModel.availableTotalTicks = -1
}
} }
Text Text
@ -222,8 +226,8 @@ Item
enabled: qualityModel.availableTotalTicks > 0 enabled: qualityModel.availableTotalTicks > 0
updateValueWhileDragging : false updateValueWhileDragging : false
minimumValue: qualityModel.sliderAvailableMin minimumValue: qualityModel.qualitySliderAvailableMin
maximumValue: qualityModel.sliderAvailableMax maximumValue: qualityModel.qualitySliderAvailableMax
stepSize: 1 stepSize: 1
value: qualityModel.activeQualityId value: qualityModel.activeQualityId
@ -231,7 +235,7 @@ Item
width: qualityModel.qualitySliderStepWidth * qualityModel.availableTotalTicks width: qualityModel.qualitySliderStepWidth * qualityModel.availableTotalTicks
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: qualityModel.sliderMarginRight anchors.rightMargin: qualityModel.qualitySliderMarginRight
style: SliderStyle style: SliderStyle
{ {