Merge pull request #197 from Chillance/experimental

Temperature graph

graph.py

+#!/usr/bin/python
+
+# This file is part of the Printrun suite.
+#
+# Printrun is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Printrun is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Printrun.  If not, see <http://www.gnu.org/licenses/>.
+
+import wx, random
+
+from bufferedcanvas import *
+
+class Graph(BufferedCanvas):
+    '''A class to show a Graph with Pronterface.'''
+
+    def __init__(self, parent, id, pos=wx.DefaultPosition,
+                 size=wx.DefaultSize, style=0):
+        # Forcing a no full repaint to stop flickering
+        style = style | wx.NO_FULL_REPAINT_ON_RESIZE
+        #call super function
+        #super(Graph, self).__init__(parent, id, pos, size, style)
+        BufferedCanvas.__init__(self, parent, id)
+
+        self.SetSize(wx.Size(170, 100))
+
+        self.extruder1temps       = [0]
+        self.extruder1targettemps = [0]
+        self.extruder2temps       = [0]
+        self.extruder2targettemps = [0]
+        self.bedtemps             = [0]
+        self.bedtargettemps       = [0]
+
+        self.timer = wx.Timer(self)
+        self.Bind(wx.EVT_TIMER, self.updateTemperatures, self.timer)
+
+        self.maxyvalue  = 250
+        self.ybars      = 5
+        self.xbars      = 6 # One bar per 10 second
+        self.xsteps     = 60 # Covering One minute in the graph
+
+        self.y_offset   = 1 # This is to show the line even when value is 0 and maxyvalue
+
+        self._lastyvalue = 0
+
+
+        #self.sizer = wx.BoxSizer(wx.HORIZONTAL)
+        #self.sizer.Add(wx.Button(self, -1, "Button1", (0,0)))
+        #self.SetSizer(self.sizer)
+
+
+
+    def OnPaint(self, evt):
+        dc = wx.PaintDC(self)
+        gc = wx.GraphicsContext.Create(dc)
+
+    def Destroy(self):
+        #call the super method
+        super(wx.Panel, self).Destroy()
+
+
+    def updateTemperatures(self, event):
+        self.AddBedTemperature(self.bedtemps[-1])
+        self.AddBedTargetTemperature(self.bedtargettemps[-1])
+        self.AddExtruder1Temperature(self.extruder1temps[-1])
+        self.AddExtruder1TargetTemperature(self.extruder1targettemps[-1])
+        #self.AddExtruder2Temperature(self.extruder2temps[-1])
+        #self.AddExtruder2TargetTemperature(self.extruder2targettemps[-1])
+        self.Refresh()
+
+
+    def drawgrid(self, dc, gc):
+        #cold,medium,hot = wx.Colour(0,167,223),wx.Colour(239,233,119),wx.Colour(210,50.100)
+        #col1 = wx.Colour(255,0,0, 255)
+        #col2 = wx.Colour(255,255,255, 128)
+
+        #b = gc.CreateLinearGradientBrush(0, 0, w, h, col1, col2)
+
+        gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 4))
+        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(245,245,255,252))))
+        #gc.SetBrush(b)
+        gc.DrawRectangle(0, 0, self.width, self.height)
+
+        #gc.SetBrush(wx.Brush(wx.Colour(245,245,255,52)))
+
+        #gc.SetBrush(gc.CreateBrush(wx.Brush(wx.Colour(0,0,0,255))))
+        #gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 4))
+
+        #gc.DrawLines(wx.Point(0,0), wx.Point(50,10))
+
+        #path = gc.CreatePath()
+        #path.MoveToPoint(0.0, 0.0)
+        #path.AddLineToPoint(0.0, 100.0)
+        #path.AddLineToPoint(100.0, 0.0)
+        #path.AddCircle( 50.0, 50.0, 50.0 )
+        #path.CloseSubpath()
+        #gc.DrawPath(path)
+        #gc.StrokePath(path)
+
+
+        font = wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.BOLD)
+        gc.SetFont(font, wx.Colour(23,44,44))
+
+        dc.SetPen(wx.Pen(wx.Colour(225,225,225), 1))
+        for x in range(self.xbars):
+            dc.DrawLine(x*(float(self.width)/self.xbars), 0, x*(float(self.width)/self.xbars), self.height)
+
+        dc.SetPen(wx.Pen(wx.Colour(225,225,225), 1))
+        for y in range(self.ybars):
+            y_pos = y*(float(self.height)/self.ybars)
+            dc.DrawLine(0,y_pos, self.width,y_pos)
+            gc.DrawText(unicode(int(self.maxyvalue - (y * (self.maxyvalue/self.ybars)))), 1, y_pos - (font.GetPointSize() / 2))
+
+        if self.timer.IsRunning() == False:
+            font = wx.Font(14, wx.DEFAULT, wx.NORMAL, wx.BOLD)
+            gc.SetFont(font, wx.Colour(3,4,4))
+            gc.DrawText("Graph offline", self.width/2 - (font.GetPointSize() * 3), self.height/2 - (font.GetPointSize() * 1))
+
+        #dc.DrawCircle(50,50, 1)
+
+        #gc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 1))
+        #gc.DrawLines([[20,30], [10,53]])
+        #dc.SetPen(wx.Pen(wx.Colour(255,0,0,0), 1))
+
+    def drawtemperature(self, dc, gc, temperature_list, text, text_xoffset, r, g, b, a):
+        dc.SetPen(wx.Pen(wx.Colour(r,g,b,a), 1))
+        x_add = float(self.width)/self.xsteps
+        x_pos = float(0.0)
+        lastxvalue = float(0.0)
+
+        for temperature in (temperature_list):
+            y_pos = int((float(self.height-self.y_offset)/self.maxyvalue)*temperature) + self.y_offset
+            if (x_pos > 0.0): # One need 2 points to draw a line.
+                dc.DrawLine(lastxvalue,self.height-self._lastyvalue, x_pos, self.height-y_pos)
+            lastxvalue = x_pos
+            x_pos = float(x_pos) + x_add
+            self._lastyvalue = y_pos
+
+        if len(text) > 0:
+            font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.BOLD)
+            #font = wx.Font(8, wx.DEFAULT, wx.NORMAL, wx.NORMAL)
+            gc.SetFont(font, wx.Colour(r,g,b))
+            #gc.DrawText(text, self.width - (font.GetPointSize() * ((len(text) * text_xoffset + 1))), self.height - self._lastyvalue - (font.GetPointSize() / 2))
+            gc.DrawText(text, x_pos - x_add - (font.GetPointSize() * ((len(text) * text_xoffset + 1))), self.height - self._lastyvalue - (font.GetPointSize() / 2))
+            #gc.DrawText(text, self.width - (font.GetPixelSize().GetWidth() * ((len(text) * text_xoffset + 1) + 1)), self.height - self._lastyvalue - (font.GetPointSize() / 2))
+
+
+    def drawbedtemp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.bedtemps, "Bed",2, 255,0,0, 128)
+
+    def drawbedtargettemp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.bedtargettemps, "Bed Target",2, 255,120,0, 128)
+
+
+    def drawextruder1temp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.extruder1temps, "Ex1",1, 0,155,255, 128)
+
+    def drawextruder1targettemp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.extruder1targettemps, "Ex1 Target",2, 0,5,255, 128)
+
+
+    def drawextruder2temp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.extruder2temps, "Ex2",3, 55,55,0, 128)
+
+    def drawextruder2targettemp(self, dc, gc):
+        self.drawtemperature(dc, gc, self.extruder2targettemps, "Ex2 Target",2, 55,55,0, 128)
+
+
+    def SetBedTemperature(self, value):
+        self.bedtemps.pop()
+        self.bedtemps.append(value)
+
+    def AddBedTemperature(self, value):
+        self.bedtemps.append(value)
+        if (len(self.bedtemps)-1) * float(self.width)/self.xsteps > self.width:
+            self.bedtemps.pop(0)
+
+
+    def SetBedTargetTemperature(self, value):
+        self.bedtargettemps.pop()
+        self.bedtargettemps.append(value)
+
+    def AddBedTargetTemperature(self, value):
+        self.bedtargettemps.append(value)
+        if (len(self.bedtargettemps)-1) * float(self.width)/self.xsteps > self.width:
+            self.bedtargettemps.pop(0)
+
+
+    def SetExtruder1Temperature(self, value):
+        self.extruder1temps.pop()
+        self.extruder1temps.append(value)
+
+    def AddExtruder1Temperature(self, value):
+        self.extruder1temps.append(value)
+        if (len(self.extruder1temps)-1) * float(self.width)/self.xsteps > self.width:
+            self.extruder1temps.pop(0)
+
+
+    def SetExtruder1TargetTemperature(self, value):
+        self.extruder1targettemps.pop()
+        self.extruder1targettemps.append(value)
+
+    def AddExtruder1TargetTemperature(self, value):
+        self.extruder1targettemps.append(value)
+        if (len(self.extruder1targettemps)-1) * float(self.width)/self.xsteps > self.width:
+            self.extruder1targettemps.pop(0)
+
+
+    def SetExtruder2Temperature(self, value):
+        self.extruder2temps.pop()
+        self.extruder2temps.append(value)
+
+    def AddExtruder2Temperature(self, value):
+        self.extruder2temps.append(value)
+        if (len(self.extruder2temps)-1) * float(self.width)/self.xsteps > self.width:
+            self.extruder2temps.pop(0)
+
+
+    def SetExtruder2TargetTemperature(self, value):
+        self.extruder2targettemps.pop(0)
+        self.extruder2targettemps.append(value)
+
+    def AddExtruder2TargetTemperature(self, value):
+        self.extruder2targettemps.append(value)
+        if (len(self.extruder2targettemps)-1) * float(self.width)/self.xsteps > self.width:
+            self.extruder2targettemps.pop(0)
+
+
+    def StartPlotting(self, time):
+        self.Refresh()
+        self.timer.Start(time)
+
+    def StopPlotting(self):
+        self.timer.Stop()
+        self.Refresh()
+
+    def draw(self, dc, w, h):
+        dc.Clear()
+        gc = wx.GraphicsContext.Create(dc)
+        self.width = w
+        self.height = h
+        self.drawgrid(dc, gc)
+        self.drawbedtemp(dc, gc)
+        self.drawbedtargettemp(dc, gc)
+        self.drawextruder1temp(dc, gc)
+        self.drawextruder1targettemp(dc, gc)
+        self.drawextruder2temp(dc, gc)
+        self.drawextruder2targettemp(dc, gc)
+
+

pronterface.py

@@ -48,6 +48,7 @@ if os.name=="nt":
 
 from xybuttons import XYButtons
 from zbuttons import ZButtons
+from graph import Graph
 import pronsole
 
 def dosify(name):
@@ -229,6 +230,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                     print _("Setting hotend temperature to %f degrees Celsius.") % f
                     self.hsetpoint=f
                     self.hottgauge.SetTarget(int(f))
+                    self.graph.SetExtruder1TargetTemperature(int(f))
                     if f>0:
                         wx.CallAfter(self.htemp.SetValue,l)
                         self.set("last_temperature",str(f))
@@ -249,7 +251,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             else:
                 print _("You cannot set negative temperatures. To turn the hotend off entirely, set its temperature to 0.")
         except Exception,x:
-            print _("You must enter a temperature. (%s)") % (repr(x),)
+            print _("You must enter a temperature. (%s)" % (repr(x),))
 
     def do_bedtemp(self,l=""):
         try:
@@ -265,6 +267,7 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                     print _("Setting bed temperature to %f degrees Celsius.") % f
                     self.bsetpoint=f
                     self.bedtgauge.SetTarget(int(f))
+                    self.graph.SetBedTargetTemperature(int(f))
                     if f>0:
                         wx.CallAfter(self.btemp.SetValue,l)
                         self.set("last_bed_temperature",str(f))
@@ -637,23 +640,23 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         self.edist.SetBackgroundColour((225,200,200))
         self.edist.SetForegroundColour("black")
         lls.Add(self.edist,pos=(5,2),span=(1,1))
-        lls.Add(wx.StaticText(self.panel,-1,_("mm")),pos=(5,3),span=(1,2))
+        lls.Add(wx.StaticText(self.panel,-1,_("mm")),pos=(5,3),span=(1,1))
         self.efeedc=wx.SpinCtrl(self.panel,-1,str(self.settings.e_feedrate),min=0,max=50000,size=(60,-1))
         self.efeedc.SetBackgroundColour((225,200,200))
         self.efeedc.SetForegroundColour("black")
         self.efeedc.Bind(wx.EVT_SPINCTRL,self.setfeeds)
         lls.Add(self.efeedc,pos=(6,2),span=(1,1))
-        lls.Add(wx.StaticText(self.panel,-1,_("mm/min")),pos=(6,3),span=(1,2))
+        lls.Add(wx.StaticText(self.panel,-1,_("mm/min")),pos=(6,3),span=(1,1))
         self.xyfeedc.Bind(wx.EVT_SPINCTRL,self.setfeeds)
         self.zfeedc.Bind(wx.EVT_SPINCTRL,self.setfeeds)
         self.zfeedc.SetBackgroundColour((180,255,180))
         self.zfeedc.SetForegroundColour("black")
         # lls.Add((10,0),pos=(0,11),span=(1,1))
 
-        self.hottgauge=TempGauge(self.panel,size=(300,24),title=_("Heater:"),maxval=230)
-        lls.Add(self.hottgauge,pos=(7,0),span=(1,8))
-        self.bedtgauge=TempGauge(self.panel,size=(300,24),title=_("Bed:"),maxval=130)
-        lls.Add(self.bedtgauge,pos=(8,0),span=(1,8))
+        self.hottgauge=TempGauge(self.panel,size=(200,24),title=_("Heater:"),maxval=230)
+        lls.Add(self.hottgauge,pos=(7,0),span=(1,4))
+        self.bedtgauge=TempGauge(self.panel,size=(200,24),title=_("Bed:"),maxval=130)
+        lls.Add(self.bedtgauge,pos=(8,0),span=(1,4))
         #def scroll_setpoint(e):
         #   if e.GetWheelRotation()>0:
         #       self.do_settemp(str(self.hsetpoint+1))
@@ -661,6 +664,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
         #       self.do_settemp(str(max(0,self.hsetpoint-1)))
         #self.tgauge.Bind(wx.EVT_MOUSEWHEEL,scroll_setpoint)
 
+        self.graph = Graph(self.panel, wx.ID_ANY)
+        lls.Add(self.graph, pos=(5, 4), span=(4,4), flag=wx.ALIGN_LEFT)
+
         self.gviz=gviz.gviz(self.panel,(300,300),
             build_dimensions=self.build_dimensions_list,
             grid=(self.settings.preview_grid_step1,self.settings.preview_grid_step2),
@@ -1140,6 +1146,12 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
 
     def setmonitor(self,e):
         self.monitor=self.monitorbox.GetValue()
+        if self.monitor:
+            self.graph.StartPlotting(1000)
+        else:
+            self.graph.StopPlotting()
+
+
 
     def sendline(self,e):
         command=self.commandbox.GetValue()
@@ -1166,7 +1178,9 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
                 wx.CallAfter(self.tempdisp.SetLabel,self.tempreport.strip().replace("ok ",""))
                 try:
                     self.hottgauge.SetValue(float(filter(lambda x:x.startswith("T:"),self.tempreport.split())[0].split(":")[1]))
+                    self.graph.SetExtruder1Temperature(float(filter(lambda x:x.startswith("T:"),self.tempreport.split())[0].split(":")[1]))
                     self.bedtgauge.SetValue(float(filter(lambda x:x.startswith("B:"),self.tempreport.split())[0].split(":")[1]))
+                    self.graph.SetBedTemperature(float(filter(lambda x:x.startswith("B:"),self.tempreport.split())[0].split(":")[1]))
                 except:
                     pass
                 fractioncomplete = 0.0
@@ -1228,7 +1242,8 @@ class PronterWindow(wx.Frame,pronsole.pronsole):
             wx.CallAfter(self.tempdisp.SetLabel,self.tempreport.strip().replace("ok ",""))
             try:
                 self.hottgauge.SetValue(float(filter(lambda x:x.startswith("T:"),self.tempreport.split())[0].split(":")[1]))
-                self.bedtgauge.SetValue(float(filter(lambda x:x.startswith("B:"),self.tempreport.split())[0].split(":")[1]))
+                self.graph.SetExtruder1Temperature(float(filter(lambda x:x.startswith("T:"),self.tempreport.split())[0].split(":")[1]))
+                self.graph.SetBedTemperature(float(filter(lambda x:x.startswith("B:"),self.tempreport.split())[0].split(":")[1]))
             except:
                 pass
         tstring=l.rstrip()
@@ -1829,11 +1844,11 @@ class TempGauge(wx.Panel):
         #gc.SetFont(gc.CreateFont(wx.Font(12,wx.FONTFAMILY_DEFAULT,wx.FONTSTYLE_NORMAL,wx.FONTWEIGHT_BOLD),wx.WHITE))
         #gc.DrawText(text,29,-2)
         gc.SetFont(gc.CreateFont(wx.Font(10,wx.FONTFAMILY_DEFAULT,wx.FONTSTYLE_NORMAL,wx.FONTWEIGHT_BOLD),wx.WHITE))
-        gc.DrawText(self.title,x0+19,y0+1)
-        gc.DrawText(text,      x0+153,y0+1)
+        gc.DrawText(self.title,x0+19,y0+4)
+        gc.DrawText(text,      x0+133,y0+4)
         gc.SetFont(gc.CreateFont(wx.Font(10,wx.FONTFAMILY_DEFAULT,wx.FONTSTYLE_NORMAL,wx.FONTWEIGHT_BOLD)))
-        gc.DrawText(self.title,x0+18,y0+0)
-        gc.DrawText(text,      x0+152,y0+0)
+        gc.DrawText(self.title,x0+18,y0+3)
+        gc.DrawText(text,      x0+132,y0+3)
 
 if __name__ == '__main__':
     app = wx.App(False)