Merge branch 'release/v12.33'

rowers/interactiveplots.py

@@ -184,72 +184,58 @@ def interactive_hr_piechart(df,rower,title):
     sumtimehr = df['deltat'].sum()
 
     qry = 'hr < {ut2}'.format(ut2=rower.ut2)
-    frac_lut2 = df.query(qry)['deltat'].sum()/sumtimehr
+    frac_lut2 = df.query(qry)['deltat'].sum()
 
-    qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
-    frac_ut2 = df.query(qry)['deltat'].sum()/sumtimehr
+    qry = '{ut2} <= hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
+    frac_ut2 = df.query(qry)['deltat'].sum()
 
-    qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at)
-    frac_ut1 = df.query(qry)['deltat'].sum()/sumtimehr
+    qry = '{ut2} <= hr < {at}'.format(ut2=rower.ut2,at=rower.at)
+    frac_ut1 = df.query(qry)['deltat'].sum()
 
-    qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr)
-    frac_at = df.query(qry)['deltat'].sum()/sumtimehr
+    qry = '{at} <= hr < {tr}'.format(at=rower.at,tr=rower.tr)
+    frac_at = df.query(qry)['deltat'].sum()
 
-    qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an)
-    frac_tr = df.query(qry)['deltat'].sum()/sumtimehr
+    qry = '{tr} <= hr < {an}'.format(tr=rower.tr,an=rower.an)
+    frac_tr = df.query(qry)['deltat'].sum()
 
-    frac_an = 1.
+    qry = 'hr >= {an}'.format(an=rower.an)
+    frac_an = df.query(qry)['deltat'].sum()
 
-    source_starts = 2*pi*pd.Series([
-        0,
-        frac_lut2,
-        frac_ut2,
-        frac_ut1,
-        frac_at,
-        frac_tr,
-        ])
-
-    source_ends = 2*pi*pd.Series([
-        frac_lut2,
-        frac_ut2,
-        frac_ut1,
-        frac_at,
-        frac_tr,
-        frac_an,
-        ])
-
-    source_legends = [
-        '<ut2',
-        'ut2',
-        'ut1',
-        'at',
-        'tr',
-        'an',
-    ]
+    datadict = {
+        '<ut2':frac_lut2,
+        'ut2': frac_ut2,
+        'ut1': frac_ut1,
+        'at': frac_at,
+        'tr': frac_tr,
+        'an': frac_an,
+    }
 
     colors = ['gray','yellow','lime','blue','purple','red']
 
+    data = pd.Series(datadict).reset_index(name='value').rename(columns={'index':'zone'})
+    data['angle'] = data['value']/data['value'].sum() * 2*pi
+    data['color'] = colors
+    data['totaltime'] = pd.Series([pretty_timedelta(v/1000.) for v in data['value']])
 
     size=350
-    TOOLS = 'save'
+    TOOLS = 'save,hover'
 
-    z = figure(title="HR "+title, x_range=(-1,1), y_range=(-1,1), width=size, height=size,
-               tools=TOOLS,
+
+    z = figure(title="HR "+title, x_range=(-0.5,1), plot_height=350,
+               tools=TOOLS,toolbar_location=None,tooltips="@zone: @totaltime",
           )
 
-    for start, end , legend, color in zip(source_starts, source_ends, source_legends,
-                                          colors[0:len(source_starts)]):
-        z.wedge(x=0, y=0, radius=1, start_angle=start, end_angle=end, color=color, legend=legend)
+    z.wedge(x=0,y=1, radius=0.4,
+            start_angle=cumsum('angle',include_zero=True), end_angle=cumsum('angle'),
+            line_color='white',fill_color='color',source=data,legend='zone')
 
 
 
-    z.toolbar_location = 'right'
-    z.legend.location = 'top_right'
-    #z.legend.visible = False
+    z.axis.axis_label = None
     z.axis.visible = False
-    z.xgrid.grid_line_color = None
-    z.ygrid.grid_line_color = None
+    z.grid.grid_line_color = None
     z.outline_line_color = None
+    z.toolbar_location = 'right'
 
     return components(z)
 

rowers/views/analysisviews.py

@@ -4700,7 +4700,7 @@ def history_view(request,userid=0):
     tscript,tdiv = interactive_workouttype_piechart(g_workouts)
 
     totalmeters,totalhours, totalminutes, totalseconds = get_totals(g_workouts)
-    totalminutes = "{totalminutes:02d}".format(totalminutes=totalminutes)
+    
 
     # meters, duration per workout type
     wtypes = list(set([w.workouttype for w in g_workouts]))
@@ -4738,10 +4738,10 @@ def history_view(request,userid=0):
     totaldiv = get_call()
 
     totalsdict = {}
-    totalsdict['duration'] = "{totalhours}:{totalminutes}:{totalseconds}".format(
+    totalsdict['duration'] = "{totalhours:02d}:{totalminutes:02d}:{totalseconds:02d}".format(
         totalhours=totalhours,
         totalminutes=totalminutes,
-        totalseconds=totalseconds
+        totalseconds=totalseconds,
     )
 
     totalsdict['distance'] = totalmeters