GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-backup-manager

Browse Source
This commit is contained in:
ChrisTerBeke 2018-05-22 09:11:31 +02:00
commit efe41a536d
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/UM3NetworkPrinting/DiscoverUM3Action.py
View File

@ -83,15 +83,8 @@ class DiscoverUM3Action(MachineAction):
@pyqtProperty("QVariantList", notify = discoveredDevicesChanged) @pyqtProperty("QVariantList", notify = discoveredDevicesChanged)
def foundDevices(self): def foundDevices(self):
if self._network_plugin: 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()) 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) printers.sort(key = lambda k: k.name)
return printers return printers
else: else:

2
resources/qml/PrintMonitor.qml
View File

@ -67,7 +67,7 @@ Column
HeatedBedBox HeatedBedBox
{ {
visible: { visible: {
if(activePrinter != null && activePrinter.bed_temperature != -1) if(activePrinter != null && activePrinter.bedTemperature != -1)
{ {
return true return true
} }

6
resources/shaders/camera_distance.shader
View File

@ -25,9 +25,9 @@ fragment =
highp float distance_to_camera = distance(v_vertex, u_viewPosition) * 1000.; // distance in micron 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 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.r = floor(distance_to_camera / 65536.0);
encoded.g = floor((distance_to_camera - encoded.b * 65536.0) / 256.0); encoded.g = floor((distance_to_camera - encoded.r * 65536.0) / 256.0);
encoded.r = floor(distance_to_camera - encoded.b * 65536.0 - encoded.g * 256.0); encoded.b = floor(distance_to_camera - encoded.r * 65536.0 - encoded.g * 256.0);
gl_FragColor.rgb = encoded / 255.; gl_FragColor.rgb = encoded / 255.;
gl_FragColor.a = 1.0; gl_FragColor.a = 1.0;