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

Merge branch 'master' of github.com:Ultimaker/Cura

Browse Source
This commit is contained in:
Jaime van Kessel 2019-05-16 14:29:24 +02:00
commit 2eb8203c70
5 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/PrinterOutput/PrintJobOutputModel.py
View File

@ -1,4 +1,4 @@
import warnings import warnings
warnings.warn("Importing cura.PrinterOutput.PrintJobOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrintJobOutputModel inststad", DeprecationWarning, stacklevel=2) warnings.warn("Importing cura.PrinterOutput.PrintJobOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrintJobOutputModel instead", DeprecationWarning, stacklevel=2)
# We moved the the models to one submodule deeper # We moved the the models to one submodule deeper
from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel from cura.PrinterOutput.Models.PrintJobOutputModel import PrintJobOutputModel

2
cura/PrinterOutput/PrinterOutputModel.py
View File

@ -1,4 +1,4 @@
import warnings import warnings
warnings.warn("Importing cura.PrinterOutput.PrinterOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrinterOutputModel inststad", DeprecationWarning, stacklevel=2) warnings.warn("Importing cura.PrinterOutput.PrinterOutputModel has been deprecated since 4.1, use cura.PrinterOutput.Models.PrinterOutputModel instead", DeprecationWarning, stacklevel=2)
# We moved the the models to one submodule deeper # We moved the the models to one submodule deeper
from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel from cura.PrinterOutput.Models.PrinterOutputModel import PrinterOutputModel

2
cura/PrinterOutputDevice.py
View File

@ -1,4 +1,4 @@
import warnings import warnings
warnings.warn("Importing cura.PrinterOutputDevice has been deprecated since 4.1, use cura.PrinterOutput.PrinterOutputDevice inststad", DeprecationWarning, stacklevel=2) warnings.warn("Importing cura.PrinterOutputDevice has been deprecated since 4.1, use cura.PrinterOutput.PrinterOutputDevice instead", DeprecationWarning, stacklevel=2)
# We moved the PrinterOutput device to it's own submodule. # We moved the PrinterOutput device to it's own submodule.
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice, ConnectionState

3
resources/definitions/fdmprinter.def.json
View File

@ -5250,7 +5250,7 @@
"type": "bool", "type": "bool",
"enabled": "extruders_enabled_count > 1", "enabled": "extruders_enabled_count > 1",
"default_value": false, "default_value": false,
"resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable')) or (adhesion_type in ('none', 'skirt'))", "resolve": "(extruders_enabled_count > 1) and any(extruderValues('prime_tower_enable'))",
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false
}, },
@ -5353,6 +5353,7 @@
"description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.", "description": "Prime-towers might need the extra adhesion afforded by a brim even if the model doesn't. Presently can't be used with the 'Raft' adhesion-type.",
"type": "bool", "type": "bool",
"enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')", "enabled": "resolveOrValue('prime_tower_enable') and (resolveOrValue('adhesion_type') != 'raft')",
"resolve": "resolveOrValue('prime_tower_enable') and (adhesion_type in ('none', 'skirt'))",
"default_value": false, "default_value": false,
"settable_per_mesh": false, "settable_per_mesh": false,
"settable_per_extruder": false "settable_per_extruder": false

14
resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml
View File

@ -64,19 +64,19 @@ Item
onClicked: onClicked:
{ {
var adhesionType = "skirt" var adhesionType = "skirt";
if (!parent.checked) if (!parent.checked)
{ {
// 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.resolve;
if(adhesionType == "skirt" || adhesionType == "none") 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";
} }
} }
platformAdhesionType.setPropertyValue("value", adhesionType) platformAdhesionType.setPropertyValue("value", adhesionType);
} }
onEntered: onEntered:
@ -95,7 +95,7 @@ Item
containerStack: Cura.MachineManager.activeMachine containerStack: Cura.MachineManager.activeMachine
removeUnusedValue: false //Doesn't work with settings that are resolved. removeUnusedValue: false //Doesn't work with settings that are resolved.
key: "adhesion_type" key: "adhesion_type"
watchedProperties: [ "value", "enabled" ] watchedProperties: [ "value", "resolve", "enabled" ]
storeIndex: 0 storeIndex: 0
} }
} }