Changeset 167

Timestamp:

01/23/08 00:10:50 (1 year ago)

Author:

vud1

Message:

"Max Heart rate calculator"

Files:

• pytrainer/trunk/glade/pytrainer.glade (modified) (3 diffs)
• pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (1 diff)
• pytrainer/trunk/pytrainer/gui/windowprofile.py (modified) (6 diffs)
• pytrainer/trunk/pytrainer/lib/date.py (modified) (2 diffs)
• pytrainer/trunk/pytrainer/lib/xmlUtils.py (modified) (4 diffs)

pytrainer/trunk/glade/pytrainer.glade

@@ -9774 +9774 @@
-
-                          <child>
-entry350
+prf_maxhr
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
@@ -9797 +9797 @@
-
-                          <child>
-entry351
+prf_minhr
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
@@ -9855 +9855 @@
-                              <property name="relief">GTK_RELIEF_NORMAL</property>
-                              <property name="focus_on_click">True</property>
+                              <signal name="clicked" handler="on_calculatemaxhr_clicked" last_modification_time="Tue, 22 Jan 2008 22:19:14 GMT"/>
-                            </widget>
-                            <packing>

pytrainer/trunk/pytrainer/gui/windowmain.py

@@ -669 +669 @@
-                desc = self.waypoint_description.get_text()
-                sym = self.waypoint_type.get_active_text()
-                print sym
-                self.parent.updateWaypoint(id_waypoint,lat,lon,name,desc,sym)
-        

pytrainer/trunk/pytrainer/gui/windowprofile.py

@@ -18 +18 @@
-
-from SimpleGladeApp import SimpleGladeApp
+from windowcalendar import WindowCalendar
-import gtk
-import gobject
@@ -27 +28 @@
-                domain = None
-                self.parent = parent
+                self.data_path = data_path
-                SimpleGladeApp.__init__(self, data_path+glade_path, root, domain)
-                self.conf_options = [
@@ -38 +40 @@
-                        "prf_ddbbname",
-                        "prf_ddbbuser",
-
+
+
+
-
-        def new(self):
@@ -69 +73 @@
-        def setValues(self,list_options):
-                for i in self.conf_options:
+                        if not list_options.has_key(i):
+                                continue
-                        var = getattr(self,i)
-                        if i != "prf_gender" and i != "prf_ddbb":
@@ -94 +100 @@
-                                list_options.append((i,var.get_active_text()))
-                self.parent.setProfile(list_options)
+        
+        def on_calendar_clicked(self,widget):
+                calendardialog = WindowCalendar(self.data_path,self)
+                calendardialog.run()
+
+        def setDate(self,date):
+                self.prf_age.set_text(date)
-
-        def on_switch_page(self,widget,pointer,frame):
@@ -240 +253 @@
-                self.sportlist.show()
-
+        def on_calculatemaxhr_clicked(self,widget=None):
+                import datetime
+                today = "%s"%datetime.date.today()
+                year1,month1,day1 = today.split("-")
+                year2,month2,day2 = self.prf_age.get_text().split("-")
+                diff = datetime.datetime(int(year1), int(month1), int(day1),0,0,0) - datetime.datetime(int(year2), int(month2), int(day2),0,0,0)
+                self.prf_maxhr.set_text("%d" %(220-int(diff.days/365)))
+
-        def hidesportsteps(self):
-                self.sportlist.hide()

pytrainer/trunk/pytrainer/lib/date.py

@@ -20 +20 @@
-
-import time
+import datetime
-
-class Date:
@@ -97 +98 @@
-                day = tm[2]
-                return "%0.4d-%0.2d-%0.2d" %(year,month,day)
+

pytrainer/trunk/pytrainer/lib/xmlUtils.py

@@ -28 +28 @@
-        def __init__(self,filename = None):
-                self.filename = filename
+                self._load()
+
+        def _load(self):
-                try: 
-                        self.xmldoc = xml.dom.minidom.parse(self.filename) 
@@ -38 +41 @@
-
-        def getOptions(self):
+                self._load()
-                root = self.xmldoc.getElementsByTagName("pytraining")[0]
-                list_options = {}
@@ -55 +59 @@
-        def setValue(self,tagname,variable,value):
-                root = self.xmldoc.getElementsByTagName(tagname)[0]
-
+
+
+
+
-                content = self.xmldoc.toprettyxml()
-                self._saveFile(content)
-
-        def getValue(self,tagname,variable):
+                self._load()
-                root = self.xmldoc.getElementsByTagName(tagname)[0]
-                value = root.attributes[variable].value
@@ -65 +73 @@
-        
-        def getAllValues(self,tagname): 
+                self._load()
-                root = self.xmldoc.getElementsByTagName(tagname)
-                retorno = []