mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 23:53:56 -06:00
[WIP] Separate components in different files
Contributes to CURA-5941
This commit is contained in:
Diego Prado Gesto
parent
bc8bf87809
commit
17945c6b16
9 changed files with 1173 additions and 1081 deletions
|
|
@ -27,6 +27,9 @@ Item
|
|||
// The popupItem holds the QML item that is shown when the "open" button is pressed
|
||||
property var popupItem
|
||||
|
||||
// The popupItem holds the QML item that is shown when the "open" button is pressed
|
||||
property var componentItem
|
||||
|
||||
property color popupBackgroundColor: UM.Theme.getColor("action_button")
|
||||
|
||||
property color headerBackgroundColor: UM.Theme.getColor("action_button")
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
import QtQuick 2.7
|
||||
import QtQuick.Controls 2.0
|
||||
|
||||
import "../Settings"
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
SettingView {
|
||||
Cura.SettingView {
|
||||
}
|
||||
|
|
@ -7,6 +7,9 @@ import QtQuick.Controls 2.3
|
|||
import UM 1.3 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
import "Recommended"
|
||||
import "Custom"
|
||||
|
||||
Item
|
||||
{
|
||||
id: popup
|
||||
|
|
@ -22,7 +25,7 @@ Item
|
|||
{
|
||||
id: header
|
||||
height: UM.Theme.getSize("print_setup_widget_header").height
|
||||
color: UM.Theme.getColor("action_button_hovered") // TODO: It's not clear the color that we need to use here
|
||||
color: "transparent" //UM.Theme.getColor("action_button_hovered") // TODO: It's not clear the color that we need to use here
|
||||
|
||||
anchors
|
||||
{
|
||||
|
|
@ -111,19 +114,19 @@ Item
|
|||
onHideTooltip: base.hideTooltip()
|
||||
visible: currentModeIndex == 0
|
||||
}
|
||||
|
||||
CustomPrintSetup
|
||||
{
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
top: parent.top
|
||||
}
|
||||
onShowTooltip: base.showTooltip(item, location, text)
|
||||
onHideTooltip: base.hideTooltip()
|
||||
visible: currentModeIndex == 1
|
||||
}
|
||||
//
|
||||
// CustomPrintSetup
|
||||
// {
|
||||
// anchors
|
||||
// {
|
||||
// left: parent.left
|
||||
// right: parent.right
|
||||
// top: parent.top
|
||||
// }
|
||||
// onShowTooltip: base.showTooltip(item, location, text)
|
||||
// onHideTooltip: base.hideTooltip()
|
||||
// visible: currentModeIndex == 1
|
||||
// }
|
||||
}
|
||||
|
||||
Rectangle
|
||||
|
|
|
|||
|
|
@ -0,0 +1,348 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
//
|
||||
// Infill
|
||||
//
|
||||
Item
|
||||
{
|
||||
id: infillRow
|
||||
|
||||
Cura.IconWithText
|
||||
{
|
||||
id: infillRowTitle
|
||||
source: UM.Theme.getIcon("category_infill")
|
||||
text: catalog.i18nc("@label", "Infill") + " (%)"
|
||||
anchors.bottom: parent.bottom
|
||||
width: labelColumnWidth
|
||||
}
|
||||
|
||||
Item
|
||||
{
|
||||
id: infillCellRight
|
||||
|
||||
height: infillSlider.height + UM.Theme.getSize("thick_margin").height + enableGradualInfillCheckBox.visible * (enableGradualInfillCheckBox.height + UM.Theme.getSize("thick_margin").height)
|
||||
|
||||
anchors.left: infillRowTitle.right
|
||||
anchors.right: parent.right
|
||||
|
||||
Label
|
||||
{
|
||||
id: selectedInfillRateText
|
||||
|
||||
anchors.left: infillSlider.left
|
||||
anchors.right: parent.right
|
||||
|
||||
text: parseInt(infillDensity.properties.value) + "%"
|
||||
horizontalAlignment: Text.AlignLeft
|
||||
|
||||
color: infillSlider.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
}
|
||||
|
||||
// We use a binding to make sure that after manually setting infillSlider.value it is still bound to the property provider
|
||||
Binding
|
||||
{
|
||||
target: infillSlider
|
||||
property: "value"
|
||||
value: parseInt(infillDensity.properties.value)
|
||||
}
|
||||
|
||||
Slider
|
||||
{
|
||||
id: infillSlider
|
||||
|
||||
anchors.top: selectedInfillRateText.bottom
|
||||
anchors.left: parent.left
|
||||
anchors.right: infillIcon.left
|
||||
anchors.rightMargin: UM.Theme.getSize("thick_margin").width
|
||||
|
||||
height: UM.Theme.getSize("thick_margin").height
|
||||
width: parseInt(infillCellRight.width - UM.Theme.getSize("thick_margin").width - style.handleWidth)
|
||||
|
||||
minimumValue: 0
|
||||
maximumValue: 100
|
||||
stepSize: 1
|
||||
tickmarksEnabled: true
|
||||
|
||||
// disable slider when gradual support is enabled
|
||||
enabled: parseInt(infillSteps.properties.value) == 0
|
||||
|
||||
// set initial value from stack
|
||||
value: parseInt(infillDensity.properties.value)
|
||||
|
||||
onValueChanged:
|
||||
{
|
||||
|
||||
// Don't round the value if it's already the same
|
||||
if (parseInt(infillDensity.properties.value) == infillSlider.value)
|
||||
{
|
||||
return
|
||||
}
|
||||
|
||||
// Round the slider value to the nearest multiple of 10 (simulate step size of 10)
|
||||
var roundedSliderValue = Math.round(infillSlider.value / 10) * 10
|
||||
|
||||
// Update the slider value to represent the rounded value
|
||||
infillSlider.value = roundedSliderValue
|
||||
|
||||
// Update value only if the Recomended mode is Active,
|
||||
// Otherwise if I change the value in the Custom mode the Recomended view will try to repeat
|
||||
// same operation
|
||||
var active_mode = UM.Preferences.getValue("cura/active_mode")
|
||||
|
||||
if (active_mode == 0 || active_mode == "simple")
|
||||
{
|
||||
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", roundedSliderValue)
|
||||
Cura.MachineManager.resetSettingForAllExtruders("infill_line_distance")
|
||||
}
|
||||
}
|
||||
|
||||
style: SliderStyle
|
||||
{
|
||||
groove: Rectangle
|
||||
{
|
||||
id: groove
|
||||
implicitWidth: 200 * screenScaleFactor
|
||||
implicitHeight: 2 * screenScaleFactor
|
||||
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
radius: 1
|
||||
}
|
||||
|
||||
handle: Item
|
||||
{
|
||||
Rectangle
|
||||
{
|
||||
id: handleButton
|
||||
anchors.centerIn: parent
|
||||
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
implicitWidth: 10 * screenScaleFactor
|
||||
implicitHeight: 10 * screenScaleFactor
|
||||
radius: 10 * screenScaleFactor
|
||||
}
|
||||
}
|
||||
|
||||
tickmarks: Repeater
|
||||
{
|
||||
id: repeater
|
||||
model: control.maximumValue / control.stepSize + 1
|
||||
|
||||
// check if a tick should be shown based on it's index and wether the infill density is a multiple of 10 (slider step size)
|
||||
function shouldShowTick (index)
|
||||
{
|
||||
if (index % 10 == 0)
|
||||
{
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: control.enabled ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
width: 1 * screenScaleFactor
|
||||
height: 6 * screenScaleFactor
|
||||
x: Math.round(styleData.handleWidth / 2 + index * ((repeater.width - styleData.handleWidth) / (repeater.count-1)))
|
||||
visible: shouldShowTick(index)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: infillIcon
|
||||
|
||||
width: Math.round((parent.width / 5) - (UM.Theme.getSize("thick_margin").width))
|
||||
height: width
|
||||
|
||||
anchors.right: parent.right
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 2)
|
||||
|
||||
// we loop over all density icons and only show the one that has the current density and steps
|
||||
Repeater
|
||||
{
|
||||
id: infillIconList
|
||||
model: infillModel
|
||||
anchors.fill: parent
|
||||
|
||||
function activeIndex ()
|
||||
{
|
||||
for (var i = 0; i < infillModel.count; i++)
|
||||
{
|
||||
var density = Math.round(infillDensity.properties.value)
|
||||
var steps = Math.round(infillSteps.properties.value)
|
||||
var infillModelItem = infillModel.get(i)
|
||||
|
||||
if (infillModelItem != "undefined"
|
||||
&& density >= infillModelItem.percentageMin
|
||||
&& density <= infillModelItem.percentageMax
|
||||
&& steps >= infillModelItem.stepsMin
|
||||
&& steps <= infillModelItem.stepsMax)
|
||||
{
|
||||
return i
|
||||
}
|
||||
}
|
||||
return -1
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
visible: infillIconList.activeIndex() == index
|
||||
|
||||
border.width: UM.Theme.getSize("default_lining").width
|
||||
border.color: UM.Theme.getColor("quality_slider_unavailable")
|
||||
|
||||
UM.RecolorImage
|
||||
{
|
||||
anchors.fill: parent
|
||||
anchors.margins: 2 * screenScaleFactor
|
||||
sourceSize.width: width
|
||||
sourceSize.height: width
|
||||
source: UM.Theme.getIcon(model.icon)
|
||||
color: UM.Theme.getColor("quality_slider_unavailable")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Gradual Support Infill Checkbox
|
||||
CheckBox
|
||||
{
|
||||
id: enableGradualInfillCheckBox
|
||||
property alias _hovered: enableGradualInfillMouseArea.containsMouse
|
||||
|
||||
anchors.top: infillSlider.bottom
|
||||
anchors.topMargin: Math.round(UM.Theme.getSize("thick_margin").height / 2) // closer to slider since it belongs to the same category
|
||||
anchors.left: infillCellRight.left
|
||||
|
||||
style: UM.Theme.styles.checkbox
|
||||
enabled: base.settingsEnabled
|
||||
visible: infillSteps.properties.enabled == "True"
|
||||
checked: parseInt(infillSteps.properties.value) > 0
|
||||
|
||||
MouseArea
|
||||
{
|
||||
id: enableGradualInfillMouseArea
|
||||
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
enabled: true
|
||||
|
||||
property var previousInfillDensity: parseInt(infillDensity.properties.value)
|
||||
|
||||
onClicked:
|
||||
{
|
||||
// Set to 90% only when enabling gradual infill
|
||||
var newInfillDensity;
|
||||
if (parseInt(infillSteps.properties.value) == 0)
|
||||
{
|
||||
previousInfillDensity = parseInt(infillDensity.properties.value)
|
||||
newInfillDensity = 90
|
||||
} else {
|
||||
newInfillDensity = previousInfillDensity
|
||||
}
|
||||
Cura.MachineManager.setSettingForAllExtruders("infill_sparse_density", "value", String(newInfillDensity))
|
||||
|
||||
var infill_steps_value = 0
|
||||
if (parseInt(infillSteps.properties.value) == 0)
|
||||
{
|
||||
infill_steps_value = 5
|
||||
}
|
||||
|
||||
Cura.MachineManager.setSettingForAllExtruders("gradual_infill_steps", "value", infill_steps_value)
|
||||
}
|
||||
|
||||
onEntered: base.showTooltip(enableGradualInfillCheckBox, Qt.point(-infillCellRight.x, 0),
|
||||
catalog.i18nc("@label", "Gradual infill will gradually increase the amount of infill towards the top."))
|
||||
|
||||
onExited: base.hideTooltip()
|
||||
|
||||
}
|
||||
|
||||
Label
|
||||
{
|
||||
id: gradualInfillLabel
|
||||
height: parent.height
|
||||
anchors.left: enableGradualInfillCheckBox.right
|
||||
anchors.leftMargin: Math.round(UM.Theme.getSize("thick_margin").width / 2)
|
||||
verticalAlignment: Text.AlignVCenter;
|
||||
text: catalog.i18nc("@label", "Enable gradual")
|
||||
font: UM.Theme.getFont("default")
|
||||
color: UM.Theme.getColor("text")
|
||||
}
|
||||
}
|
||||
|
||||
// Infill list model for mapping icon
|
||||
ListModel
|
||||
{
|
||||
id: infillModel
|
||||
Component.onCompleted:
|
||||
{
|
||||
infillModel.append({
|
||||
percentageMin: -1,
|
||||
percentageMax: 0,
|
||||
stepsMin: -1,
|
||||
stepsMax: 0,
|
||||
icon: "hollow"
|
||||
})
|
||||
infillModel.append({
|
||||
percentageMin: 0,
|
||||
percentageMax: 40,
|
||||
stepsMin: -1,
|
||||
stepsMax: 0,
|
||||
icon: "sparse"
|
||||
})
|
||||
infillModel.append({
|
||||
percentageMin: 40,
|
||||
percentageMax: 89,
|
||||
stepsMin: -1,
|
||||
stepsMax: 0,
|
||||
icon: "dense"
|
||||
})
|
||||
infillModel.append({
|
||||
percentageMin: 90,
|
||||
percentageMax: 9999999999,
|
||||
stepsMin: -1,
|
||||
stepsMax: 0,
|
||||
icon: "solid"
|
||||
})
|
||||
infillModel.append({
|
||||
percentageMin: 0,
|
||||
percentageMax: 9999999999,
|
||||
stepsMin: 1,
|
||||
stepsMax: 9999999999,
|
||||
icon: "gradual"
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: infillDensity
|
||||
containerStackId: Cura.MachineManager.activeStackId
|
||||
key: "infill_sparse_density"
|
||||
watchedProperties: [ "value" ]
|
||||
storeIndex: 0
|
||||
}
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: infillSteps
|
||||
containerStackId: Cura.MachineManager.activeStackId
|
||||
key: "gradual_infill_steps"
|
||||
watchedProperties: ["value", "enabled"]
|
||||
storeIndex: 0
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,162 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: base
|
||||
|
||||
signal showTooltip(Item item, point location, string text)
|
||||
signal hideTooltip()
|
||||
// width: parent.width
|
||||
height: childrenRect.height + 2 * padding
|
||||
color: "red"
|
||||
opacity: 0.5
|
||||
|
||||
property Action configureSettings
|
||||
|
||||
property bool settingsEnabled: Cura.ExtruderManager.activeExtruderStackId || extrudersEnabledCount.properties.value == 1
|
||||
property real padding: UM.Theme.getSize("thick_margin").width
|
||||
|
||||
UM.I18nCatalog
|
||||
{
|
||||
id: catalog
|
||||
name: "cura"
|
||||
}
|
||||
|
||||
// Rectangle
|
||||
// {
|
||||
// width: parent.width - 2 * parent.padding
|
||||
// anchors
|
||||
// {
|
||||
// left: parent.left
|
||||
// right: parent.right
|
||||
// top: parent.top
|
||||
// margins: parent.padding
|
||||
// }
|
||||
// color: "blue"
|
||||
// height: 50
|
||||
// }
|
||||
|
||||
Column
|
||||
{
|
||||
width: parent.width - 2 * parent.padding
|
||||
spacing: UM.Theme.getSize("default_margin").height
|
||||
anchors
|
||||
{
|
||||
left: parent.left
|
||||
right: parent.right
|
||||
top: parent.top
|
||||
margins: parent.padding
|
||||
}
|
||||
|
||||
// TODO
|
||||
property real labelColumnWidth: Math.round(width / 3)
|
||||
property real settingsColumnWidth: width - labelColumnWidth
|
||||
|
||||
RecommendedQualityProfileSelector
|
||||
{
|
||||
width: parent.width
|
||||
// TODO Create a reusable component with these properties to not define them separately for each component
|
||||
property real labelColumnWidth: parent.labelColumnWidth
|
||||
property real settingsColumnWidth: parent.settingsColumnWidth
|
||||
}
|
||||
|
||||
// RecommendedInfillDensitySelector
|
||||
// {
|
||||
// width: parent.width
|
||||
// height: childrenRect.height
|
||||
// // TODO Create a reusable component with these properties to not define them separately for each component
|
||||
// property real labelColumnWidth: parent.labelColumnWidth
|
||||
// property real settingsColumnWidth: parent.settingsColumnWidth
|
||||
// }
|
||||
//
|
||||
// RecommendedSupportSelector
|
||||
// {
|
||||
// width: parent.width
|
||||
// height: childrenRect.height
|
||||
// // TODO Create a reusable component with these properties to not define them separately for each component
|
||||
// property real labelColumnWidth: parent.labelColumnWidth
|
||||
// property real settingsColumnWidth: parent.settingsColumnWidth
|
||||
// }
|
||||
|
||||
|
||||
//
|
||||
// // Adhesion
|
||||
// Row
|
||||
// {
|
||||
// anchors.left: parent.left
|
||||
// anchors.right: parent.right
|
||||
// height: childrenRect.height
|
||||
//
|
||||
// Cura.IconWithText
|
||||
// {
|
||||
// id: adhesionHelperLabel
|
||||
// visible: adhesionCheckBox.visible
|
||||
// source: UM.Theme.getIcon("category_adhesion")
|
||||
// text: catalog.i18nc("@label", "Adhesion")
|
||||
// width: labelColumnWidth
|
||||
// }
|
||||
//
|
||||
// CheckBox
|
||||
// {
|
||||
// id: adhesionCheckBox
|
||||
// property alias _hovered: adhesionMouseArea.containsMouse
|
||||
//
|
||||
// //: Setting enable printing build-plate adhesion helper checkbox
|
||||
// style: UM.Theme.styles.checkbox
|
||||
// enabled: base.settingsEnabled
|
||||
//
|
||||
// visible: platformAdhesionType.properties.enabled == "True"
|
||||
// checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none"
|
||||
//
|
||||
// MouseArea
|
||||
// {
|
||||
// id: adhesionMouseArea
|
||||
// anchors.fill: parent
|
||||
// hoverEnabled: true
|
||||
// enabled: base.settingsEnabled
|
||||
// onClicked:
|
||||
// {
|
||||
// var adhesionType = "skirt"
|
||||
// if(!parent.checked)
|
||||
// {
|
||||
// // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
|
||||
// platformAdhesionType.removeFromContainer(0)
|
||||
// adhesionType = platformAdhesionType.properties.value
|
||||
// if(adhesionType == "skirt" || adhesionType == "none")
|
||||
// {
|
||||
// // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
|
||||
// adhesionType = "brim"
|
||||
// }
|
||||
// }
|
||||
// platformAdhesionType.setPropertyValue("value", adhesionType)
|
||||
// }
|
||||
// onEntered:
|
||||
// {
|
||||
// base.showTooltip(adhesionCheckBox, Qt.point(-adhesionCheckBox.x, 0),
|
||||
// catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards."));
|
||||
// }
|
||||
// onExited: base.hideTooltip()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
}
|
||||
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: platformAdhesionType
|
||||
containerStack: Cura.MachineManager.activeMachine
|
||||
removeUnusedValue: false //Doesn't work with settings that are resolved.
|
||||
key: "adhesion_type"
|
||||
watchedProperties: [ "value", "enabled" ]
|
||||
storeIndex: 0
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,464 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
|
||||
//
|
||||
// Quality profile
|
||||
//
|
||||
Item
|
||||
{
|
||||
id: qualityRow
|
||||
height: childrenRect.height
|
||||
|
||||
Timer
|
||||
{
|
||||
id: qualitySliderChangeTimer
|
||||
interval: 50
|
||||
running: false
|
||||
repeat: false
|
||||
onTriggered:
|
||||
{
|
||||
var item = Cura.QualityProfilesDropDownMenuModel.getItem(qualitySlider.value);
|
||||
Cura.MachineManager.activeQualityGroup = item.quality_group;
|
||||
}
|
||||
}
|
||||
|
||||
Component.onCompleted: qualityModel.update()
|
||||
|
||||
Connections
|
||||
{
|
||||
target: Cura.QualityProfilesDropDownMenuModel
|
||||
onItemsChanged: qualityModel.update()
|
||||
}
|
||||
|
||||
Connections {
|
||||
target: base
|
||||
onVisibleChanged:
|
||||
{
|
||||
// update needs to be called when the widgets are visible, otherwise the step width calculation
|
||||
// will fail because the width of an invisible item is 0.
|
||||
if (visible)
|
||||
{
|
||||
qualityModel.update();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ListModel
|
||||
{
|
||||
id: qualityModel
|
||||
|
||||
property var totalTicks: 0
|
||||
property var availableTotalTicks: 0
|
||||
property var existingQualityProfile: 0
|
||||
|
||||
property var qualitySliderActiveIndex: 0
|
||||
property var qualitySliderStepWidth: 0
|
||||
property var qualitySliderAvailableMin: 0
|
||||
property var qualitySliderAvailableMax: 0
|
||||
property var qualitySliderMarginRight: 0
|
||||
|
||||
function update ()
|
||||
{
|
||||
reset()
|
||||
|
||||
var availableMin = -1
|
||||
var availableMax = -1
|
||||
|
||||
for (var i = 0; i < Cura.QualityProfilesDropDownMenuModel.rowCount(); i++)
|
||||
{
|
||||
var qualityItem = Cura.QualityProfilesDropDownMenuModel.getItem(i)
|
||||
|
||||
// Add each quality item to the UI quality model
|
||||
qualityModel.append(qualityItem)
|
||||
|
||||
// Set selected value
|
||||
if (Cura.MachineManager.activeQualityType == qualityItem.quality_type)
|
||||
{
|
||||
// set to -1 when switching to user created profile so all ticks are clickable
|
||||
if (Cura.SimpleModeSettingsManager.isProfileUserCreated)
|
||||
{
|
||||
qualityModel.qualitySliderActiveIndex = -1
|
||||
}
|
||||
else
|
||||
{
|
||||
qualityModel.qualitySliderActiveIndex = i
|
||||
}
|
||||
|
||||
qualityModel.existingQualityProfile = 1
|
||||
}
|
||||
|
||||
// Set min available
|
||||
if (qualityItem.available && availableMin == -1)
|
||||
{
|
||||
availableMin = i
|
||||
}
|
||||
|
||||
// Set max available
|
||||
if (qualityItem.available)
|
||||
{
|
||||
availableMax = i
|
||||
}
|
||||
}
|
||||
|
||||
// Set total available ticks for active slider part
|
||||
if (availableMin != -1)
|
||||
{
|
||||
qualityModel.availableTotalTicks = availableMax - availableMin + 1
|
||||
}
|
||||
|
||||
// Calculate slider values
|
||||
calculateSliderStepWidth(qualityModel.totalTicks)
|
||||
calculateSliderMargins(availableMin, availableMax, qualityModel.totalTicks)
|
||||
|
||||
qualityModel.qualitySliderAvailableMin = availableMin
|
||||
qualityModel.qualitySliderAvailableMax = availableMax
|
||||
}
|
||||
|
||||
function calculateSliderStepWidth (totalTicks)
|
||||
{
|
||||
qualityModel.qualitySliderStepWidth = totalTicks != 0 ? Math.round((settingsColumnWidth) / (totalTicks)) : 0
|
||||
}
|
||||
|
||||
function calculateSliderMargins (availableMin, availableMax, totalTicks)
|
||||
{
|
||||
if (availableMin == -1 || (availableMin == 0 && availableMax == 0))
|
||||
{
|
||||
qualityModel.qualitySliderMarginRight = Math.round(settingsColumnWidth)
|
||||
}
|
||||
else if (availableMin == availableMax)
|
||||
{
|
||||
qualityModel.qualitySliderMarginRight = Math.round((totalTicks - availableMin) * qualitySliderStepWidth)
|
||||
}
|
||||
else
|
||||
{
|
||||
qualityModel.qualitySliderMarginRight = Math.round((totalTicks - availableMax) * qualitySliderStepWidth)
|
||||
}
|
||||
}
|
||||
|
||||
function reset () {
|
||||
qualityModel.clear()
|
||||
qualityModel.availableTotalTicks = 0
|
||||
qualityModel.existingQualityProfile = 0
|
||||
|
||||
// check, the ticks count cannot be less than zero
|
||||
qualityModel.totalTicks = Math.max(0, Cura.QualityProfilesDropDownMenuModel.rowCount() - 1)
|
||||
}
|
||||
}
|
||||
|
||||
Cura.IconWithText
|
||||
{
|
||||
id: qualityRowTitle
|
||||
source: UM.Theme.getIcon("category_layer_height")
|
||||
text: catalog.i18nc("@label", "Layer Height")
|
||||
// anchors.bottom: speedSlider.bottom
|
||||
width: labelColumnWidth
|
||||
}
|
||||
|
||||
//Print speed slider
|
||||
Rectangle
|
||||
{
|
||||
id: speedSlider
|
||||
|
||||
anchors
|
||||
{
|
||||
left: qualityRowTitle.right
|
||||
right: parent.right
|
||||
}
|
||||
|
||||
color: "green"
|
||||
height: 20
|
||||
}
|
||||
//
|
||||
// // 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
|
||||
// Rectangle
|
||||
// {
|
||||
// id: speedSlider
|
||||
//
|
||||
// anchors
|
||||
// {
|
||||
// left: qualityRowTitle.right
|
||||
// right: parent.right
|
||||
// }
|
||||
//
|
||||
// // This Item is used only for tooltip, for slider area which is unavailable
|
||||
//// Item
|
||||
//// {
|
||||
//// function showTooltip (showTooltip)
|
||||
//// {
|
||||
//// if (showTooltip)
|
||||
//// {
|
||||
//// var content = catalog.i18nc("@tooltip", "This quality profile is not available for you current material and nozzle configuration. Please change these to enable this quality profile")
|
||||
//// base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), content)
|
||||
//// }
|
||||
//// else
|
||||
//// {
|
||||
//// base.hideTooltip()
|
||||
//// }
|
||||
//// }
|
||||
////
|
||||
//// id: unavailableLineToolTip
|
||||
//// height: 20 * screenScaleFactor // hovered area height
|
||||
//// z: parent.z + 1 // should be higher, otherwise the area can be hovered
|
||||
//// x: 0
|
||||
//// anchors.verticalCenter: qualitySlider.verticalCenter
|
||||
////
|
||||
//// Rectangle
|
||||
//// {
|
||||
//// id: leftArea
|
||||
//// width:
|
||||
//// {
|
||||
//// if (qualityModel.availableTotalTicks == 0)
|
||||
//// {
|
||||
//// return qualityModel.qualitySliderStepWidth * qualityModel.totalTicks
|
||||
//// }
|
||||
//// return qualityModel.qualitySliderStepWidth * qualityModel.qualitySliderAvailableMin - 10
|
||||
//// }
|
||||
//// height: parent.height
|
||||
//// color: "transparent"
|
||||
////
|
||||
//// MouseArea
|
||||
//// {
|
||||
//// anchors.fill: parent
|
||||
//// hoverEnabled: true
|
||||
//// enabled: Cura.SimpleModeSettingsManager.isProfileUserCreated == false
|
||||
//// onEntered: unavailableLineToolTip.showTooltip(true)
|
||||
//// onExited: unavailableLineToolTip.showTooltip(false)
|
||||
//// }
|
||||
//// }
|
||||
////
|
||||
//// Item
|
||||
//// {
|
||||
//// id: rightArea
|
||||
//// width:
|
||||
//// {
|
||||
//// if(qualityModel.availableTotalTicks == 0)
|
||||
//// return 0
|
||||
////
|
||||
//// return qualityModel.qualitySliderMarginRight - 10
|
||||
//// }
|
||||
//// height: parent.height
|
||||
//// x:
|
||||
//// {
|
||||
//// if (qualityModel.availableTotalTicks == 0)
|
||||
//// {
|
||||
//// return 0
|
||||
//// }
|
||||
////
|
||||
//// var leftUnavailableArea = qualityModel.qualitySliderStepWidth * qualityModel.qualitySliderAvailableMin
|
||||
//// var totalGap = qualityModel.qualitySliderStepWidth * (qualityModel.availableTotalTicks -1) + leftUnavailableArea + 10
|
||||
////
|
||||
//// return totalGap
|
||||
//// }
|
||||
////
|
||||
//// MouseArea
|
||||
//// {
|
||||
//// anchors.fill: parent
|
||||
//// hoverEnabled: true
|
||||
//// enabled: Cura.SimpleModeSettingsManager.isProfileUserCreated == false
|
||||
//// onEntered: unavailableLineToolTip.showTooltip(true)
|
||||
//// onExited: unavailableLineToolTip.showTooltip(false)
|
||||
//// }
|
||||
//// }
|
||||
//// }
|
||||
//
|
||||
// // Draw Unavailable line
|
||||
// Rectangle
|
||||
// {
|
||||
// id: groovechildrect
|
||||
// width: parent.width
|
||||
// height: 2 * screenScaleFactor
|
||||
// color: UM.Theme.getColor("quality_slider_unavailable")
|
||||
// anchors.verticalCenter: qualitySlider.verticalCenter
|
||||
//
|
||||
// // Draw ticks
|
||||
// Repeater
|
||||
// {
|
||||
// id: qualityRepeater
|
||||
// model: qualityModel.totalTicks > 0 ? qualityModel : 0
|
||||
//
|
||||
// Rectangle
|
||||
// {
|
||||
// color: Cura.QualityProfilesDropDownMenuModel.getItem(index).available ? UM.Theme.getColor("quality_slider_available") : UM.Theme.getColor("quality_slider_unavailable")
|
||||
// implicitWidth: 4 * screenScaleFactor
|
||||
// implicitHeight: implicitWidth
|
||||
// anchors.verticalCenter: parent.verticalCenter
|
||||
// x: Math.round(qualityModel.qualitySliderStepWidth * index)
|
||||
// radius: Math.round(implicitWidth / 2)
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// // Draw available slider
|
||||
// Slider
|
||||
// {
|
||||
// id: qualitySlider
|
||||
// height: UM.Theme.getSize("thick_margin").height
|
||||
// anchors.bottom: parent.bottom
|
||||
// enabled: qualityModel.totalTicks > 0 && !Cura.SimpleModeSettingsManager.isProfileCustomized
|
||||
// visible: qualityModel.availableTotalTicks > 0
|
||||
// updateValueWhileDragging : false
|
||||
//
|
||||
// minimumValue: qualityModel.qualitySliderAvailableMin >= 0 ? qualityModel.qualitySliderAvailableMin : 0
|
||||
// // maximumValue must be greater than minimumValue to be able to see the handle. While the value is strictly
|
||||
// // speaking not always correct, it seems to have the correct behavior (switching from 0 available to 1 available)
|
||||
// maximumValue: qualityModel.qualitySliderAvailableMax >= 1 ? qualityModel.qualitySliderAvailableMax : 1
|
||||
// stepSize: 1
|
||||
//
|
||||
// value: qualityModel.qualitySliderActiveIndex
|
||||
//
|
||||
// width: qualityModel.qualitySliderStepWidth * (qualityModel.availableTotalTicks - 1)
|
||||
//
|
||||
// anchors.right: parent.right
|
||||
// anchors.rightMargin: qualityModel.qualitySliderMarginRight
|
||||
//
|
||||
// style: SliderStyle
|
||||
// {
|
||||
// //Draw Available line
|
||||
// groove: Rectangle
|
||||
// {
|
||||
// implicitHeight: 2 * screenScaleFactor
|
||||
// color: UM.Theme.getColor("quality_slider_available")
|
||||
// radius: Math.round(height / 2)
|
||||
// }
|
||||
//
|
||||
// handle: Rectangle
|
||||
// {
|
||||
// id: qualityhandleButton
|
||||
// color: UM.Theme.getColor("quality_slider_available")
|
||||
// implicitWidth: 12 * screenScaleFactor
|
||||
// implicitHeight: implicitWidth
|
||||
// radius: Math.round(implicitWidth / 2)
|
||||
// visible: !Cura.SimpleModeSettingsManager.isProfileCustomized && !Cura.SimpleModeSettingsManager.isProfileUserCreated && qualityModel.existingQualityProfile
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// onValueChanged:
|
||||
// {
|
||||
// // only change if an active machine is set and the slider is visible at all.
|
||||
// if (Cura.MachineManager.activeMachine != null && visible)
|
||||
// {
|
||||
// // prevent updating during view initializing. Trigger only if the value changed by user
|
||||
// if (qualitySlider.value != qualityModel.qualitySliderActiveIndex && qualityModel.qualitySliderActiveIndex != -1)
|
||||
// {
|
||||
// // start updating with short delay
|
||||
// qualitySliderChangeTimer.start()
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// MouseArea
|
||||
// {
|
||||
// id: speedSliderMouseArea
|
||||
// anchors.fill: parent
|
||||
// hoverEnabled: true
|
||||
// enabled: Cura.SimpleModeSettingsManager.isProfileUserCreated
|
||||
//
|
||||
// onEntered:
|
||||
// {
|
||||
// var content = catalog.i18nc("@tooltip", "A custom profile is currently active. To enable the quality slider, choose a default quality profile in Custom tab")
|
||||
// base.showTooltip(qualityRow, Qt.point(-UM.Theme.getSize("thick_margin").width, customisedSettings.height), content)
|
||||
// }
|
||||
// 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 content = 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), content)
|
||||
// }
|
||||
// onExited: base.hideTooltip()
|
||||
// }
|
||||
}
|
||||
|
|
@ -0,0 +1,175 @@
|
|||
// Copyright (c) 2018 Ultimaker B.V.
|
||||
// Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
import QtQuick 2.7
|
||||
import QtQuick.Controls 1.4
|
||||
import QtQuick.Controls.Styles 1.4
|
||||
|
||||
import UM 1.2 as UM
|
||||
import Cura 1.0 as Cura
|
||||
|
||||
//
|
||||
// Enable support
|
||||
//
|
||||
Row
|
||||
{
|
||||
|
||||
Cura.IconWithText
|
||||
{
|
||||
id: enableSupportLabel
|
||||
visible: enableSupportCheckBox.visible
|
||||
source: UM.Theme.getIcon("category_support")
|
||||
text: catalog.i18nc("@label", "Support")
|
||||
width: labelColumnWidth
|
||||
}
|
||||
|
||||
CheckBox
|
||||
{
|
||||
id: enableSupportCheckBox
|
||||
property alias _hovered: enableSupportMouseArea.containsMouse
|
||||
|
||||
style: UM.Theme.styles.checkbox
|
||||
enabled: base.settingsEnabled
|
||||
|
||||
visible: supportEnabled.properties.enabled == "True"
|
||||
checked: supportEnabled.properties.value == "True"
|
||||
|
||||
MouseArea
|
||||
{
|
||||
id: enableSupportMouseArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
onClicked: supportEnabled.setPropertyValue("value", supportEnabled.properties.value != "True")
|
||||
|
||||
onEntered: base.showTooltip(enableSupportCheckBox, Qt.point(-enableSupportCheckBox.x, 0),
|
||||
catalog.i18nc("@label", "Generate structures to support parts of the model which have overhangs. Without these structures, such parts would collapse during printing."))
|
||||
|
||||
onExited: base.hideTooltip()
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
ComboBox
|
||||
{
|
||||
id: supportExtruderCombobox
|
||||
visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (extrudersEnabledCount.properties.value > 1)
|
||||
model: extruderModel
|
||||
|
||||
property string color_override: "" // for manually setting values
|
||||
property string color: // is evaluated automatically, but the first time is before extruderModel being filled
|
||||
{
|
||||
var current_extruder = extruderModel.get(currentIndex);
|
||||
color_override = "";
|
||||
if (current_extruder === undefined) return ""
|
||||
return (current_extruder.color) ? current_extruder.color : "";
|
||||
}
|
||||
|
||||
textRole: "text" // this solves that the combobox isn't populated in the first time Cura is started
|
||||
|
||||
width: Math.round(UM.Theme.getSize("print_setup_widget").width * .55) - Math.round(UM.Theme.getSize("thick_margin").width / 2) - enableSupportCheckBox.width
|
||||
height: ((supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)) ? UM.Theme.getSize("setting_control").height : 0
|
||||
|
||||
Behavior on height { NumberAnimation { duration: 100 } }
|
||||
|
||||
style: UM.Theme.styles.combobox_color
|
||||
enabled: base.settingsEnabled
|
||||
property alias _hovered: supportExtruderMouseArea.containsMouse
|
||||
|
||||
currentIndex:
|
||||
{
|
||||
if (supportExtruderNr.properties == null)
|
||||
{
|
||||
return Cura.MachineManager.defaultExtruderPosition
|
||||
}
|
||||
else
|
||||
{
|
||||
var extruder = parseInt(supportExtruderNr.properties.value)
|
||||
if ( extruder === -1)
|
||||
{
|
||||
return Cura.MachineManager.defaultExtruderPosition
|
||||
}
|
||||
return extruder;
|
||||
}
|
||||
}
|
||||
|
||||
onActivated: supportExtruderNr.setPropertyValue("value", String(index))
|
||||
|
||||
MouseArea
|
||||
{
|
||||
id: supportExtruderMouseArea
|
||||
anchors.fill: parent
|
||||
hoverEnabled: true
|
||||
enabled: base.settingsEnabled
|
||||
acceptedButtons: Qt.NoButton
|
||||
onEntered:
|
||||
{
|
||||
base.showTooltip(supportExtruderCombobox, Qt.point(-supportExtruderCombobox.x, 0),
|
||||
catalog.i18nc("@label", "Select which extruder to use for support. This will build up supporting structures below the model to prevent the model from sagging or printing in mid air."));
|
||||
}
|
||||
onExited: base.hideTooltip()
|
||||
|
||||
}
|
||||
|
||||
function updateCurrentColor()
|
||||
{
|
||||
var current_extruder = extruderModel.get(currentIndex)
|
||||
if (current_extruder !== undefined)
|
||||
{
|
||||
supportExtruderCombobox.color_override = current_extruder.color
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ListModel
|
||||
{
|
||||
id: extruderModel
|
||||
Component.onCompleted: populateExtruderModel()
|
||||
}
|
||||
|
||||
//: Model used to populate the extrudelModel
|
||||
Cura.ExtrudersModel
|
||||
{
|
||||
id: extruders
|
||||
onModelChanged: populateExtruderModel()
|
||||
}
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: supportEnabled
|
||||
containerStack: Cura.MachineManager.activeMachine
|
||||
key: "support_enable"
|
||||
watchedProperties: [ "value", "enabled", "description" ]
|
||||
storeIndex: 0
|
||||
}
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: extrudersEnabledCount
|
||||
containerStack: Cura.MachineManager.activeMachine
|
||||
key: "extruders_enabled_count"
|
||||
watchedProperties: [ "value" ]
|
||||
storeIndex: 0
|
||||
}
|
||||
|
||||
UM.SettingPropertyProvider
|
||||
{
|
||||
id: supportExtruderNr
|
||||
containerStack: Cura.MachineManager.activeMachine
|
||||
key: "support_extruder_nr"
|
||||
watchedProperties: [ "value" ]
|
||||
storeIndex: 0
|
||||
}
|
||||
|
||||
function populateExtruderModel()
|
||||
{
|
||||
extruderModel.clear()
|
||||
for (var extruderNumber = 0; extruderNumber < extruders.rowCount(); extruderNumber++)
|
||||
{
|
||||
extruderModel.append({
|
||||
text: extruders.getItem(extruderNumber).name,
|
||||
color: extruders.getItem(extruderNumber).color
|
||||
})
|
||||
}
|
||||
supportExtruderCombobox.updateCurrentColor()
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -15,3 +15,4 @@ ExpandableComponent 1.0 ExpandableComponent.qml
|
|||
PrinterTypeLabel 1.0 PrinterTypeLabel.qml
|
||||
ViewsSelector 1.0 ViewsSelector.qml
|
||||
ToolbarButton 1.0 ToolbarButton.qml
|
||||
SettingView 1.0 SettingView.qml
|
||||
Loading…
Add table
Add a link
Reference in a new issue