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

Merge branch 'master' into feature_top_right_layer_view

Browse Source
This commit is contained in:
ChrisTerBeke 2017-09-11 11:50:18 +02:00 committed by GitHub
commit 7efe3a3b9e
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/BuildVolume.py
View File

@ -96,7 +96,7 @@ class BuildVolume(SceneNode):
self._scene_change_timer.timeout.connect(self._onSceneChangeTimerFinished) self._scene_change_timer.timeout.connect(self._onSceneChangeTimerFinished)
self._setting_change_timer = QTimer() self._setting_change_timer = QTimer()
self._setting_change_timer.setInterval(100) self._setting_change_timer.setInterval(150)
self._setting_change_timer.setSingleShot(True) self._setting_change_timer.setSingleShot(True)
self._setting_change_timer.timeout.connect(self._onSettingChangeTimerFinished) self._setting_change_timer.timeout.connect(self._onSettingChangeTimerFinished)

4
plugins/CuraEngineBackend/StartSliceJob.py
View File

@ -334,8 +334,6 @@ class StartSliceJob(Job):
self._addRelations(changed_setting_keys, instance.definition.relations) self._addRelations(changed_setting_keys, instance.definition.relations)
Job.yieldThread() Job.yieldThread()
Logger.log("d", "changed_setting_keys=%s", changed_setting_keys)
# Ensure that the engine is aware what the build extruder is. # Ensure that the engine is aware what the build extruder is.
if stack.getProperty("machine_extruder_count", "value") > 1: if stack.getProperty("machine_extruder_count", "value") > 1:
changed_setting_keys.add("extruder_nr") changed_setting_keys.add("extruder_nr")
@ -354,8 +352,6 @@ class StartSliceJob(Job):
setting.value = str(limited_stack.getProperty(key, "value")).encode("utf-8") setting.value = str(limited_stack.getProperty(key, "value")).encode("utf-8")
Logger.log("d", "key=%s value=%s", key, setting.value)
Job.yieldThread() Job.yieldThread()
## Recursive function to put all settings that require each other for value changes in a list ## Recursive function to put all settings that require each other for value changes in a list

18
resources/qml/SidebarSimple.qml
View File

@ -261,6 +261,7 @@ Item
Text Text
{ {
id: enableSupportLabel id: enableSupportLabel
visible: enableSupportCheckBox.visible
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.verticalCenter: enableSupportCheckBox.verticalCenter anchors.verticalCenter: enableSupportCheckBox.verticalCenter
@ -281,6 +282,7 @@ Item
style: UM.Theme.styles.checkbox; style: UM.Theme.styles.checkbox;
enabled: base.settingsEnabled enabled: base.settingsEnabled
visible: supportEnabled.properties.enabled == "True"
checked: supportEnabled.properties.value == "True"; checked: supportEnabled.properties.value == "True";
MouseArea MouseArea
@ -309,7 +311,7 @@ Item
Text Text
{ {
id: supportExtruderLabel id: supportExtruderLabel
visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1) visible: supportExtruderCombobox.visible
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.verticalCenter: supportExtruderCombobox.verticalCenter anchors.verticalCenter: supportExtruderCombobox.verticalCenter
@ -321,7 +323,7 @@ Item
ComboBox ComboBox
{ {
id: supportExtruderCombobox id: supportExtruderCombobox
visible: (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1) visible: enableSupportCheckBox.visible && (supportEnabled.properties.value == "True") && (machineExtruderCount.properties.value > 1)
model: extruderModel model: extruderModel
property string color_override: "" // for manually setting values property string color_override: "" // for manually setting values
@ -407,6 +409,7 @@ Item
Text Text
{ {
id: adhesionHelperLabel id: adhesionHelperLabel
visible: adhesionCheckBox.visible
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width anchors.leftMargin: UM.Theme.getSize("sidebar_margin").width
anchors.verticalCenter: adhesionCheckBox.verticalCenter anchors.verticalCenter: adhesionCheckBox.verticalCenter
@ -421,7 +424,7 @@ Item
id: adhesionCheckBox id: adhesionCheckBox
property alias _hovered: adhesionMouseArea.containsMouse property alias _hovered: adhesionMouseArea.containsMouse
anchors.top: supportExtruderCombobox.bottom anchors.top: enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height anchors.topMargin: UM.Theme.getSize("sidebar_margin").height
anchors.left: infillCellRight.left anchors.left: infillCellRight.left
@ -429,6 +432,7 @@ Item
style: UM.Theme.styles.checkbox; style: UM.Theme.styles.checkbox;
enabled: base.settingsEnabled enabled: base.settingsEnabled
visible: platformAdhesionType.properties.enabled == "True"
checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none" checked: platformAdhesionType.properties.value != "skirt" && platformAdhesionType.properties.value != "none"
MouseArea MouseArea
@ -445,7 +449,7 @@ Item
// Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft // Remove the "user" setting to see if the rest of the stack prescribes a brim or a raft
platformAdhesionType.removeFromContainer(0); platformAdhesionType.removeFromContainer(0);
adhesionType = platformAdhesionType.properties.value; adhesionType = platformAdhesionType.properties.value;
if(adhesionType == "skirt") if(adhesionType == "skirt" || adhesionType == "none")
{ {
// If the rest of the stack doesn't prescribe an adhesion-type, default to a brim // If the rest of the stack doesn't prescribe an adhesion-type, default to a brim
adhesionType = "brim"; adhesionType = "brim";
@ -481,7 +485,7 @@ Item
Item Item
{ {
id: tipsCell id: tipsCell
anchors.top: adhesionCheckBox.bottom anchors.top: adhesionCheckBox.visible ? adhesionCheckBox.bottom : (enableSupportCheckBox.visible ? supportExtruderCombobox.bottom : infillCellRight.bottom)
anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2 anchors.topMargin: UM.Theme.getSize("sidebar_margin").height * 2
anchors.left: parent.left anchors.left: parent.left
width: parent.width width: parent.width
@ -566,7 +570,7 @@ Item
containerStackId: Cura.MachineManager.activeMachineId containerStackId: Cura.MachineManager.activeMachineId
key: "adhesion_type" key: "adhesion_type"
watchedProperties: [ "value" ] watchedProperties: [ "value", "enabled" ]
storeIndex: 0 storeIndex: 0
} }
@ -576,7 +580,7 @@ Item
containerStackId: Cura.MachineManager.activeMachineId containerStackId: Cura.MachineManager.activeMachineId
key: "support_enable" key: "support_enable"
watchedProperties: [ "value", "description" ] watchedProperties: [ "value", "enabled", "description" ]
storeIndex: 0 storeIndex: 0
} }