all forces now in newton
This commit is contained in:
@@ -52,6 +52,8 @@ import rowers.dataprep as dataprep
|
||||
|
||||
from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima
|
||||
|
||||
from utils import lbstoN
|
||||
|
||||
def tailwind(bearing,vwind,winddir):
|
||||
""" Calculates head-on head/tailwind in direction of rowing
|
||||
|
||||
@@ -140,7 +142,7 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
|
||||
finishav]
|
||||
|
||||
thresholdforce = 100 if 'x' in boattype else 200
|
||||
thresholdforce /= 4.45 # N to lbs
|
||||
#thresholdforce /= 4.45 # N to lbs
|
||||
y = [0,thresholdforce,
|
||||
peakforceav,
|
||||
thresholdforce,0]
|
||||
@@ -217,11 +219,11 @@ def interactive_forcecurve(theworkouts,workstrokesonly=False):
|
||||
plot.add_layout(finishlabel)
|
||||
|
||||
plot.xaxis.axis_label = "Angle"
|
||||
plot.yaxis.axis_label = "Force (lbs)"
|
||||
plot.yaxis.axis_label = "Force (N)"
|
||||
plot.title.text = theworkouts[0].name
|
||||
plot.title.text_font_size=value("1.0em")
|
||||
|
||||
yrange1 = Range1d(start=0,end=200)
|
||||
yrange1 = Range1d(start=0,end=900)
|
||||
plot.y_range = yrange1
|
||||
|
||||
xrange1 = Range1d(start=yaxmaxima['catch'],end=yaxmaxima['finish'])
|
||||
|
||||
Reference in New Issue
Block a user