3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 02:07:51 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

code cleanup

Browse source
This commit is contained in:
ChrisTerBeke 2017-09-21 17:35:12 +02:00
parent a74a6a59fc
commit ecafa24888
2 changed files with 10 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cura/Settings/ProfilesModel.py
View file

@ -75,6 +75,7 @@ class ProfilesModel(InstanceContainersModel):
# The actual list of quality profiles come from the first extruder in the extruder list. # The actual list of quality profiles come from the first extruder in the extruder list.
result = QualityManager.getInstance().findAllQualitiesForMachineAndMaterials(global_stack_definition, result = QualityManager.getInstance().findAllQualitiesForMachineAndMaterials(global_stack_definition,
materials) materials)
for quality in QualityManager.getInstance().findAllUsableQualitiesForMachineAndExtruders( for quality in QualityManager.getInstance().findAllUsableQualitiesForMachineAndExtruders(
global_container_stack, extruder_stacks): global_container_stack, extruder_stacks):
if quality not in result: if quality not in result:

21
resources/qml/SidebarSimple.qml
View file

@ -179,10 +179,8 @@ Item
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 2 anchors.topMargin: UM.Theme.getSize("sidebar_margin").height / 2
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
text: text: Cura.ProfilesModel.getItem(index).layer_height_without_unit
{
return Cura.ProfilesModel.getItem(index).layer_height_without_unit
}
width: 1 width: 1
x: x:
{ {
@ -213,7 +211,7 @@ Item
height: 2 height: 2
color: UM.Theme.getColor("quality_slider_unavailable") color: UM.Theme.getColor("quality_slider_unavailable")
//radius: parent.radius //radius: parent.radius
y: 9 y: 8.5
x: 0 x: 0
} }
@ -248,14 +246,10 @@ Item
value: qualityRow.qualitySliderSelectedValue value: qualityRow.qualitySliderSelectedValue
width:{ width: qualityRow.qualitySliderStep * (qualityRow.availableTotalTicks)
return qualityRow.qualitySliderStep * (qualityRow.availableTotalTicks)
}
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin:{ anchors.rightMargin: qualityRow.sliderMarginRight
return qualityRow.sliderMarginRight
}
style: SliderStyle style: SliderStyle
{ {
@ -265,6 +259,7 @@ Item
color: UM.Theme.getColor("quality_slider_available") color: UM.Theme.getColor("quality_slider_available")
radius: 1 radius: 1
} }
handle: Item { handle: Item {
Rectangle { Rectangle {
id: qualityhandleButton id: qualityhandleButton
@ -334,7 +329,7 @@ Item
id: infillCellLeft id: infillCellLeft
anchors.top: qualityRow.bottom anchors.top: qualityRow.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.left: parent.left anchors.left: parent.left
width: UM.Theme.getSize("sidebar").width * .45 - UM.Theme.getSize("sidebar_margin").width width: UM.Theme.getSize("sidebar").width * .45 - UM.Theme.getSize("sidebar_margin").width
@ -386,6 +381,8 @@ Item
anchors.top: selectedInfillRateText.bottom anchors.top: selectedInfillRateText.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.right: infillIcon.left
anchors.rightMargin: UM.Theme.getSize("sidebar_margin").width
height: UM.Theme.getSize("sidebar_margin").height height: UM.Theme.getSize("sidebar_margin").height
width: infillCellRight.width - UM.Theme.getSize("sidebar_margin").width - style.handleWidth width: infillCellRight.width - UM.Theme.getSize("sidebar_margin").width - style.handleWidth