Changeset 115
- Timestamp:
- 10/10/07 22:41:18 (1 year ago)
- Files:
-
- pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/pytrainer/gui/windowmain.py
r114 r115 149 149 self.record_beats.set_text("%0.2f" %beats) 150 150 self.record_average.set_text("%0.2f" %average) 151 self.record_calories.set_text("%0. 2f" %calories)151 self.record_calories.set_text("%0.0f" %calories) 152 152 self.record_upositive.set_text("%0.2f" %upositive) 153 153 self.record_unegative.set_text("%0.2f" %unegative) … … 184 184 self.day_beats.set_text("%0.2f" %beats) 185 185 self.day_average.set_text("%0.2f" %average) 186 self.day_calories.set_text("%0. 2f" %calories)186 self.day_calories.set_text("%0.0f" %calories) 187 187 self.day_topic.set_text(record_list[1]) 188 188 … … 213 213 average += self.parseFloat(record[5]) 214 214 calories += self.parseFloat(record[6]) 215 beats += self.parseFloat(record[3])215 beats = self.parseFloat(record[3]) 216 216 if float(beats) > 0: 217 217 time_in_min += time/60 218 218 tbeats += beats*(time/60) 219 if time_in_min > 0: 220 tbeats = tbeats/time_in_min 221 else: 222 tbeats = 0 219 223 220 tbeats = tbeats/time_in_min221 224 self.montha_distance.set_text("%0.2f" %km) 222 225 hour,min,sec = self.parent.date.second2time(time) … … 227 230 time_in_hour = time/3600 228 231 self.montha_average.set_text("%0.2f" %(km/(time/3600))) 229 self.montha_calories.set_text("%0. 2f" %calories)232 self.montha_calories.set_text("%0.0f" %calories) 230 233 self.monthview.set_sensitive(1) 231 234 else: … … 247 250 average += self.parseFloat(record[5]) 248 251 calories += self.parseFloat(record[6]) 249 beats += self.parseFloat(record[3])252 beats = self.parseFloat(record[3]) 250 253 if float(beats) > 0: 251 254 time_in_min += time/60 252 255 tbeats += beats*(time/60) 253 tbeats = tbeats/time_in_min 256 if time_in_min > 0: 257 tbeats = tbeats/time_in_min 258 else: 259 tbeats = 0 254 260 self.yeara_distance.set_text("%0.2f" %km) 255 261 hour,min,sec = self.parent.date.second2time(time) … … 259 265 self.yeara_beats.set_text("%0.2f" %tbeats) 260 266 self.yeara_average.set_text("%0.2f" %(km/(time/3600))) 261 self.yeara_calories.set_text("%0. 2f" %calories)267 self.yeara_calories.set_text("%0.0f" %calories) 262 268 self.yearview.set_sensitive(1) 263 269 else:
