Changeset 140

Timestamp:

01/10/08 19:50:36 (1 year ago)

Author:

vud1

Message:

"code optimization"

Files:

• pytrainer/trunk/glade/pytrainer.glade (modified) (1 diff)
• pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (1 diff)
• pytrainer/trunk/pytrainer/lib/gpx.py (modified) (4 diffs)
• pytrainer/trunk/pytrainer/main.py (modified) (2 diffs)
• pytrainer/trunk/pytrainer/record.py (modified) (1 diff)

pytrainer/trunk/glade/pytrainer.glade

@@ -430 +430 @@
-                              <property name="scrollable">False</property>
-                              <property name="enable_popup">False</property>
+                              <signal name="switch_page" handler="on_recordpage_change" last_modification_time="Thu, 10 Jan 2008 18:45:08 GMT"/>
-
-                              <child>

pytrainer/trunk/pytrainer/gui/windowmain.py

@@ -499 +499 @@
-                self.parent.refreshGraphView(self.selected_view)
-        
+        def on_recordpage_change(self,widget,gpointer,page):
+                if page == 0:
+                        selected_view="info"
+                elif page == 1:
+                        selected_view="graphs"
+                elif page == 2:
+                        selected_view="map"
+                elif page == 3:
+                        selected_view="heartrate"
+                self.parent.refreshRecordGraphView(selected_view)
+        
-        def on_showmap_clicked(self,widget):
-                self.infoarea.hide()

pytrainer/trunk/pytrainer/lib/gpx.py

@@ -113 +113 @@
-                total_hr = 0
-                tmp_alt = 0
+                len_validhrpoints = 0
-
-                for trkpoint in trkpoints:
@@ -120 +121 @@
-                        if len(trkpoint.getElementsByTagName("gpxdata:hr")) > 0:
-                                hr = int(trkpoint.getElementsByTagName("gpxdata:hr")[0].firstChild.data)
+                                len_validhrpoints += 1
-                        else: 
-                                hr = 0
@@ -163 +165 @@
-                                                elif rel_alt < 0:
-                                                        self.unegative -= rel_alt
-                                        #except:
-                                        #       print tempnum
-                                
-                                last_lat = tmp_lat
@@ -171 +171 @@
-                                last_time = tmp_time
-
-
+
+
+
-                self.total_dist = total_dist 
-                return retorno

pytrainer/trunk/pytrainer/main.py

@@ -125 +125 @@
-                
-        def refreshGraphView(self, view, sport=None):
-                print "refreshGraphView"
-                date_selected = self.date.getDate()
-                if view=="record":
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                elif view=="day":
-                        record_list = self.record.getrecordList(date_selected)
@@ -167 +154 @@
-                        self.windowmain.actualize_yearview(record_list, year)
-                        self.windowmain.actualize_yeargraph(record_list)
+        
+        def refreshRecordGraphView(self, view):
+                if view=="info":
+                        selected,iter = self.windowmain.recordTreeView.get_selection().get_selected()
+                        if iter:
+                                id_record = selected.get_value(iter,0)
+                                record_list = self.record.getrecordInfo(id_record)
+                        else:
+                                record_list=[]
+                        self.windowmain.actualize_recordview(record_list)
+                if view=="graphs":
+                        selected,iter = self.windowmain.recordTreeView.get_selection().get_selected()
+                        if iter:
+                                id_record = selected.get_value(iter,0)
+                                gpxfile = self.conf.getValue("gpxdir")+"/%s.gpx" %id_record
+                                if os.path.isfile(gpxfile):
+                                        gpx = Gpx(self.data_path,gpxfile)
+                                        gpx_tracklist = gpx.getTrackList()
+                        else:
+                                gpx_tracklist = []
+                        self.windowmain.actualize_recordgraph(gpx_tracklist)
+                if view=="map":
+                        self.refreshMapView()
+                if view=="heartrate":
+                        pass
-                        
-        def refreshMapView(self):

pytrainer/trunk/pytrainer/record.py

@@ -183 +183 @@
-                gpx = Gpx(self.data_path,gpxfile)
-                tracks = gpx.getTrackRoutes()
-                #print self.date.unixtime2date(tracks[0][1])
-                print tracks
-
-                if len(tracks) < 2: