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

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

Browse Source
This commit is contained in:
Jaime van Kessel 2021-08-25 13:01:27 +02:00
commit deab3fd32b
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/GCodeReader/FlavorParser.py
View File

@ -1,4 +1,4 @@
# Copyright (c) 2020 Ultimaker B.V. # Copyright (c) 2021 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher. # Cura is released under the terms of the LGPLv3 or higher.
import math import math
@ -153,7 +153,7 @@ class FlavorParser:
Af = (self._filament_diameter / 2) ** 2 * numpy.pi Af = (self._filament_diameter / 2) ** 2 * numpy.pi
# Length of the extruded filament # Length of the extruded filament
de = current_extrusion - previous_extrusion de = current_extrusion - previous_extrusion
# Volumne of the extruded filament # Volume of the extruded filament
dVe = de * Af dVe = de * Af
# Length of the printed line # Length of the printed line
dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2) dX = numpy.sqrt((current_point[0] - previous_point[0])**2 + (current_point[2] - previous_point[2])**2)

8
resources/qml/Menus/ConfigurationMenu/ConfigurationMenu.qml
View File

@ -60,7 +60,7 @@ Cura.ExpandablePopup
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
ColumnLayout Column
{ {
opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a opacity: model.enabled ? 1 : UM.Theme.getColor("extruder_disabled").a
spacing: 0 spacing: 0
@ -83,7 +83,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
Layout.preferredWidth: parent.width width: parent.width
visible: !truncated visible: !truncated
} }
@ -96,7 +96,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
Layout.preferredWidth: parent.width width: parent.width
visible: !materialBrandColorTypeLabel.visible && !truncated visible: !materialBrandColorTypeLabel.visible && !truncated
} }
@ -109,7 +109,7 @@ Cura.ExpandablePopup
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
renderType: Text.NativeRendering renderType: Text.NativeRendering
Layout.preferredWidth: parent.width width: parent.width
visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible visible: !materialBrandColorTypeLabel.visible && !materialColorTypeLabel.visible
} }
// Label that shows the name of the variant // Label that shows the name of the variant

4
resources/themes/cura-light/icons/deprecated_icons.json
View File

@ -167,6 +167,10 @@
"new_icon": "Check", "new_icon": "Check",
"size": "default" "size": "default"
}, },
"star": {
"new_icon": "StarFilled",
"size": "default"
},
"pencil": { "pencil": {
"new_icon": "Pen", "new_icon": "Pen",
"size": "default" "size": "default"