homing plc and fixes

This commit is contained in:
2017-06-12 09:51:02 +02:00
parent 0bf383e155
commit 3b886088d9
15 changed files with 1133 additions and 87 deletions

View File

@@ -59,8 +59,8 @@ class MPLCanvasImg(FigureCanvas):
ax.add_collection(ec)
hl+=ax.plot(rec[:, 5], rec[:, 4], 'b-',label='recDesPos')
hl+=ax.plot(rec[:,2],rec[:,1],'g-',label='recActPos')
hl+=ax.plot(rec[:, 4], rec[:, 5], 'b-',label='recDesPos')
hl+=ax.plot(rec[:,1],rec[:,2],'g-',label='recActPos')
ax.xaxis.set_label_text('x-pos um')
ax.yaxis.set_label_text('y-pos um')
@@ -267,13 +267,13 @@ class MAxyPlotFrame(wx.Frame):
idx=usrData
rec=self.doc.fh['rec']
hl=canvas.hl
hl[2].set_data(rec[:idx+1, 5], rec[:idx+1, 4])
hl[3].set_data(rec[:idx+1, 2], rec[:idx+1, 1])
hl[2].set_data(rec[:idx+1, 4], rec[:idx+1, 5])
hl[3].set_data(rec[:idx+1, 1], rec[:idx+1, 2])
#ax.draw_artist(hl[2])
x=ax.get_xlim();x=(x[1]-x[0])/2;
y=ax.get_ylim();y=(y[1]-y[0])/2;
ax.set_xlim(rec[idx, 2]-x,rec[idx, 2]+x)
ax.set_ylim(rec[idx, 1]-y,rec[idx, 1]+y)
ax.set_xlim(rec[idx, 1]-x,rec[idx, 1]+x)
ax.set_ylim(rec[idx, 2]-y,rec[idx, 2]+y)
canvas.draw()
@staticmethod