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

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

Browse source
This commit is contained in:
Jaime van Kessel 2018-12-19 13:31:06 +01:00
commit 08c736f770
4 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/SimulationView/SimulationView.py
View file

@ -342,12 +342,16 @@ class SimulationView(CuraView):
return self._extruder_count
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
def getMaxFeedrate(self) -> float:
return self._max_feedrate
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
def getMaxThickness(self) -> float:

9
plugins/SimulationView/SimulationViewMenuComponent.qml
View file

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

4
plugins/UM3NetworkPrinting/resources/qml/MonitorCarousel.qml
View file

@ -18,6 +18,10 @@ Item
height: centerSection.height
width: maximumWidth
// Enable keyboard navigation
Keys.onLeftPressed: navigateTo(currentIndex - 1)
Keys.onRightPressed: navigateTo(currentIndex + 1)
Item
{

9
plugins/UM3NetworkPrinting/resources/qml/MonitorStage.qml
View file

@ -24,6 +24,11 @@ Component
}
}
width: maximumWidth
// Enable keyboard navigation. NOTE: This is done here so that we can also potentially
// forward to the queue items in the future. (Deleting selected print job, etc.)
Keys.forwardTo: carousel
Component.onCompleted: forceActiveFocus()
UM.I18nCatalog
{
@ -59,7 +64,9 @@ Component
}
width: parent.width
height: 264 * screenScaleFactor // TODO: Theme!
MonitorCarousel {}
MonitorCarousel {
id: carousel
}
}
MonitorQueue