enhance triggering

This commit is contained in:
2019-03-20 14:34:12 +01:00
parent eda8caf985
commit 399282cba9
9 changed files with 36 additions and 23 deletions

View File

@@ -56,7 +56,8 @@ class MPLCanvasErr(FigureCanvas):
hl += ax.plot(erry, 'g-',label='y-error')
hl += ax.plot(err, 'r-',label='error')
ax.xaxis.set_label_text('datapoint (timebase: %g ms per data point)'%meta['timebase'])
tb=meta['srv_per']*meta['acq_per']
ax.xaxis.set_label_text('datapoint (timebase: %g ms per data point)'%tb)
ax.yaxis.set_label_text('pos-error um')
legend = ax.legend(loc='upper right', shadow=True)
ax.plot([.5,.5],[0.01, 0.99],'k',transform=ax.transAxes)

View File

@@ -59,7 +59,8 @@ class MPLCanvasVelo(FigureCanvas):
hl += ax.plot(velAct, 'r-',label='vel act')
hl += ax.plot(velDes, 'r--',label='vel des')
ax.xaxis.set_label_text('datapoint (timebase: %g ms per data point)'%meta['timebase'])
tb=meta['srv_per']*meta['acq_per']
ax.xaxis.set_label_text('datapoint (timebase: %g ms per data point)'%tb)
ax.yaxis.set_label_text('um/ms')
legend = ax.legend(loc='upper right', shadow=True)
#axvline(linewidth=4, color='r')
@@ -143,9 +144,9 @@ class MAVelocityFrame(wx.Frame):
try:
vel=doc.vel
except AttributeError:
tb=meta['timebase']
tb=meta['srv_per']*meta['acq_per']
#data points are um
#datapoint timebase: 2 ms () per data point
#datapoint tb= timebase of datapoint sampling
#velocity: um/ms (deltatau desVel= motor units per serco cycle)
rec=doc.fh['rec']
velyAct = np.diff(rec[:, 0])/tb