diff --git a/web/run.py b/web/run.py index 49e07a0..ab2fbd2 100755 --- a/web/run.py +++ b/web/run.py @@ -1,6 +1,7 @@ import random import datetime import StringIO +from math import sqrt from os import listdir, environ from os.path import isfile, join, abspath, dirname @@ -185,11 +186,17 @@ def get_csv(): data_v = cdf_handle.variables['V'] data_b = cdf_handle.variables['B'] data_p = cdf_handle.variables['P_dyn'] - cw.writerow(('time', 'vrad', 'vtan', 'magn', 'pdyn')) + cw.writerow(( + 'time', + 'vrad', 'vtan', 'vlen', + 'magn', 'pdyn' + )) for time, datum_v, datum_b, datum_p in zip(times, data_v, data_b, data_p): + vrad = datum_v[0] + vtan = datum_v[1] cw.writerow(( datetime_from_list(time).strftime("%Y-%m-%dT%H:%M:%S+00:00"), - datum_v[0], datum_v[1], + vrad, vtan, sqrt(vrad * vrad + vtan * vtan), datum_b, datum_p )) cdf_handle.close() diff --git a/web/view/home.html.jinja2 b/web/view/home.html.jinja2 index 50355f3..522f0d6 100755 --- a/web/view/home.html.jinja2 +++ b/web/view/home.html.jinja2 @@ -4,37 +4,72 @@ {% block content %} -

Overview

- - - -

-TODO -

- -
-
+
+
+
+
+ Jupiter + Earth (locked) + Mars (locked) +
+
+

Measures

+

Options

+
+
+
+
+
{% endblock %} {% block styles %} {% endblock %} @@ -44,15 +79,25 @@ TODO