Changeset 171

Timestamp:

01/27/08 23:32:48 (1 year ago)

Author:

vud1

Message:

"heart rate plot & pie graphs"

Files:

• pytrainer/trunk/glade/pytrainer.glade (modified) (4 diffs)
• pytrainer/trunk/pytrainer/gui/drawArea.py (modified) (5 diffs)
• pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (2 diffs)
• pytrainer/trunk/pytrainer/heartrategraph.py (modified) (2 diffs)

pytrainer/trunk/glade/pytrainer.glade

@@ -1581 +1581 @@
-
-                              <child>
-
+_
-                                  <property name="visible">True</property>
-                                  <property name="homogeneous">False</property>
@@ -2223 +2223 @@
-                                          <property name="relief">GTK_RELIEF_NONE</property>
-                                          <property name="focus_on_click">True</property>
+                                          <signal name="clicked" handler="on_hrpiebutton_clicked" last_modification_time="Sun, 27 Jan 2008 22:27:26 GMT"/>
-
-                                          <child>
@@ -2248 +2249 @@
-                                          <property name="relief">GTK_RELIEF_NONE</property>
-                                          <property name="focus_on_click">True</property>
+                                          <signal name="clicked" handler="on_hrplotbutton_clicked" last_modification_time="Sun, 27 Jan 2008 22:27:46 GMT"/>
-
-                                          <child>
@@ -2275 +2277 @@
-
-                                  <child>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                  </child>
-                                </widget>

pytrainer/trunk/pytrainer/gui/drawArea.py

@@ -41 +41 @@
-                elif type == "plot":
-                        self.drawPlot(xvalues,yvalues,xlabel,ylabel,title,color,zones)
+                elif type == "pie":
+                        self.drawPie(xvalues,yvalues,xlabel,ylabel,title,color,zones)
-
-        def drawBars(self,xvalues,yvalues,xlabel,ylabel,title,color):
@@ -48 +50 @@
-                self.axis.clear()
-                width = 1
-
+
+
-                        if len(xvalues) == 1:
-                                self.axis = self.figure.add_subplot(111)
@@ -59 +62 @@
-                
-                        p1 = self.axis.bar(xvalues[i], yvalues[i], width, color=color[i])
-
+
-                self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
-                self.canvas.show()
@@ -67 +70 @@
-                self.canvas.destroy()
-                self.figure = Figure(figsize=(6,4), dpi=72)
-
-
+#
+#
-                i = 0
-                for value in xvalues:
@@ -89 +92 @@
-                self.vbox.pack_start(self.canvas, True, True)
-        
+        def drawPie(self,xvalues,yvalues,xlabel,ylabel,title,color,zones=None):
+                self.canvas.destroy()
+                self.figure = Figure(figsize=(6,4), dpi=72)
+                #self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+                #self.axis.clear()
+                self.axis = self.figure.add_subplot(111)
+
+                labels = ["rest"]
+                colors = ["#ffffff"]
+                frac0 = 0
+                frac1 = 0
+                frac2 = 0
+                frac3 = 0
+                frac4 = 0
+                frac5 = 0
+                for zone in zones:
+                        labels.append(zone[3])
+                        colors.append(zone[2])
+        
+                for value in yvalues[0]:
+                        if value < zones[4][0]:
+                                frac0+=1
+                        elif value > zones[4][0] and value < zones[4][1]:
+                                frac1+=1
+                        elif value > zones[3][0] and value < zones[3][1]:
+                                frac2+=1
+                        elif value > zones[2][0] and value < zones[2][1]:
+                                frac3+=1
+                        elif value > zones[1][0] and value < zones[1][1]:
+                                frac4+=1
+                        elif value > zones[0][0] and value < zones[0][1]:
+                                frac5+=1
+                        
+                fracs = [frac0,frac1,frac2,frac3,frac4, frac5]
+                explode=(0, 0, 0, 0,0,0)
+                self.axis.pie(fracs, explode=explode, labels=labels, colors=colors, autopct='%1.1f%%', shadow=True)
+
+                self.canvas = FigureCanvasGTK(self.figure) # a gtk.DrawingArea
+                self.canvas.show()
+                self.vbox.pack_start(self.canvas, True, True)
+
-        def drawDefault(self):
-
+#
-                self.axis=self.figure.add_subplot(111)
-                self.axis.set_xlabel('Yepper')

pytrainer/trunk/pytrainer/gui/windowmain.py

@@ -99 +99 @@
-        def createGraphs(self,RecordGraph,DayGraph,MonthGraph,YearGraph,HeartRateGraph):
-                self.drawarearecord = RecordGraph(self.record_vbox, self.record_combovalue, self.record_combovalue2)
-
+,self.heartrate_vbox2
-                #self.drawareaday = DayGraph(self.day_vbox, self.day_combovalue)
-                self.day_vbox.hide()
@@ -675 +675 @@
-                id_waypoint = selected.get_value(iter,0)
-                self.parent.removeWaypoint(id_waypoint)
-
+
+
+
+
+
+
+
+

pytrainer/trunk/pytrainer/heartrategraph.py

@@ -22 +22 @@
-
-class HeartRateGraph:
-
+, vbox2 = None
-                self.drawarea = DrawArea(vbox)
+                self.drawarea2 = DrawArea(vbox2)
-                self.conf = checkConf()
-                self.filename = self.conf.getValue("conffile")
@@ -56 +57 @@
-                zones = [zone5,zone4,zone3,zone2,zone1]
-        
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
+
-                xvalue = []
-                yvalue = []
-                for value in values:
-                        xvalue.append(value[0])
-
-
+
-                return xvalue,yvalue
-