Changeset 116
- Timestamp:
- 10/18/07 21:01:05 (1 year ago)
- Files:
-
- pytrainer/trunk/pytrainer/yeargraph.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/pytrainer/yeargraph.py
r8 r116 55 55 } 56 56 list_values = {} 57 km_total = {} 58 tm_total = {} 57 59 list_average = {} 58 60 i = 1 … … 60 62 list_values[i] = 0 61 63 list_average[i] = 0 64 tm_total[i] = 0 62 65 i += 1 63 66 64 67 value_sel = conv[value_selected] 65 68 66 log = [] 69 log = [] 67 70 for value in values: 68 71 date = value[0] … … 72 75 if (value_sel == 2): 73 76 graph_value = self.getFloatValue(value[value_sel])/3600 77 #Si la opcion es la media tenemos que recalcular km y tiempo total 78 elif (value_sel == 5): 79 graph_value = self.getFloatValue(value[1]) 74 80 else: 75 81 graph_value = self.getFloatValue(value[value_sel]) 82 76 83 #si es una opcion de suma de absolutos: 77 84 if ((value_selected == 0) or (value_selected==1)): 78 85 list_values[int(month)] += graph_value 86 87 #Si es pa la media de velocidad 88 elif (value_selected == 3): 89 list_values[int(month)] += graph_value 90 tm_total[int(month)] += self.getFloatValue(value[2]) 91 79 92 #si se trata de calcular medias: 80 93 else: 81 94 list_values[int(month)] += graph_value 82 95 list_average[int(month)] += 1 83 96 84 97 xunits = [] 85 98 yunits = [] … … 90 103 if list_average[i] > 0: 91 104 val = list_values[i]/list_average[i] 105 if tm_total[i] > 0: 106 val = list_values[i]/(tm_total[i]/3600) 92 107 else: 93 108 val = list_values[i]
