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

Temperatures are now stored in the class

Browse Source 
CURA-1339
This commit is contained in:
Jaime van Kessel 2016-04-13 14:08:10 +02:00
parent 0f097f0f64
commit 598c5be976
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cura/PrinterOutputDevice.py
View File

@ -17,6 +17,8 @@ class PrinterOutputDevice(OutputDevice, QObject):
OutputDevice.__init__(self, device_id) OutputDevice.__init__(self, device_id)
self._target_bed_temperature = 0 self._target_bed_temperature = 0
self._bed_temperature = 0
self._hotend_temperatures = {}
self._target_hotend_temperatures = {} self._target_hotend_temperatures = {}
self._head_x = 0 self._head_x = 0
self._head_y = 0 self._head_y = 0
@ -60,7 +62,7 @@ class PrinterOutputDevice(OutputDevice, QObject):
# This function is "final" (do not re-implement) # This function is "final" (do not re-implement)
# /sa _setBedTemperature # /sa _setBedTemperature
@pyqtSlot(int) @pyqtSlot(int)
def setBedTemperature(self, temperature): def setTargetBedTemperature(self, temperature):
self._setTargetBedTemperature(temperature) self._setTargetBedTemperature(temperature)
self._target_bed_temperature = temperature self._target_bed_temperature = temperature
self.targetBedTemperatureChanged.emit() self.targetBedTemperatureChanged.emit()
@ -70,6 +72,11 @@ class PrinterOutputDevice(OutputDevice, QObject):
def _setTargetBedTemperature(self, temperature): def _setTargetBedTemperature(self, temperature):
pass pass
## Get the bed temperature if connected printer (if any)
@pyqtProperty(int, notify = bedTemperatureChanged)
def bedTemperature(self):
return self._bed_temperature
## Get the target bed temperature if connected printer (if any) ## Get the target bed temperature if connected printer (if any)
@pyqtProperty(int, notify = targetBedTemperatureChanged) @pyqtProperty(int, notify = targetBedTemperatureChanged)
def targetBedTemperature(self): def targetBedTemperature(self):
@ -81,7 +88,7 @@ class PrinterOutputDevice(OutputDevice, QObject):
# /param temperature The temperature it needs to change to (in deg celsius). # /param temperature The temperature it needs to change to (in deg celsius).
# /sa _setTargetHotendTemperature # /sa _setTargetHotendTemperature
@pyqtSlot(int, int) @pyqtSlot(int, int)
def setHotendTemperature(self, index, temperature): def setTargetHotendTemperature(self, index, temperature):
self._setTargetHotendTemperature(index, temperature) self._setTargetHotendTemperature(index, temperature)
self._target_hotend_temperatures[index] = temperature self._target_hotend_temperatures[index] = temperature
self.targetHotendTemperaturesChanged.emit() self.targetHotendTemperaturesChanged.emit()
@ -91,17 +98,11 @@ class PrinterOutputDevice(OutputDevice, QObject):
@pyqtProperty("QVariantMap", notify = targetHotendTemperaturesChanged) @pyqtProperty("QVariantMap", notify = targetHotendTemperaturesChanged)
def targetHotendTemperatures(self): def targetHotendTemperatures(self):
return self._getTargetHotendTemperatures() return self._target_hotend_temperatures
def _getTargetHotendTemperatures(self):
raise NotImplementedError("_getTargetHotendTemperatures needs to be implemented")
@pyqtProperty("QVariantMap", notify = hotendTemperaturesChanged) @pyqtProperty("QVariantMap", notify = hotendTemperaturesChanged)
def hotendTemperatures(self): def hotendTemperatures(self):
return self._getHotendTemperatures() return self._hotend_temperatures
def _getHotendTemperatures(self):
raise NotImplementedError("_getHotendTemperatures needs to be implemented")
## Attempt to establish connection ## Attempt to establish connection
def connect(self): def connect(self):