3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 06:23:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Fix conflicts

Browse source
This commit is contained in:
ChrisTerBeke 2018-01-11 09:06:59 +01:00
commit b2d3d15011
136 changed files with 4422 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

17
resources/qml/SidebarSimple.qml
View file

@ -195,11 +195,22 @@ Item
text:
{
var result = ""
if (Cura.MachineManager.activeMachine != null) {
if(Cura.MachineManager.activeMachine != null)
{
result = Cura.ProfilesModel.getItem(index).layer_height_without_unit
if (result == undefined)
result = ""
if(result == undefined)
{
result = "";
}
else
{
result = Number(Math.round(result + "e+2") + "e-2"); //Round to 2 decimals. Javascript makes this difficult...
if (result == undefined || result != result) //Parse failure.
{
result = "";
}
}
}
return result
}