mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0
This commit is contained in:
commit
08c736f770
4 changed files with 21 additions and 5 deletions
|
@ -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:
|
||||||
|
|
|
@ -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)
|
||||||
|
|
|
@ -18,6 +18,10 @@ Item
|
||||||
|
|
||||||
height: centerSection.height
|
height: centerSection.height
|
||||||
width: maximumWidth
|
width: maximumWidth
|
||||||
|
|
||||||
|
// Enable keyboard navigation
|
||||||
|
Keys.onLeftPressed: navigateTo(currentIndex - 1)
|
||||||
|
Keys.onRightPressed: navigateTo(currentIndex + 1)
|
||||||
|
|
||||||
Item
|
Item
|
||||||
{
|
{
|
||||||
|
|
|
@ -24,6 +24,11 @@ Component
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
width: maximumWidth
|
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
|
UM.I18nCatalog
|
||||||
{
|
{
|
||||||
|
@ -59,7 +64,9 @@ Component
|
||||||
}
|
}
|
||||||
width: parent.width
|
width: parent.width
|
||||||
height: 264 * screenScaleFactor // TODO: Theme!
|
height: 264 * screenScaleFactor // TODO: Theme!
|
||||||
MonitorCarousel {}
|
MonitorCarousel {
|
||||||
|
id: carousel
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
MonitorQueue
|
MonitorQueue
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue