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

Merge pull request #1122 from fieldOfView/fix_qml_errors

Browse source 
Fix qml errors
This commit is contained in:
Jaime van Kessel 2016-11-09 13:44:42 +01:00 • committed by GitHub
commit fdbbda07be
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/Cura.qml
View file

@ -424,6 +424,10 @@ UM.MainWindow
visible: base.monitoringPrint visible: base.monitoringPrint
onVisibleChanged: onVisibleChanged:
{ {
if(Cura.MachineManager.printerOutputDevices.length == 0 )
{
return;
}
if(visible) if(visible)
{ {
Cura.MachineManager.printerOutputDevices[0].startCamera() Cura.MachineManager.printerOutputDevices[0].startCamera()

6
resources/qml/Settings/SettingExtruder.qml
View file

@ -21,7 +21,11 @@ SettingItem
id: extruders_model id: extruders_model
onModelChanged: control.color = extruders_model.getItem(control.currentIndex).color onModelChanged: control.color = extruders_model.getItem(control.currentIndex).color
} }
property string color: extruders_model.getItem(control.currentIndex).color property string color:
{
var model_color = extruders_model.getItem(control.currentIndex).color;
return (model_color) ? model_color : "";
}
textRole: "name" textRole: "name"