Changeset 189
- Timestamp:
- 03/18/08 14:11:27 (10 months ago)
- Files:
-
- pytrainer/trunk/glade/pytrainer.glade (modified) (21 diffs)
- pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (7 diffs)
- pytrainer/trunk/pytrainer/gui/windowprofile.py (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/glade/pytrainer.glade
r187 r189 694 694 695 695 <child> 696 <widget class="GtkLabel" id=" label11136">696 <widget class="GtkLabel" id="r_maxspeed_unit"> 697 697 <property name="visible">True</property> 698 698 <property name="label" translatable="yes">km/h</property> … … 722 722 723 723 <child> 724 <widget class="GtkLabel" id=" label11139">724 <widget class="GtkLabel" id="r_maxpace_unit"> 725 725 <property name="visible">True</property> 726 726 <property name="label" translatable="yes">min/km</property> … … 750 750 751 751 <child> 752 <widget class="GtkLabel" id=" label-2147483648">752 <widget class="GtkLabel" id="r_descent_unit"> 753 753 <property name="visible">True</property> 754 754 <property name="label" translatable="yes">m</property> … … 1087 1087 1088 1088 <child> 1089 <widget class="GtkLabel" id=" label-2147483647">1089 <widget class="GtkLabel" id="r_pace_unit"> 1090 1090 <property name="visible">True</property> 1091 1091 <property name="label" translatable="yes">min/km</property> … … 1143 1143 1144 1144 <child> 1145 <widget class="GtkLabel" id=" label11146">1145 <widget class="GtkLabel" id="r_ascent_unit"> 1146 1146 <property name="visible">True</property> 1147 1147 <property name="label" translatable="yes">m</property> … … 1209 1209 1210 1210 <child> 1211 <widget class="GtkLabel" id=" label11128">1211 <widget class="GtkLabel" id="r_distance_unit"> 1212 1212 <property name="visible">True</property> 1213 1213 <property name="label" translatable="yes">Km</property> … … 1262 1262 <property name="padding">0</property> 1263 1263 <property name="expand">True</property> 1264 <property name="fill"> False</property>1264 <property name="fill">True</property> 1265 1265 </packing> 1266 1266 </child> … … 1377 1377 1378 1378 <child> 1379 <widget class="GtkLabel" id=" label11130">1379 <widget class="GtkLabel" id="r_speed_unit"> 1380 1380 <property name="visible">True</property> 1381 1381 <property name="label" translatable="yes">km/h</property> … … 2908 2908 2909 2909 <child> 2910 <widget class="GtkLabel" id=" label73">2910 <widget class="GtkLabel" id="d_distance_unit"> 2911 2911 <property name="visible">True</property> 2912 2912 <property name="label" translatable="yes">Km</property> … … 3245 3245 3246 3246 <child> 3247 <widget class="GtkLabel" id=" label75">3247 <widget class="GtkLabel" id="d_speed_unit"> 3248 3248 <property name="visible">True</property> 3249 3249 <property name="label" translatable="yes">km/h</property> … … 3302 3302 3303 3303 <child> 3304 <widget class="GtkLabel" id=" label-2147483647">3304 <widget class="GtkLabel" id="d_maxspeed_unit"> 3305 3305 <property name="visible">True</property> 3306 3306 <property name="label" translatable="yes">km/h</property> … … 3526 3526 3527 3527 <child> 3528 <widget class="GtkLabel" id=" label-2147483645">3528 <widget class="GtkLabel" id="d_pace_unit"> 3529 3529 <property name="visible">True</property> 3530 3530 <property name="label" translatable="yes">min/km</property> … … 3582 3582 3583 3583 <child> 3584 <widget class="GtkLabel" id=" label-2147483643">3584 <widget class="GtkLabel" id="d_maxpace_unit"> 3585 3585 <property name="visible">True</property> 3586 3586 <property name="label" translatable="yes">min/km</property> … … 4036 4036 4037 4037 <child> 4038 <widget class="GtkLabel" id=" label104">4038 <widget class="GtkLabel" id="m_distance_unit"> 4039 4039 <property name="visible">True</property> 4040 4040 <property name="label" translatable="yes">Km</property> … … 4346 4346 4347 4347 <child> 4348 <widget class="GtkLabel" id=" label106">4348 <widget class="GtkLabel" id="m_speed_unit"> 4349 4349 <property name="visible">True</property> 4350 4350 <property name="label" translatable="yes">km/h</property> … … 4515 4515 4516 4516 <child> 4517 <widget class="GtkLabel" id=" label-2147483646">4517 <widget class="GtkLabel" id="m_maxspeed_unit"> 4518 4518 <property name="visible">True</property> 4519 4519 <property name="label" translatable="yes">km/h</property> … … 4710 4710 4711 4711 <child> 4712 <widget class="GtkLabel" id=" label-2147483643">4712 <widget class="GtkLabel" id="m_pace_unit"> 4713 4713 <property name="visible">True</property> 4714 4714 <property name="label" translatable="yes">min/km</property> … … 4738 4738 4739 4739 <child> 4740 <widget class="GtkLabel" id=" label-2147483642">4740 <widget class="GtkLabel" id="m_maxpace_unit"> 4741 4741 <property name="visible">True</property> 4742 4742 <property name="label" translatable="yes">min/km</property> … … 9158 9158 9159 9159 <child> 9160 <widget class="GtkRadioButton" id=" radiobutton1">9160 <widget class="GtkRadioButton" id="prf_metric_system"> 9161 9161 <property name="visible">True</property> 9162 9162 <property name="can_focus">True</property> … … 9180 9180 9181 9181 <child> 9182 <widget class="GtkRadioButton" id=" radiobutton2">9182 <widget class="GtkRadioButton" id="prf_us_system"> 9183 9183 <property name="visible">True</property> 9184 9184 <property name="can_focus">True</property> … … 9190 9190 <property name="inconsistent">False</property> 9191 9191 <property name="draw_indicator">True</property> 9192 <property name="group"> radiobutton1</property>9192 <property name="group">prf_metric_system</property> 9193 9193 </widget> 9194 9194 <packing> pytrainer/trunk/pytrainer/gui/windowmain.py
r187 r189 27 27 from pytrainer.lib.system import checkConf 28 28 from pytrainer.lib.xmlUtils import XMLParser 29 30 from pytrainer.lib.unitsconversor import * 29 31 30 32 class Main(SimpleGladeApp): … … 130 132 131 133 def actualize_recordview(self,record_list): 134 conf = checkConf() 135 filename = conf.getValue("conffile") 136 configuration = XMLParser(filename) 137 if configuration.getValue("pytraining","prf_us_system") == "True": 138 self.r_distance_unit.set_text(_("miles")) 139 self.r_speed_unit.set_text(_("miles/h")) 140 self.r_maxspeed_unit.set_text(_("miles/h")) 141 self.r_pace_unit.set_text(_("min/mile")) 142 self.r_maxpace_unit.set_text(_("min/mile")) 143 self.r_ascent_unit.set_text(_("feet")) 144 self.r_descent_unit.set_text(_("feet")) 145 else: 146 self.r_distance_unit.set_text(_("km")) 147 self.r_speed_unit.set_text(_("km/h")) 148 self.r_maxspeed_unit.set_text(_("km/h")) 149 self.r_pace_unit.set_text(_("min/km")) 150 self.r_maxpace_unit.set_text(_("min/km")) 151 self.r_ascent_unit.set_text(_("m")) 152 self.r_descent_unit.set_text(_("m")) 153 132 154 if len(record_list)>0: 133 155 record_list=record_list[0] … … 143 165 title = str(record_list[9]) 144 166 comments = str(record_list[5]) 145 pace = self.parseFloat(record_list[1 3])167 pace = self.parseFloat(record_list[14]) 146 168 maxspeed = self.parseFloat(record_list[12]) 147 maxpace = self.parseFloat(record_list[14]) 169 maxpace = self.parseFloat(record_list[13]) 170 171 if configuration.getValue("pytraining","prf_us_system") == "True": 172 self.record_distance.set_text("%0.2f" %km2miles(distance)) 173 self.record_upositive.set_text("%0.2f" %m2feet(upositive)) 174 self.record_unegative.set_text("%0.2f" %m2feet(unegative)) 175 self.record_average.set_text("%0.2f" %km2miles(average)) 176 self.record_maxspeed.set_text("%0.2f" %km2miles(maxspeed)) 177 self.record_pace.set_text("%0.2f" %pacekm2miles(pace)) 178 self.record_maxpace.set_text("%0.2f" %pacekm2miles(maxpace)) 179 180 else: 181 self.record_distance.set_text("%0.2f" %distance) 182 self.record_upositive.set_text("%0.2f" %upositive) 183 self.record_unegative.set_text("%0.2f" %unegative) 184 self.record_average.set_text("%0.2f" %average) 185 self.record_maxspeed.set_text("%0.2f" %maxspeed) 186 self.record_pace.set_text("%0.2f" %pace) 187 self.record_maxpace.set_text("%0.2f" %maxpace) 148 188 149 189 self.record_sport.set_text(sport) 150 190 self.record_date.set_text(date) 151 self.record_distance.set_text("%0.2f" %distance)152 191 hour,min,sec=self.parent.date.second2time(int(record_list[3])) 153 192 self.record_hour.set_text("%d" %hour) 154 193 self.record_minute.set_text("%d" %min) 155 194 self.record_second.set_text("%d" %sec) 156 self.record_average.set_text("%0.2f" %average)157 195 self.record_calories.set_text("%0.0f" %calories) 158 self.record_upositive.set_text("%0.2f" %upositive)159 self.record_unegative.set_text("%0.2f" %unegative)160 self.record_maxspeed.set_text("%0.2f" %maxspeed)161 self.record_pace.set_text("%0.2f" %pace)162 self.record_maxpace.set_text("%0.2f" %maxpace)163 196 self.record_title.set_text(title) 164 197 buffer = self.record_comments.get_buffer() … … 199 232 200 233 def actualize_dayview(self,record_list): 234 conf = checkConf() 235 filename = conf.getValue("conffile") 236 configuration = XMLParser(filename) 237 if configuration.getValue("pytraining","prf_us_system") == "True": 238 self.d_distance_unit.set_text(_("miles")) 239 self.d_speed_unit.set_text(_("miles/h")) 240 self.d_maxspeed_unit.set_text(_("miles/h")) 241 self.d_pace_unit.set_text(_("min/mile")) 242 self.d_maxpace_unit.set_text(_("min/mile")) 243 else: 244 self.d_distance_unit.set_text(_("km")) 245 self.d_speed_unit.set_text(_("km/h")) 246 self.d_maxspeed_unit.set_text(_("km/h")) 247 self.d_pace_unit.set_text(_("min/km")) 248 self.d_maxpace_unit.set_text(_("min/km")) 249 201 250 if len(record_list)>0: 202 251 tbeats = 0 … … 221 270 maxbeats = self.parseFloat(record[10]) 222 271 272 if configuration.getValue("pytraining","prf_us_system") == "True": 273 distance = km2miles(distance) 274 maxspeed = km2miles(maxspeed) 275 223 276 if tbeats > 0: 224 277 tbeats = tbeats/(timeinseconds/60/60) … … 268 321 maxpace = 0 269 322 maxbeats = 0 323 324 conf = checkConf() 325 filename = conf.getValue("conffile") 326 configuration = XMLParser(filename) 327 if configuration.getValue("pytraining","prf_us_system") == "True": 328 self.m_distance_unit.set_text(_("miles")) 329 self.m_speed_unit.set_text(_("miles/h")) 330 self.m_maxspeed_unit.set_text(_("miles/h")) 331 self.m_pace_unit.set_text(_("min/mile")) 332 self.m_maxpace_unit.set_text(_("min/mile")) 333 else: 334 self.m_distance_unit.set_text(_("km")) 335 self.m_speed_unit.set_text(_("km/h")) 336 self.m_maxspeed_unit.set_text(_("km/h")) 337 self.m_pace_unit.set_text(_("min/km")) 338 self.m_maxpace_unit.set_text(_("min/km")) 270 339 271 340 if num_records>0: … … 283 352 if record[8] > maxbeats: 284 353 maxbeats = self.parseFloat(record[8]) 354 355 if configuration.getValue("pytraining","prf_us_system") == "True": 356 km = km2miles(km) 357 maxspeed = km2miles(maxspeed) 358 285 359 if time_in_min > 0: 286 360 tbeats = tbeats/time_in_min pytrainer/trunk/pytrainer/gui/windowprofile.py
r168 r189 43 43 "prf_maxhr", 44 44 "prf_minhr", 45 "prf_hrzones_karvonen"] 45 "prf_hrzones_karvonen", 46 "prf_us_system" 47 ] 46 48 47 49 def new(self): … … 77 79 continue 78 80 var = getattr(self,i) 79 if i != "prf_gender" and i != "prf_ddbb" and i !="prf_hrzones_karvonen" :81 if i != "prf_gender" and i != "prf_ddbb" and i !="prf_hrzones_karvonen" and i!="prf_us_system": 80 82 var.set_text(list_options[i]) 81 elif i == "prf_hrzones_karvonen" :83 elif i == "prf_hrzones_karvonen" or i == "prf_us_system": 82 84 if list_options[i]=="True": 83 85 var.set_active(True) … … 99 101 for i in self.conf_options: 100 102 var = getattr(self,i) 101 if i != "prf_gender" and i != "prf_ddbb" and i != "prf_hrzones_karvonen" :103 if i != "prf_gender" and i != "prf_ddbb" and i != "prf_hrzones_karvonen" and i != "prf_us_system": 102 104 list_options.append((i,var.get_text())) 103 elif i == "prf_hrzones_karvonen" :105 elif i == "prf_hrzones_karvonen" or i == "prf_us_system": 104 106 if var.get_active(): 105 107 list_options.append((i,"True"))
