From 9080e756348e232324b60da64f8d533cd30c7084 Mon Sep 17 00:00:00 2001 From: Nicolas Graziano Date: Mon, 14 May 2018 12:13:23 +0200 Subject: [PATCH 1/3] Correct the test to hide bed temperature when no heated bed is present. --- resources/qml/PrintMonitor.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintMonitor.qml b/resources/qml/PrintMonitor.qml index ae74170004..b24bcb6d6c 100644 --- a/resources/qml/PrintMonitor.qml +++ b/resources/qml/PrintMonitor.qml @@ -67,7 +67,7 @@ Column HeatedBedBox { visible: { - if(activePrinter != null && activePrinter.bed_temperature != -1) + if(activePrinter != null && activePrinter.bedTemperature != -1) { return true } From 7a25841816e95be0e69b37cb699dafaf10d03e11 Mon Sep 17 00:00:00 2001 From: fieldOfView Date: Mon, 14 May 2018 14:29:41 +0200 Subject: [PATCH 2/3] Fix support blocker on older (legacy) opengl --- resources/shaders/camera_distance.shader | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/shaders/camera_distance.shader b/resources/shaders/camera_distance.shader index e6e894a2f6..437aa39cc2 100644 --- a/resources/shaders/camera_distance.shader +++ b/resources/shaders/camera_distance.shader @@ -25,9 +25,9 @@ fragment = highp float distance_to_camera = distance(v_vertex, u_viewPosition) * 1000.; // distance in micron vec3 encoded; // encode float into 3 8-bit channels; this gives a precision of a micron at a range of up to ~16 meter - encoded.b = floor(distance_to_camera / 65536.0); - encoded.g = floor((distance_to_camera - encoded.b * 65536.0) / 256.0); - encoded.r = floor(distance_to_camera - encoded.b * 65536.0 - encoded.g * 256.0); + encoded.r = floor(distance_to_camera / 65536.0); + encoded.g = floor((distance_to_camera - encoded.r * 65536.0) / 256.0); + encoded.b = floor(distance_to_camera - encoded.r * 65536.0 - encoded.g * 256.0); gl_FragColor.rgb = encoded / 255.; gl_FragColor.a = 1.0; From 314f9135105613ff532ff6af21635d6ab3919937 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Fri, 18 May 2018 17:21:59 +0200 Subject: [PATCH 3/3] Remove extra "if" statement and unused code --- plugins/UM3NetworkPrinting/DiscoverUM3Action.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/plugins/UM3NetworkPrinting/DiscoverUM3Action.py b/plugins/UM3NetworkPrinting/DiscoverUM3Action.py index 0b8d6e9f53..4c32a1c19c 100644 --- a/plugins/UM3NetworkPrinting/DiscoverUM3Action.py +++ b/plugins/UM3NetworkPrinting/DiscoverUM3Action.py @@ -83,15 +83,8 @@ class DiscoverUM3Action(MachineAction): @pyqtProperty("QVariantList", notify = discoveredDevicesChanged) def foundDevices(self): if self._network_plugin: - # TODO: Check if this needs to stay. - if Application.getInstance().getGlobalContainerStack(): - global_printer_type = Application.getInstance().getGlobalContainerStack().getBottom().getId() - else: - global_printer_type = "unknown" printers = list(self._network_plugin.getDiscoveredDevices().values()) - # TODO; There are still some testing printers that don't have a correct printer type, so don't filter out unkown ones just yet. - #printers = [printer for printer in printers if printer.printerType == global_printer_type or printer.printerType == "unknown"] printers.sort(key = lambda k: k.name) return printers else: