Changeset 149
- Timestamp:
- 01/13/08 01:37:59 (1 year ago)
- Files:
-
- pytrainer/trunk/glade/pytrainer.glade (modified) (1 diff)
- pytrainer/trunk/pytrainer/gui/windowmain.py (modified) (1 diff)
- pytrainer/trunk/pytrainer/yeargraph.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
pytrainer/trunk/glade/pytrainer.glade
r148 r149 4418 4418 <property name="visible">True</property> 4419 4419 <property name="items" translatable="yes">Kilometers 4420 Time 4421 Beats 4422 Average 4423 Calories</property> 4424 <property name="add_tearoffs">False</property> 4425 <property name="has_frame">True</property> 4426 <property name="focus_on_click">True</property> 4427 <signal name="changed" handler="on_year_combovalue_changed" last_modification_time="Fri, 14 Apr 2006 09:14:56 GMT"/> 4428 </widget> 4429 <packing> 4430 <property name="padding">0</property> 4431 <property name="expand">False</property> 4432 <property name="fill">True</property> 4433 </packing> 4434 </child> 4435 4436 <child> 4437 <widget class="GtkLabel" id="label-2147483648"> 4438 <property name="visible">True</property> 4439 <property name="label" translatable="yes">Value</property> 4440 <property name="use_underline">False</property> 4441 <property name="use_markup">False</property> 4442 <property name="justify">GTK_JUSTIFY_LEFT</property> 4443 <property name="wrap">False</property> 4444 <property name="selectable">False</property> 4445 <property name="xalign">0.5</property> 4446 <property name="yalign">0.5</property> 4447 <property name="xpad">0</property> 4448 <property name="ypad">0</property> 4449 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property> 4450 <property name="width_chars">-1</property> 4451 <property name="single_line_mode">False</property> 4452 <property name="angle">0</property> 4453 </widget> 4454 <packing> 4455 <property name="padding">0</property> 4456 <property name="expand">False</property> 4457 <property name="fill">False</property> 4458 </packing> 4459 </child> 4460 4461 <child> 4462 <widget class="GtkComboBoxEntry" id="year_combovalue2"> 4463 <property name="visible">True</property> 4464 <property name="items" translatable="yes">None 4465 Kilometers 4420 4466 Time 4421 4467 Beats pytrainer/trunk/pytrainer/gui/windowmain.py
r148 r149 103 103 self.day_vbox.hide() 104 104 self.drawareamonth = MonthGraph(self.month_vbox, self.month_combovalue,self.month_combovalue2) 105 self.drawareayear = YearGraph(self.year_vbox, self.year_combovalue )105 self.drawareayear = YearGraph(self.year_vbox, self.year_combovalue,self.year_combovalue2) 106 106 107 107 def createMap(self,Googlemaps,waypoint): pytrainer/trunk/pytrainer/yeargraph.py
r116 r149 20 20 21 21 class YearGraph: 22 def __init__(self, vbox = None, combovalue = None ):22 def __init__(self, vbox = None, combovalue = None, combovalue2 = None): 23 23 self.drawarea = DrawArea(vbox) 24 24 self.combovalue = combovalue 25 self.combovalue2 = combovalue2 25 26 26 27 def drawgraph(self,values): 28 xval = [] 29 yval = [] 30 xlab = [] 31 ylab = [] 32 tit = [] 33 col = [] 27 34 value_selected = self.combovalue.get_active() 35 value_selected2 = self.combovalue2.get_active() 28 36 if value_selected < 0: 29 37 self.combovalue.set_active(0) … … 31 39 monthsnumber,xlabel,ylabel,title,color = self.get_value_params(value_selected) 32 40 xvalues,yvalues = self.get_values(values,value_selected,monthsnumber) 33 self.drawarea.stadistics("bars",[xvalues],[yvalues],[xlabel],[ylabel],[title],[color]) 41 42 xval.append(xvalues) 43 yval.append(yvalues) 44 if value_selected2 < 0: 45 xlab.append("") 46 else: 47 xlab.append(xlabel) 48 ylab.append(ylabel) 49 tit.append(title) 50 col.append(color) 51 52 print value_selected2 53 if value_selected2 < 0: 54 self.combovalue2.set_active(0) 55 value_selected2 = 0 56 if value_selected2 > 0: 57 value_selected2 = value_selected2-1 58 daysmonth,xlabel,ylabel,title,color = self.get_value_params(value_selected2) 59 xvalues,yvalues = self.get_values(values,value_selected2,daysmonth) 60 xval.append(xvalues) 61 yval.append(yvalues) 62 xlab.append(xlabel) 63 ylab.append(ylabel) 64 tit.append("") 65 col.append(color) 66 self.drawarea.stadistics("bars",xval,yval,xlab,ylab,tit,col) 34 67 35 68 def get_value_params(self,value):
