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

Merge branch '4.0'

Browse Source
This commit is contained in:
Ghostkeeper 2018-12-19 11:52:11 +01:00
commit 10c9678edc
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/MachineSettingsAction/MachineSettingsAction.qml
View File

@ -13,7 +13,8 @@ import Cura 1.0 as Cura
Cura.MachineAction Cura.MachineAction
{ {
id: base id: base
property var extrudersModel: CuraApplication.getExtrudersModel() property var extrudersModel: Cura.ExtrudersModel{} // Do not retrieve the Model from a backend. Otherwise the tabs
// in tabView will not removed/updated. Probably QML bug
property int extruderTabsCount: 0 property int extruderTabsCount: 0
property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : "" property var activeMachineId: Cura.MachineManager.activeMachine != null ? Cura.MachineManager.activeMachine.id : ""

4
plugins/SimulationView/SimulationView.py
View File

@ -342,12 +342,16 @@ class SimulationView(CuraView):
return self._extruder_count return self._extruder_count
def getMinFeedrate(self) -> float: def getMinFeedrate(self) -> float:
if abs(self._min_feedrate - sys.float_info.max) < 10: # Some lenience due to floating point rounding.
return 0.0 # If it's still max-float, there are no measurements. Use 0 then.
return self._min_feedrate return self._min_feedrate
def getMaxFeedrate(self) -> float: def getMaxFeedrate(self) -> float:
return self._max_feedrate return self._max_feedrate
def getMinThickness(self) -> float: def getMinThickness(self) -> float:
if abs(self._min_thickness - sys.float_info.max) < 10: # Some lenience due to floating point rounding.
return 0.0 # If it's still max-float, there are no measurements. Use 0 then.
return self._min_thickness return self._min_thickness
def getMaxThickness(self) -> float: def getMaxThickness(self) -> float:

9
plugins/SimulationView/SimulationViewMenuComponent.qml
View File

@ -358,7 +358,7 @@ Cura.ExpandableComponent
width: parent.width width: parent.width
height: UM.Theme.getSize("layerview_row").height height: UM.Theme.getSize("layerview_row").height
Label Label //Minimum value.
{ {
text: text:
{ {
@ -383,9 +383,10 @@ Cura.ExpandableComponent
renderType: Text.NativeRendering renderType: Text.NativeRendering
} }
Label Label //Unit in the middle.
{ {
text: { text:
{
if (UM.SimulationView.layerActivity && CuraApplication.platformActivity) if (UM.SimulationView.layerActivity && CuraApplication.platformActivity)
{ {
// Feedrate selected // Feedrate selected
@ -407,7 +408,7 @@ Cura.ExpandableComponent
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
} }
Label Label //Maximum value.
{ {
text: { text: {
if (UM.SimulationView.layerActivity && CuraApplication.platformActivity) if (UM.SimulationView.layerActivity && CuraApplication.platformActivity)

1
resources/qml/PrinterTypeLabel.qml
View File

@ -19,6 +19,7 @@ Item
{ {
anchors.fill: parent anchors.fill: parent
color: UM.Theme.getColor("printer_type_label_background") color: UM.Theme.getColor("printer_type_label_background")
radius: UM.Theme.getSize("checkbox_radius").width
} }
Label Label