Merge branch '15.10' of https://github.com/Ultimaker/Cura into 15.10

This commit is contained in:
Tamara Hogenhout 2015-09-17 10:52:12 +02:00
commit 1488d06a42
3 changed files with 6 additions and 2 deletions

View File

@ -157,6 +157,8 @@ class CuraEngineBackend(Backend):
if self._message:
self._message.hide()
self._message = None
self._message = Message(catalog.i18nc("@info:status", "Unable to slice. Please check your setting values for errors."))
self._message.show()
return #No slicing if we have error values since those are by definition illegal values.
# Remove existing layer data (if any)
for node in DepthFirstIterator(self._scene.getRoot()):

View File

@ -347,15 +347,17 @@ class PrinterConnection(OutputDevice, QObject, SignalEmitter):
@pyqtSlot(int)
def heatupNozzle(self, temperature):
Logger.log("d", "Setting nozzle temperature to %s", temperature)
self._sendCommand("M104 S%s" % temperature)
@pyqtSlot(int)
def heatupBed(self, temperature):
Logger.log("d", "Setting bed temperature to %s", temperature)
self._sendCommand("M140 S%s" % temperature)
@pyqtSlot("long", "long","long")
def moveHead(self, x, y, z):
print("Moving head" , x , " ", y , " " , z)
Logger.log("d","Moving head to %s, %s , %s", x, y, z)
self._sendCommand("G0 X%s Y%s Z%s"%(x,y,z))
@pyqtSlot()

View File

@ -262,7 +262,7 @@ Item
if(printer_connection != null)
{
bedTempStatus.text = catalog.i18nc("@info:progress","Checking")
printer_connection.printer.heatupBed(60)
printer_connection.heatupBed(60)
wizardPage.bed_target_temp = 60
}
}