3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-02 20:52:20 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:Ultimaker/Cura into rework_file_handler

Browse source
This commit is contained in:
Jaime van Kessel 2016-11-17 10:27:28 +01:00
commit 9539774c0b
40 changed files with 1161 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cura/PrinterOutputDevice.py
View file

@ -138,14 +138,14 @@ class PrinterOutputDevice(QObject, OutputDevice):
def startCamera(self):
self._startCamera()
def _startCamera(self, job_state):
def _startCamera(self):
Logger.log("w", "_startCamera is not implemented by this output device")
@pyqtSlot()
def stopCamera(self):
self._stopCamera()
def _stopCamera(self, job_state):
def _stopCamera(self):
Logger.log("w", "_stopCamera is not implemented by this output device")
@pyqtProperty(str, notify = jobNameChanged)