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

Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0

Browse Source
This commit is contained in:
ChrisTerBeke 2017-10-05 18:09:41 +02:00
commit 7d1722088b
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/Settings/ProfilesModel.py
View File

@ -100,6 +100,9 @@ class ProfilesModel(InstanceContainersModel):
extruder_stacks = extruder_manager.getActiveExtruderStacks() extruder_stacks = extruder_manager.getActiveExtruderStacks()
if multiple_extrusion: if multiple_extrusion:
# Place the active extruder at the front of the list. # Place the active extruder at the front of the list.
# This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
# Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
# cases the active_extruder is still None.
if active_extruder in extruder_stacks: if active_extruder in extruder_stacks:
extruder_stacks.remove(active_extruder) extruder_stacks.remove(active_extruder)
new_extruder_stacks = [] new_extruder_stacks = []

11
cura/Settings/QualityAndUserProfilesModel.py
View File

@ -33,8 +33,15 @@ class QualityAndUserProfilesModel(ProfilesModel):
extruder_stacks = extruder_manager.getActiveExtruderStacks() extruder_stacks = extruder_manager.getActiveExtruderStacks()
if multiple_extrusion: if multiple_extrusion:
# Place the active extruder at the front of the list. # Place the active extruder at the front of the list.
extruder_stacks.remove(active_extruder) # This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
extruder_stacks = [active_extruder] + extruder_stacks # Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
# cases the active_extruder is still None.
if active_extruder in extruder_stacks:
extruder_stacks.remove(active_extruder)
new_extruder_stacks = []
if active_extruder is not None:
new_extruder_stacks = [active_extruder]
extruder_stacks = new_extruder_stacks + extruder_stacks
# Fetch the list of useable qualities across all extruders. # Fetch the list of useable qualities across all extruders.
# 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.

3
cura/Settings/UserProfilesModel.py
View File

@ -33,6 +33,9 @@ class UserProfilesModel(ProfilesModel):
extruder_stacks = extruder_manager.getActiveExtruderStacks() extruder_stacks = extruder_manager.getActiveExtruderStacks()
if multiple_extrusion: if multiple_extrusion:
# Place the active extruder at the front of the list. # Place the active extruder at the front of the list.
# This is a workaround checking if there is an active_extruder or not before moving it to the front of the list.
# Actually, when a printer has multiple extruders, should exist always an active_extruder. However, in some
# cases the active_extruder is still None.
if active_extruder in extruder_stacks: if active_extruder in extruder_stacks:
extruder_stacks.remove(active_extruder) extruder_stacks.remove(active_extruder)
new_extruder_stacks = [] new_extruder_stacks = []

2
plugins/3MFReader/WorkspaceDialog.qml
View File

@ -15,7 +15,7 @@ UM.Dialog
minimumWidth: 500 * screenScaleFactor minimumWidth: 500 * screenScaleFactor
minimumHeight: 400 * screenScaleFactor minimumHeight: 400 * screenScaleFactor
width: minimumWidth width: minimumWidth
height: minumumHeight height: minimumHeight
property int comboboxHeight: 15 * screenScaleFactor property int comboboxHeight: 15 * screenScaleFactor
property int spacerHeight: 10 * screenScaleFactor property int spacerHeight: 10 * screenScaleFactor