3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-25 07:33:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix codestyle

Browse source 
CURA-491
This commit is contained in:
fieldOfView 2016-07-04 16:33:32 +02:00
parent 3d86ffd575
commit dd249206ac
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/MachineManagerModel.py
View file

@ -75,16 +75,16 @@ class MachineManagerModel(QObject):
def _onOutputDevicesChanged(self): def _onOutputDevicesChanged(self):
for printer_output_device in self._printer_output_devices: for printer_output_device in self._printer_output_devices:
printer_output_device.HotendIdChanged.disconnect(self._onHotendIdChanged) printer_output_device.hotendIdChanged.disconnect(self._onHotendIdChanged)
printer_output_device.MaterialIdChanged.disconnect(self._onMaterialIdChanged) printer_output_device.materialIdChanged.disconnect(self._onMaterialIdChanged)
self._printer_output_devices.clear() self._printer_output_devices.clear()
for printer_output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices(): for printer_output_device in Application.getInstance().getOutputDeviceManager().getOutputDevices():
if isinstance(printer_output_device, PrinterOutputDevice): if isinstance(printer_output_device, PrinterOutputDevice):
self._printer_output_devices.append(printer_output_device) self._printer_output_devices.append(printer_output_device)
printer_output_device.HotendIdChanged.connect(self._onHotendIdChanged) printer_output_device.hotendIdChanged.connect(self._onHotendIdChanged)
printer_output_device.MaterialIdChanged.connect(self._onMaterialIdChanged) printer_output_device.materialIdChanged.connect(self._onMaterialIdChanged)
self.outputDevicesChanged.emit() self.outputDevicesChanged.emit()

12
cura/PrinterOutputDevice.py
View file

@ -60,10 +60,10 @@ class PrinterOutputDevice(QObject, OutputDevice):
headPositionChanged = pyqtSignal() headPositionChanged = pyqtSignal()
# Signal to be emitted when either of the material ids is changed # Signal to be emitted when either of the material ids is changed
MaterialIdChanged = pyqtSignal(int, str, arguments = ["index", "id"]) materialIdChanged = pyqtSignal(int, str, arguments = ["index", "id"])
# Signal to be emitted when either of the hotend ids is changed # Signal to be emitted when either of the hotend ids is changed
HotendIdChanged = pyqtSignal(int, str, arguments = ["index", "id"]) hotendIdChanged = pyqtSignal(int, str, arguments = ["index", "id"])
# Signal that is emitted every time connection state is changed. # Signal that is emitted every time connection state is changed.
# it also sends it's own device_id (for convenience sake) # it also sends it's own device_id (for convenience sake)
@ -220,7 +220,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
self._hotend_temperatures[index] = temperature self._hotend_temperatures[index] = temperature
self.hotendTemperaturesChanged.emit() self.hotendTemperaturesChanged.emit()
@pyqtProperty("QVariantList", notify = MaterialIdChanged) @pyqtProperty("QVariantList", notify = materialIdChanged)
def materialIds(self): def materialIds(self):
return self._material_ids return self._material_ids
@ -231,10 +231,10 @@ class PrinterOutputDevice(QObject, OutputDevice):
if material_id and material_id != "" and material_id != self._material_ids[index]: if material_id and material_id != "" and material_id != self._material_ids[index]:
Logger.log("d", "Setting material id of hotend %d to %s" % (index, material_id)) Logger.log("d", "Setting material id of hotend %d to %s" % (index, material_id))
self._material_ids[index] = material_id self._material_ids[index] = material_id
self.MaterialIdChanged.emit(index, material_id) self.materialIdChanged.emit(index, material_id)
@pyqtProperty("QVariantList", notify = HotendIdChanged) @pyqtProperty("QVariantList", notify = hotendIdChanged)
def hotendIds(self): def hotendIds(self):
return self._hotend_ids return self._hotend_ids
@ -245,7 +245,7 @@ class PrinterOutputDevice(QObject, OutputDevice):
if hotend_id and hotend_id != "" and hotend_id != self._hotend_ids[index]: if hotend_id and hotend_id != "" and hotend_id != self._hotend_ids[index]:
Logger.log("d", "Setting hotend id of hotend %d to %s" % (index, hotend_id)) Logger.log("d", "Setting hotend id of hotend %d to %s" % (index, hotend_id))
self._hotend_ids[index] = hotend_id self._hotend_ids[index] = hotend_id
self.HotendIdChanged.emit(index, hotend_id) self.hotendIdChanged.emit(index, hotend_id)
## Attempt to establish connection ## Attempt to establish connection