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

Merge branch '3.2'

Browse source
This commit is contained in:
Ghostkeeper 2018-01-15 16:52:28 +01:00
commit e7c5120f9c
No known key found for this signature in database
GPG key ID: 5252B696FB5E7C7A
4 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cura/CuraApplication.py
View file

@ -1063,7 +1063,8 @@ class CuraApplication(QtApplication):
Logger.log("i", "Reseting print information")
self._print_information = PrintInformation.PrintInformation()
self.getCuraSceneController().setActiveBuildPlate(0) # Select first build plate
# stay on the same build plate
#self.getCuraSceneController().setActiveBuildPlate(0) # Select first build plate
## Reset all translation on nodes with mesh data.
@pyqtSlot()

10
cura/Settings/ProfilesModel.py
View file

@ -74,18 +74,11 @@ class ProfilesModel(InstanceContainersModel):
# The actual list of quality profiles come from the first extruder in the extruder list.
result = QualityManager.getInstance().findAllUsableQualitiesForMachineAndExtruders(global_container_stack, extruder_stacks)
# append empty quality if it's not there
if not any(q.getId() == self._empty_quality.getId() for q in result):
result.append(self._empty_quality)
# The usable quality types are set
quality_type_set = set([x.getMetaDataEntry("quality_type") for x in result])
# Fetch all qualities available for this machine and the materials selected in extruders
all_qualities = QualityManager.getInstance().findAllQualitiesForMachineAndMaterials(global_stack_definition, materials)
# append empty quality if it's not there
if not any(q.getId() == self._empty_quality.getId() for q in all_qualities):
all_qualities.append(self._empty_quality)
# If in the all qualities there is some of them that are not available due to incompatibility with materials
# we also add it so that they will appear in the slide quality bar. However in recomputeItems will be marked as
@ -94,6 +87,9 @@ class ProfilesModel(InstanceContainersModel):
if quality.getMetaDataEntry("quality_type") not in quality_type_set:
result.append(quality)
if len(result) > 1:
result.remove(self._empty_quality)
return {item.getId(): item for item in result}, {} #Only return true profiles for now, no metadata. The quality manager is not able to get only metadata yet.
## Re-computes the items in this model, and adds the layer height role.

4
resources/qml/Settings/SettingView.qml
View file

@ -63,9 +63,9 @@ Item
menu: ProfileMenu { }
function generateActiveQualityText () {
result = Cura.MachineManager.activeQualityName
var result = Cura.MachineManager.activeQualityName;
if (Cura.MachineManager.isActiveQualitySupported ) {
if (Cura.MachineManager.isActiveQualitySupported) {
if (Cura.MachineManager.activeQualityLayerHeight > 0) {
result += " <font color=\"" + UM.Theme.getColor("text_detail") + "\">"
result += " - "

7
resources/themes/cura-light/styles.qml
View file

@ -864,9 +864,10 @@ QtObject {
}
}
label: Label {
text: control.text;
color: Theme.getColor("checkbox_text");
font: Theme.getFont("default");
text: control.text
color: Theme.getColor("checkbox_text")
font: Theme.getFont("default")
elide: Text.ElideRight
}
}
}