From d2d28fbdfb638de4841d13a178d1577071a16eed Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Thu, 19 Oct 2017 20:49:11 +0200 Subject: [PATCH] CURA-4470 Fix quality slider not selecting correct quality profile Compare selected quality by quality_type instead of id when loading a project file from older versions of Cura. --- resources/qml/SidebarSimple.qml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/resources/qml/SidebarSimple.qml b/resources/qml/SidebarSimple.qml index 6091d04b72..851ec6196b 100644 --- a/resources/qml/SidebarSimple.qml +++ b/resources/qml/SidebarSimple.qml @@ -89,14 +89,14 @@ Item var availableMin = -1 var availableMax = -1 - for (var i = 0; i <= Cura.ProfilesModel.rowCount(); i++) { + for (var i = 0; i < Cura.ProfilesModel.rowCount(); i++) { var qualityItem = Cura.ProfilesModel.getItem(i) // Add each quality item to the UI quality model qualityModel.append(qualityItem) // Set selected value - if (Cura.MachineManager.activeQualityId == qualityItem.id) { + if (Cura.MachineManager.activeQualityType == qualityItem.metadata.quality_type) { qualityModel.activeQualityIndex = i } @@ -143,14 +143,7 @@ Item qualityModel.availableTotalTicks = -1 // check, the ticks count cannot be less than zero - if(Cura.ProfilesModel.rowCount() != 0) - { - qualityModel.totalTicks = Cura.ProfilesModel.rowCount() - 1 // minus one, because slider starts from 0 - } - else - { - qualityModel.totalTicks = 0 - } + qualityModel.totalTicks = Math.max(0, Cura.ProfilesModel.rowCount() - 1) } }