From: Steven Abadie <steven@alephobjects.com>
Date: Thu, 6 Nov 2014 02:23:14 +0000 (-0700)
Subject: Correct PronterfaceUI temperature graph changes.
X-Git-Tag: 14.09-1.18~69
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=58370fb63d7a8aa5a74cb5e53b7ef0fefed40736;p=cura.git

Correct PronterfaceUI temperature graph changes.
---

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index dc186647..2c905b72 100644
--- a/Cura/gui/printWindow.py
+++ b/Cura/gui/printWindow.py
@@ -512,10 +512,10 @@ class TemperatureGraph(wx.Panel):
 				for n in xrange(0, min(len(t0), len(temp))):
 					t = float(x - x0) / float(x1 - x0 + 1) * (temp[n] - t0[n]) + t0[n]
 					dc.SetPen(tempPenBG)
-					dc.DrawLine(x, h, x, h - (t * h / 300))
+					dc.DrawLine(x, h, x, h - (t * h / 350))
 				bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0
 				dc.SetPen(bedTempPenBG)
-				dc.DrawLine(x, h, x, h - (bt * h / 300))
+				dc.DrawLine(x, h, x, h - (bt * h / 350))
 			t0 = temp
 			bt0 = bedTemp
 			tSP0 = tempSP
@@ -527,7 +527,7 @@ class TemperatureGraph(wx.Panel):
 			dc.SetPen(bgLinePen)
 			dc.DrawLine(x, 0, x, h)
 		tmpNr = 0
-		for y in xrange(h - 1, 0, -h * 50 / 300):
+		for y in xrange(h - 1, 0, -h * 50 / 350):
 			dc.SetPen(bgLinePen)
 			dc.DrawLine(0, y, w, y)
 			dc.DrawText(str(tmpNr), 0, y - dc.GetFont().GetPixelSize().GetHeight())
@@ -548,15 +548,15 @@ class TemperatureGraph(wx.Panel):
 					t = float(x - x0) / float(x1 - x0 + 1) * (temp[n] - t0[n]) + t0[n]
 					tSP = float(x - x0) / float(x1 - x0 + 1) * (tempSP[n] - tSP0[n]) + tSP0[n]
 					dc.SetPen(tempSPPen)
-					dc.DrawPoint(x, h - (tSP * h / 300))
+					dc.DrawPoint(x, h - (tSP * h / 350))
 					dc.SetPen(tempPen)
-					dc.DrawPoint(x, h - (t * h / 300))
+					dc.DrawPoint(x, h - (t * h / 350))
 				bt = float(x - x0) / float(x1 - x0 + 1) * (bedTemp - bt0) + bt0
 				btSP = float(x - x0) / float(x1 - x0 + 1) * (bedTempSP - btSP0) + btSP0
 				dc.SetPen(bedTempSPPen)
-				dc.DrawPoint(x, h - (btSP * h / 300))
+				dc.DrawPoint(x, h - (btSP * h / 350))
 				dc.SetPen(bedTempPen)
-				dc.DrawPoint(x, h - (bt * h / 300))
+				dc.DrawPoint(x, h - (bt * h / 350))
 			t0 = temp
 			bt0 = bedTemp
 			tSP0 = tempSP
diff --git a/plugins/PronterfaceUI/script.py b/plugins/PronterfaceUI/script.py
index 028cc615..e48e0d68 100644
--- a/plugins/PronterfaceUI/script.py
+++ b/plugins/PronterfaceUI/script.py
@@ -49,7 +49,7 @@ addSpinner(180, 0, 160, sendGCode, "M104 S%d")
 addSpinner(180, 0, 180, sendGCode, "M140 S%d")
 
 addTerminal(255, 0, 255)
-addTemperatureGraph(180, 0, 325)
+addTemperatureGraph(180, 0, 255)
 addProgressbar(255, 200, 200)
 
 addButton(0, 255, 255, 'Connect', connect)
diff --git a/scripts/linux/debian_amd64/DEBIAN/control b/scripts/linux/debian_amd64/DEBIAN/control
index 519fcfe6..bd243a92 100755
--- a/scripts/linux/debian_amd64/DEBIAN/control
+++ b/scripts/linux/debian_amd64/DEBIAN/control
@@ -1,6 +1,6 @@
 Source: cura
 Package: cura
-Version: 14.09-1.06-742f
+Version: 14.09-1.06-f719
 Maintainer: Aleph Objects, Inc. <info@alephobjects.com>
 Section: misc
 Priority: optional