Changeset 182
- Timestamp:
- 02/19/08 13:13:41 (11 months ago)
- Files:
-
- pytrainer/trunk/glade/pytrainer.glade (modified) (6 diffs)
- pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (3 diffs)
- pytrainer/trunk/pytrainer/main.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/glade/pytrainer.glade
r181 r182 466 466 <property name="homogeneous">False</property> 467 467 <property name="row_spacing">6</property> 468 <property name="column_spacing"> 0</property>468 <property name="column_spacing">3</property> 469 469 470 470 <child> … … 1838 1838 <property name="homogeneous">False</property> 1839 1839 <property name="row_spacing">5</property> 1840 <property name="column_spacing"> 0</property>1840 <property name="column_spacing">3</property> 1841 1841 1842 1842 <child> … … 2534 2534 <property name="top_attach">4</property> 2535 2535 <property name="bottom_attach">5</property> 2536 <property name="x_options">fill</property> 2537 <property name="y_options"></property> 2538 </packing> 2539 </child> 2540 2541 <child> 2542 <widget class="GtkLabel" id="record_zonesmethod"> 2543 <property name="visible">True</property> 2544 <property name="label" translatable="yes"> </property> 2545 <property name="use_underline">False</property> 2546 <property name="use_markup">False</property> 2547 <property name="justify">GTK_JUSTIFY_LEFT</property> 2548 <property name="wrap">False</property> 2549 <property name="selectable">False</property> 2550 <property name="xalign">0</property> 2551 <property name="yalign">0.5</property> 2552 <property name="xpad">0</property> 2553 <property name="ypad">0</property> 2554 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> 2555 <property name="width_chars">-1</property> 2556 <property name="single_line_mode">False</property> 2557 <property name="angle">0</property> 2558 </widget> 2559 <packing> 2560 <property name="left_attach">1</property> 2561 <property name="right_attach">3</property> 2562 <property name="top_attach">3</property> 2563 <property name="bottom_attach">4</property> 2536 2564 <property name="x_options">fill</property> 2537 2565 <property name="y_options"></property> … … 2877 2905 <property name="homogeneous">False</property> 2878 2906 <property name="row_spacing">6</property> 2879 <property name="column_spacing"> 0</property>2907 <property name="column_spacing">3</property> 2880 2908 2881 2909 <child> … … 3668 3696 <property name="homogeneous">False</property> 3669 3697 <property name="row_spacing">6</property> 3670 <property name="column_spacing"> 0</property>3698 <property name="column_spacing">3</property> 3671 3699 3672 3700 <child> … … 4485 4513 <property name="homogeneous">False</property> 4486 4514 <property name="row_spacing">6</property> 4487 <property name="column_spacing"> 0</property>4515 <property name="column_spacing">3</property> 4488 4516 4489 4517 <child> pytrainer/trunk/pytrainer/gui/windowmain.py
r180 r182 135 135 self.recordview.set_sensitive(1) 136 136 distance = self.parseFloat(record_list[2]) 137 beats = self.parseFloat(record_list[4])138 137 average = self.parseFloat(record_list[6]) 139 138 calories = self.parseFloat(record_list[7]) … … 151 150 self.record_minute.set_text("%d" %min) 152 151 self.record_second.set_text("%d" %sec) 153 self.record_beats.set_text("%0.2f" %beats)154 152 self.record_average.set_text("%0.2f" %average) 155 153 self.record_calories.set_text("%0.0f" %calories) … … 177 175 self.drawareaheartrate.drawgraph(record_list) 178 176 179 def actualize_hrview(self,zones): 180 self.record_zone1.set_text("%s-%s" %(zones[4][0],zones[4][1])) 181 self.record_zone2.set_text("%s-%s" %(zones[3][0],zones[3][1])) 182 self.record_zone3.set_text("%s-%s" %(zones[2][0],zones[2][1])) 183 self.record_zone4.set_text("%s-%s" %(zones[1][0],zones[1][1])) 184 self.record_zone5.set_text("%s-%s" %(zones[0][0],zones[0][1])) 177 def actualize_hrview(self,record_list,zones,is_karvonen_method): 178 if len(record_list)>0: 179 record_list=record_list[0] 180 print record_list 181 self.record_zone1.set_text("%s-%s" %(zones[4][0],zones[4][1])) 182 self.record_zone2.set_text("%s-%s" %(zones[3][0],zones[3][1])) 183 self.record_zone3.set_text("%s-%s" %(zones[2][0],zones[2][1])) 184 self.record_zone4.set_text("%s-%s" %(zones[1][0],zones[1][1])) 185 self.record_zone5.set_text("%s-%s" %(zones[0][0],zones[0][1])) 186 beats = self.parseFloat(record_list[4]) 187 self.record_beats.set_text("%0.2f" %beats) 188 if is_karvonen_method=="True": 189 self.record_zonesmethod.set_text(_("Karvonen method")) 190 else: 191 self.record_zonesmethod.set_text(_("Percentages method")) 192 else: 193 self.recordview.set_sensitive(0) 185 194 186 195 def actualize_dayview(self,record_list): pytrainer/trunk/pytrainer/main.py
r180 r182 161 161 if view=="info": 162 162 selected,iter = self.windowmain.recordTreeView.get_selection().get_selected() 163 record_list=[] 163 164 if iter: 164 165 id_record = selected.get_value(iter,0) 165 166 record_list = self.record.getrecordInfo(id_record) 166 else:167 record_list=[]168 167 self.windowmain.actualize_recordview(record_list) 169 168 … … 185 184 selected,iter = self.windowmain.recordTreeView.get_selection().get_selected() 186 185 gpx_tracklist = [] 186 record_list=[] 187 187 if iter: 188 188 id_record = selected.get_value(iter,0) 189 record_list = self.record.getrecordInfo(id_record) 189 190 gpxfile = self.conf.getValue("gpxdir")+"/%s.gpx" %id_record 190 191 if os.path.isfile(gpxfile): … … 193 194 self.windowmain.actualize_heartrategraph(gpx_tracklist) 194 195 zones = getZones() 195 self.windowmain.actualize_hrview(zones) 196 filename = self.conf.getValue("conffile") 197 configuration = XMLParser(filename) 198 karvonen_method = configuration.getValue("pytraining","prf_hrzones_karvonen") 199 self.windowmain.actualize_hrview(record_list,zones,karvonen_method) 196 200 197 201 def refreshMapView(self):
