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

Rename quality drop down menu models

Browse Source
This commit is contained in:
Lipu Fei 2018-03-01 15:37:48 +01:00
parent a395f93706
commit 06ec16d627
5 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cura/CuraApplication.py
View File

@ -57,8 +57,8 @@ from cura.Settings.MachineNameValidator import MachineNameValidator
from cura.Machines.Models.BuildPlateModel import BuildPlateModel from cura.Machines.Models.BuildPlateModel import BuildPlateModel
from cura.Machines.Models.NozzleModel import NozzleModel from cura.Machines.Models.NozzleModel import NozzleModel
from cura.Machines.Models.QualityProfilesModel import QualityProfilesModel from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
from cura.Machines.Models.CustomQualityProfilesModel import CustomQualityProfilesModel from cura.Machines.Models.CustomQualityProfilesDropDownMenuModel import CustomQualityProfilesDropDownMenuModel
from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel from cura.Machines.Models.MultiBuildPlateModel import MultiBuildPlateModel
@ -399,8 +399,8 @@ class CuraApplication(QtApplication):
self.getCuraSceneController().setActiveBuildPlate(0) # Initialize self.getCuraSceneController().setActiveBuildPlate(0) # Initialize
self._quality_profile_model = None self._quality_profile_drop_down_menu_model = None
self._custom_quality_profile_model = None self._custom_quality_profile_drop_down_menu_model = None
CuraApplication.Created = True CuraApplication.Created = True
@ -918,15 +918,15 @@ class CuraApplication(QtApplication):
def getPrintInformation(self): def getPrintInformation(self):
return self._print_information return self._print_information
def getQualityProfileModel(self, *args, **kwargs): def getQualityProfilesDropDownMenuModel(self, *args, **kwargs):
if self._quality_profile_model is None: if self._quality_profile_drop_down_menu_model is None:
self._quality_profile_model = QualityProfilesModel(self) self._quality_profile_drop_down_menu_model = QualityProfilesDropDownMenuModel(self)
return self._quality_profile_model return self._quality_profile_drop_down_menu_model
def getCustomQualityProfilesModel(self, *args, **kwargs): def getCustomQualityProfilesDropDownMenuModel(self, *args, **kwargs):
if self._custom_quality_profile_model is None: if self._custom_quality_profile_drop_down_menu_model is None:
self._custom_quality_profile_model = CustomQualityProfilesModel(self) self._custom_quality_profile_drop_down_menu_model = CustomQualityProfilesDropDownMenuModel(self)
return self._custom_quality_profile_model return self._custom_quality_profile_drop_down_menu_model
## Registers objects for the QML engine to use. ## Registers objects for the QML engine to use.
# #
@ -960,8 +960,10 @@ class CuraApplication(QtApplication):
qmlRegisterType(MaterialManagementModel, "Cura", 1, 0, "MaterialManagementModel") qmlRegisterType(MaterialManagementModel, "Cura", 1, 0, "MaterialManagementModel")
qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel") qmlRegisterType(QualityManagementModel, "Cura", 1, 0, "QualityManagementModel")
qmlRegisterSingletonType(QualityProfilesModel, "Cura", 1, 0, "QualityProfilesModel", self.getQualityProfileModel) qmlRegisterSingletonType(QualityProfilesDropDownMenuModel, "Cura", 1, 0,
qmlRegisterSingletonType(CustomQualityProfilesModel, "Cura", 1, 0, "CustomQualityProfilesModel", self.getCustomQualityProfilesModel) "QualityProfilesDropDownMenuModel", self.getQualityProfilesDropDownMenuModel)
qmlRegisterSingletonType(CustomQualityProfilesDropDownMenuModel, "Cura", 1, 0,
"CustomQualityProfilesDropDownMenuModel", self.getCustomQualityProfilesDropDownMenuModel)
qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel") qmlRegisterType(NozzleModel, "Cura", 1, 0, "NozzleModel")
qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler") qmlRegisterType(MaterialSettingsVisibilityHandler, "Cura", 1, 0, "MaterialSettingsVisibilityHandler")

4
cura/Machines/Models/CustomQualityProfilesModel.py → cura/Machines/Models/CustomQualityProfilesDropDownMenuModel.py
View File

@ -4,13 +4,13 @@
from UM.Application import Application from UM.Application import Application
from UM.Logger import Logger from UM.Logger import Logger
from cura.Machines.Models.QualityProfilesModel import QualityProfilesModel from cura.Machines.Models.QualityProfilesDropDownMenuModel import QualityProfilesDropDownMenuModel
# #
# This model is used for the custom profile items in the profile drop down menu. # This model is used for the custom profile items in the profile drop down menu.
# #
class CustomQualityProfilesModel(QualityProfilesModel): class CustomQualityProfilesDropDownMenuModel(QualityProfilesDropDownMenuModel):
def _update(self): def _update(self):
Logger.log("d", "Updating %s ...", self.__class__.__name__) Logger.log("d", "Updating %s ...", self.__class__.__name__)

2
cura/Machines/Models/QualityProfilesModel.py → cura/Machines/Models/QualityProfilesDropDownMenuModel.py
View File

@ -13,7 +13,7 @@ from cura.Machines.QualityManager import QualityGroup
# #
# QML Model for all built-in quality profiles. This model is used for the drop-down quality menu. # QML Model for all built-in quality profiles. This model is used for the drop-down quality menu.
# #
class QualityProfilesModel(ListModel): class QualityProfilesDropDownMenuModel(ListModel):
NameRole = Qt.UserRole + 1 NameRole = Qt.UserRole + 1
QualityTypeRole = Qt.UserRole + 2 QualityTypeRole = Qt.UserRole + 2
LayerHeightRole = Qt.UserRole + 3 LayerHeightRole = Qt.UserRole + 3

10
resources/qml/Menus/ProfileMenu.qml
View File

@ -13,7 +13,7 @@ Menu
Instantiator Instantiator
{ {
model: Cura.QualityProfilesModel model: Cura.QualityProfilesDropDownMenuModel
MenuItem MenuItem
{ {
@ -34,18 +34,18 @@ Menu
MenuSeparator MenuSeparator
{ {
id: customSeparator id: customSeparator
visible: Cura.CustomQualityProfilesModel.rowCount > 0 visible: Cura.CustomQualityProfilesDropDownMenuModel.rowCount > 0
} }
Instantiator Instantiator
{ {
id: customProfileInstantiator id: customProfileInstantiator
model: Cura.CustomQualityProfilesModel model: Cura.CustomQualityProfilesDropDownMenuModel
Connections Connections
{ {
target: Cura.CustomQualityProfilesModel target: Cura.CustomQualityProfilesDropDownMenuModel
onModelReset: customSeparator.visible = Cura.CustomQualityProfilesModel.rowCount() > 0 onModelReset: customSeparator.visible = Cura.CustomQualityProfilesDropDownMenuModel.rowCount() > 0
} }
MenuItem MenuItem

18
resources/qml/SidebarSimple.qml
View File

@ -58,7 +58,7 @@ Item
running: false running: false
repeat: false repeat: false
onTriggered: { onTriggered: {
var item = Cura.QualityProfilesModel.getItem(qualitySlider.value); var item = Cura.QualityProfilesDropDownMenuModel.getItem(qualitySlider.value);
Cura.MachineManager.activeQualityGroup = item.quality_group; Cura.MachineManager.activeQualityGroup = item.quality_group;
} }
} }
@ -105,8 +105,8 @@ Item
var availableMin = -1 var availableMin = -1
var availableMax = -1 var availableMax = -1
for (var i = 0; i < Cura.QualityProfilesModel.rowCount(); i++) { for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++) {
var qualityItem = Cura.QualityProfilesModel.getItem(i) var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i)
// Add each quality item to the UI quality model // Add each quality item to the UI quality model
qualityModel.append(qualityItem) qualityModel.append(qualityItem)
@ -168,7 +168,7 @@ Item
qualityModel.existingQualityProfile = 0 qualityModel.existingQualityProfile = 0
// check, the ticks count cannot be less than zero // check, the ticks count cannot be less than zero
qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesModel.rowCount() - 1) qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1)
} }
} }
@ -194,13 +194,13 @@ Item
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2) anchors.topMargin: Math.round(UM.Theme.getSize("sidebar_margin").height / 2)
color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") color: (Cura.MachineManager.activeMachine != null && Cura.QualityProfilesDropDownMenuModel.getItem(index).available) ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
text: text:
{ {
var result = "" var result = ""
if(Cura.MachineManager.activeMachine != null) if(Cura.MachineManager.activeMachine != null)
{ {
result = Cura.QualityProfilesModel.getItem(index).layer_height_without_unit result = Cura.QualityProfilesDropDownMenuModel.getItem(index).layer_height_without_unit
if(result == undefined) if(result == undefined)
{ {
@ -265,7 +265,7 @@ Item
Rectangle Rectangle
{ {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
color: Cura.QualityProfilesModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable") color: Cura.QualityProfilesDropDownMenuModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
width: 1 * screenScaleFactor width: 1 * screenScaleFactor
height: 6 * screenScaleFactor height: 6 * screenScaleFactor
y: 0 y: 0
@ -403,9 +403,9 @@ Item
// if the current profile is user-created, switch to a built-in quality // if the current profile is user-created, switch to a built-in quality
if (Cura.SimpleModeSettingsManager.isProfileUserCreated) if (Cura.SimpleModeSettingsManager.isProfileUserCreated)
{ {
if (Cura.QualityProfilesModel.rowCount() > 0) if (Cura.QualityProfilesDropDownMenuModel.rowCount() > 0)
{ {
var item = Cura.QualityProfilesModel.getItem(0); var item = Cura.QualityProfilesDropDownMenuModel.getItem(0);
Cura.MachineManager.activeQualityGroup = item.quality_group; Cura.MachineManager.activeQualityGroup = item.quality_group;
} }
} }