Changeset 173

Timestamp:

01/29/08 23:49:04 (1 year ago)

Author:

vud1

Message:

"Pace calculator"

Files:

• pytrainer/trunk/glade/pytrainer.glade (modified) (4 diffs)
• pytrainer/trunk/pytrainer/gui/windowrecord.py (modified) (2 diffs)
• pytrainer/trunk/pytrainer/lib/gpx.py (modified) (4 diffs)
• pytrainer/trunk/pytrainer/record.py (modified) (3 diffs)

pytrainer/trunk/glade/pytrainer.glade

@@ -6426 +6426 @@
-
-                          <child>
-entry334
+rcd_maxvel
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
@@ -6700 +6700 @@
-
-                          <child>
-entry336
+rcd_pace
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>
@@ -6730 +6730 @@
-                              <property name="relief">GTK_RELIEF_NORMAL</property>
-                              <property name="focus_on_click">True</property>
-average_clicked" last_modification_time="Mon, 15 May 2006 18:27:33
+pace_clicked" last_modification_time="Tue, 29 Jan 2008 21:42:09
-                            </widget>
-                            <packing>
@@ -7033 +7033 @@
-
-                          <child>
-entry337
+rcd_maxbeats
-                              <property name="visible">True</property>
-                              <property name="can_focus">True</property>

pytrainer/trunk/pytrainer/gui/windowrecord.py

@@ -164 +164 @@
-                        pass
-        
+        def on_calcpace_clicked(self,widget):
+                hour = self.rcd_hour.get_value_as_int()
+                min = self.rcd_min.get_value_as_int()
+                sec = self.rcd_second.get_value_as_int()
+                time = sec + (min*60) + (hour*3600)
+                if time<1:
+                        return false
+                time_in_min = time/60.0
+                distance = float(self.rcd_distance.get_text())
+                if distance<1:
+                        return false
+                average = time_in_min/distance
+                self.rcd_pace.set_text("%0.2f" %average)
+        
-        def on_calccalories_clicked(self,widget):
-                sport = self.rcd_sport.get_active_text()
@@ -192 +206 @@
-                self.rcd_distance.set_text("%0.2f" %distance)
-                        
+        def set_maxspeed(self,vel):
+                self.rcd_maxvel.set_text("%0.2f" %vel)
+                        
+        def set_maxhr(self,hr):
+                self.rcd_maxbeats.set_text("%0.2f" %hr)
+                        
-        def set_recordtime (self,time_in_hour):
-                hour = int(time_in_hour)

pytrainer/trunk/pytrainer/lib/gpx.py

@@ -36 +36 @@
-                self.upositive = 0
-                self.unegative = 0
+                self.maxvel = 0
+                self.maxhr = 0
+                self.date = ""
-                self.Values = self._getValues()
-
-        def getMaxValues(self):
-
+
+
+
+
-
-        def getTrackRoutes(self):       
@@ -116 +122 @@
-                tmp_alt = 0
-                len_validhrpoints = 0
+                        
+                date_ = trkpoints[0].getElementsByTagName("time")[0].firstChild.data
+                mk_time = time.strptime(date_, "%Y-%m-%dT%H:%M:%SZ")
+                self.date = time.strftime("%Y-%m-%d", mk_time)
-
-                for trkpoint in trkpoints:
@@ -156 +166 @@
-                                                total_dist += dist
-                                                total_hr += hr
+                                                if hr>self.maxhr:
+                                                        self.maxhr = hr
-                                                #dividimos kilometros por hora (no por segundo)
-                                                tmp_vel = dist/((time_)/3600.0)
@@ -161 +173 @@
-                                                #si la velocidad es menor de 90 lo damos por bueno
-                                                if vel<90 and time_ <100:
+                                                        if vel>self.maxvel:
+                                                                self.maxvel=vel
-                                                        self.total_time += time_
-                                                        retorno.append((total_dist,tmp_alt, self.total_time,vel,lat,lon,hr))

pytrainer/trunk/pytrainer/record.py

@@ -186 +186 @@
-                
-        def actualize_fromgpx(self,gpxfile):
+                print "uno"
-                gpx = Gpx(self.data_path,gpxfile)
+                print "uno1"
-                tracks = gpx.getTrackRoutes()
+                print "dos"
-
-                if len(tracks) == 1:
@@ -199 +202 @@
-                        warning.set_text(msg)
-                        warning.run()
+                print "tres"
-
-        def _actualize_fromgpx(self, gpxfile, trkname = None):
-                gpx = Gpx(self.data_path,gpxfile,trkname)
-
+, maxspeed, maxheartrate
-                upositive,unegative = gpx.getUnevenness()
-                heartrate = gpx.getHeartRateAverage()
-TrackRoutes()[0][1]
+Date()
-                
-                self.recordwindow.rcd_date.set_text(date)
@@ -212 +216 @@
-                self.recordwindow.rcd_beats.set_text(str(heartrate))
-                self.recordwindow.set_distance(distance)
+                self.recordwindow.set_maxspeed(maxspeed)
+                self.recordwindow.set_maxhr(maxheartrate)
-                self.recordwindow.set_recordtime(time/60.0/60.0)
-                self.recordwindow.on_calcaverage_clicked(None)
+                self.recordwindow.on_calcpace_clicked(None)
-
-        def _select_trkfromgpx(self,gpxfile,tracks):