From 215ee19db8414047d02bb92c4813348015606f94 Mon Sep 17 00:00:00 2001
From: "hg42@gmx.net" <hg42@gmx.net>
Date: Sat, 8 Mar 2014 16:35:40 +0100
Subject: [PATCH] show Z in pronterFaceUI

--HG--
extra : source : 38222217c2c3d5d67dc2825680ec7c4e0916568d
---
 Cura/gui/printWindow.py                             | 13 +++++++++----
 .../util/printerConnection/printerConnectionBase.py |  3 +++
 Cura/util/printerConnection/serialConnection.py     |  7 +++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index 19b9f3659..930491312 100644
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -280,10 +280,15 @@ def __doPrinterConnectionUpdate(self, connection, extraInfo):
 				self._progressBar.SetValue(0)
 		info = connection.getStatusString()
 		info += '\n'
-		if self._printerConnection.getTemperature(0) is not None:
-			info += 'Temperature: %d' % (self._printerConnection.getTemperature(0))
-		if self._printerConnection.getBedTemperature() > 0:
-			info += ' Bed: %d' % (self._printerConnection.getBedTemperature())
+		value = self._printerConnection.getTemperature(0)
+		if value is not None:
+			info += 'Temperature: %d' % (value)
+		value = self._printerConnection.getBedTemperature()
+		if value is not None:
+			info += ' Bed: %d' % (value)
+		value = self._printerConnection.getZ()
+		if value is not None:
+			info += ' Z: %.2f' % (value)
 		if self._infoText is not None:
 			self._infoText.SetLabel(info)
 		else:
diff --git a/Cura/util/printerConnection/printerConnectionBase.py b/Cura/util/printerConnection/printerConnectionBase.py
index 207131cea..c3ed5d4dd 100644
--- a/Cura/util/printerConnection/printerConnectionBase.py
+++ b/Cura/util/printerConnection/printerConnectionBase.py
@@ -125,6 +125,9 @@ def getTemperature(self, extruder):
 	def getBedTemperature(self):
 		return None
 
+	def getZ(self):
+		return 0.0
+
 	# Get the connection status string. This is displayed to the user and can be used to communicate
 	#  various information to the user.
 	def getStatusString(self):
diff --git a/Cura/util/printerConnection/serialConnection.py b/Cura/util/printerConnection/serialConnection.py
index 88e3047af..b0b19deff 100644
--- a/Cura/util/printerConnection/serialConnection.py
+++ b/Cura/util/printerConnection/serialConnection.py
@@ -62,6 +62,7 @@ def __init__(self, port):
 		self._targetTemperature = []
 		self._bedTemperature = 0
 		self._targetBedTemperature = 0
+		self._z = 0.0
 		self._log = []
 
 		self._commState = None
@@ -157,6 +158,9 @@ def getTemperature(self, extruder):
 	def getBedTemperature(self):
 		return self._bedTemperature
 
+	def getZ(self):
+		return self._z
+
 	#Are we able to send a direct command with sendCommand at this moment in time.
 	def isAbleToSendDirectCommand(self):
 		return self.isActiveConnectionOpen()
@@ -212,6 +216,9 @@ def _serialCommunicationThread(self):
 			elif line[0] == 'progress':
 				self._printProgress = int(line[1])
 				self._doCallback()
+			elif line[0] == 'changeZ':
+				self._z = float(line[1])
+				self._doCallback()
 			else:
 				print line
 			line = self._process.stdout.readline()