Correct PronterfaceUI temperature graph changes.

diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py
index dc186647f2bd58f10cfd4db2b50c990f9ef683db..2c905b72be19e007b4da88025dc92c9f0f383164 100644 (file)
--- 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 028cc6154ca1dc5b9a838c76c2944ca1208364ea..e48e0d684bb8b09d192dfea368846dab8ecc3a0a 100644 (file)
--- 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 519fcfe6ea79628c579b31bc30c9abdf6554607e..bd243a92a977a49b9986323386a7946bee7dafb9 100755 (executable)
--- 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