quiske v2 improvements

rowers/interactiveplots.py

@@ -4081,6 +4081,7 @@ def interactive_streamchart(id=0, promember=0):
 def instroke_multi_interactive_chart(selected):
     df_plot = pd.DataFrame()
     ids = [analysis.id for analysis in selected]
+    metrics = list(set([analysis.metric for analysis in selected]))
     for analysis in selected:
         #start_second, end_second, spm_min, spm_max, name
         activeminutesmin = int(analysis.start_second/60.)
@@ -4094,6 +4095,8 @@ def instroke_multi_interactive_chart(selected):
             activeminutesmax=activeminutesmax,
         )
         mean_vals = data.mean()
+        if len(metrics)>1:
+            mean_vals = mean_vals/mean_vals.max()
         xvals = np.arange(len(mean_vals))
         xname = 'x_'+str(analysis.id)
         yname = 'y_'+str(analysis.id)
@@ -4124,6 +4127,11 @@ def instroke_multi_interactive_chart(selected):
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
 
+    if len(metrics)>1:
+        plot.yaxis.axis_label = 'Scaled'
+    else:
+        plot.yaxis.axis_label = metrics[0]
+
     plot.image_url([watermarkurl], watermarkx, watermarky,
                    watermarkw, watermarkh,
                    global_alpha=watermarkalpha,
@@ -4146,7 +4154,13 @@ def instroke_multi_interactive_chart(selected):
         xname = 'x_'+str(id)
         yname = 'y_'+str(id)
         analysis = InStrokeAnalysis.objects.get(id=id)
-        plot.line(xname,yname,source=source,legend_label=analysis.name,
+        legendlabel = '{name} - {metric} - {workout}'.format(
+            name = analysis.name,
+            metric = analysis.metric,
+            date = analysis.date,
+            workout = str(analysis.workout)
+        )
+        plot.line(xname,yname,source=source,legend_label=legendlabel,
               line_width=2, color=color)
 
     script, div = components(plot)