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

Hide manual controls for outputdevices that don't support it

Browse source
This commit is contained in:
fieldOfView 2017-10-24 11:03:51 +02:00
parent 6294900bc7
commit a9f2ad7ca3
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cura/PrinterOutputDevice.py
View file

@ -74,6 +74,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
self._can_pause = True self._can_pause = True
self._can_abort = True self._can_abort = True
self._can_pre_heat_bed = True self._can_pre_heat_bed = True
self._can_control_manually = True
def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None): def requestWrite(self, nodes, file_name = None, filter_by_machine = False, file_handler = None):
raise NotImplementedError("requestWrite needs to be implemented") raise NotImplementedError("requestWrite needs to be implemented")
@ -144,6 +145,11 @@ class PrinterOutputDevice(QObject, OutputDevice):
def canAbort(self): def canAbort(self):
return self._can_abort return self._can_abort
# Does the printer support manual control at all
@pyqtProperty(bool, constant=True)
def canControlManually(self):
return self._can_control_manually
@pyqtProperty(QObject, constant=True) @pyqtProperty(QObject, constant=True)
def monitorItem(self): def monitorItem(self):
# Note that we specifically only check if the monitor component is created. # Note that we specifically only check if the monitor component is created.

1
plugins/UM3NetworkPrinting/NetworkClusterPrinterOutputDevice.py
View file

@ -103,6 +103,7 @@ class NetworkClusterPrinterOutputDevice(NetworkPrinterOutputDevice.NetworkPrinte
self._can_pause = True self._can_pause = True
self._can_abort = True self._can_abort = True
self._can_pre_heat_bed = False self._can_pre_heat_bed = False
self._can_control_manually = False
self._cluster_size = int(properties.get(b"cluster_size", 0)) self._cluster_size = int(properties.get(b"cluster_size", 0))
self._cleanupRequest() self._cleanupRequest()

13
resources/qml/PrintMonitor.qml
View file

@ -677,14 +677,9 @@ Column
watchedProperties: ["value"] watchedProperties: ["value"]
} }
Loader
{
sourceComponent: monitorSection
property string label: catalog.i18nc("@label", "Printer control")
}
Column Column
{ {
visible: connectedPrinter != null ? connectedPrinter.canControlManually : false
enabled: enabled:
{ {
if (connectedPrinter == null) if (connectedPrinter == null)
@ -702,6 +697,12 @@ Column
return true; return true;
} }
Loader
{
sourceComponent: monitorSection
property string label: catalog.i18nc("@label", "Printer control")
}
Row Row
{ {
width: base.width - 2 * UM.Theme.getSize("default_margin").width width: base.width - 2 * UM.Theme.getSize("default_margin").width