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

Merge pull request #2677 from fieldOfView/fix_isclusterprinter

Browse Source 
Fix qml error when there is no connected printer
This commit is contained in:
Lipu Fei 2017-10-26 11:23:39 +02:00 committed by GitHub
commit 9488d543de
3 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
plugins/UM3NetworkPrinting/UM3InfoComponents.qml
View File

@ -119,11 +119,17 @@ Item
onClicked: manager.loadConfigurationFromPrinter() onClicked: manager.loadConfigurationFromPrinter()
function isClusterPrinter() { function isClusterPrinter() {
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize if(Cura.MachineManager.printerOutputDevices.length == 0)
// This is a non cluster printer or the cluster it is just one printer {
return false;
}
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
// This is not a cluster printer or the cluster it is just one printer
if(clusterSize == undefined || clusterSize == 1) if(clusterSize == undefined || clusterSize == 1)
return false {
return true return false;
}
return true;
} }
} }
} }

14
resources/qml/Menus/MaterialMenu.qml
View File

@ -16,11 +16,17 @@ Menu
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool isClusterPrinter: property bool isClusterPrinter:
{ {
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize if(Cura.MachineManager.printerOutputDevices.length == 0)
// This is a non cluster printer or the cluster it is just one printer {
return false;
}
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
// This is not a cluster printer or the cluster it is just one printer
if(clusterSize == undefined || clusterSize == 1) if(clusterSize == undefined || clusterSize == 1)
return false {
return true return false;
}
return true;
} }
UM.SettingPropertyProvider UM.SettingPropertyProvider

14
resources/qml/Menus/NozzleMenu.qml
View File

@ -16,11 +16,17 @@ Menu
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool isClusterPrinter: property bool isClusterPrinter:
{ {
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize if(Cura.MachineManager.printerOutputDevices.length == 0)
// This is a non cluster printer or the cluster it is just one printer {
return false;
}
var clusterSize = Cura.MachineManager.printerOutputDevices[0].clusterSize;
// This is not a cluster printer or the cluster it is just one printer
if(clusterSize == undefined || clusterSize == 1) if(clusterSize == undefined || clusterSize == 1)
return false {
return true return false;
}
return true;
} }
MenuItem MenuItem