diff --git a/rowers/dataprep.py b/rowers/dataprep.py index d7c6e6a1..e64c25e5 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -650,11 +650,11 @@ def create_row_df(r,distance,duration,startdatetime, step = totalseconds/float(nr_strokes) - elapsed = np.arange(0,totalseconds+step,step) + elapsed = np.arange(nr_strokes)*totalseconds/(float(nr_strokes-1)) dstep = distance/float(nr_strokes) - d = np.arange(0,distance+dstep,dstep) + d = np.arange(nr_strokes)*distance/(float(nr_strokes-1)) unixtime = unixstarttime + elapsed @@ -666,6 +666,7 @@ def create_row_df(r,distance,duration,startdatetime, else: power = 0 + df = pd.DataFrame({ 'TimeStamp (sec)': unixtime, ' Horizontal (meters)': d, diff --git a/rowers/views.py b/rowers/views.py index 8903a9d6..4c212de6 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -3156,7 +3156,6 @@ def addmanual_view(request): ) - print name id,message = dataprep.create_row_df(r, distance, duration,startdatetime,