sf-mx/PBSwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

restructure shapepath data format

Browse Source
This commit is contained in:
zamofing_t
2018-11-20 08:29:00 +01:00
parent 0a5ec9b004
commit 882ac3a66e
5 changed files with 124 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
python/PBMotionAnalyzer/MAxyPlot.py
View File

@@ -55,13 +55,13 @@ class MPLCanvasImg(FigureCanvas):
#idx 0 1 2 3 4 5
#idx=np.ndarray(shape=len(pts),dtype=np.int32)
#for i in range(len(pts)):
# l=rec[:,4:6]-pts[i,:]
# l=rec[:,(3,2)]-pts[i,:]
# l2=l[:,0]**2+l[:,1]**2
# idx[i]=np.argmin(l2)
idx=[]
for i in range(len(pts)):
l=rec[:,4:6]-pts[i,:]
l=rec[:,(3,2)]-pts[i,:]
l2=l[:,0]**2+l[:,1]**2
idx.extend(np.where(l2<1)[0].tolist())
#print idx
@@ -69,9 +69,9 @@ class MPLCanvasImg(FigureCanvas):
#f2 = plt.figure()
#a2 = f2.add_axes([0.075,0.075,0.85,0.85])
#a2.plot(rec[:,1],'r-',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,2],'g-',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,4],'r--',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,5],'g--',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,0],'g-',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,3],'r--',label='ptsDot') #,picker=5 default value
#a2.plot(rec[:,2],'g--',label='ptsDot') #,picker=5 default value
#plt.show()
@@ -84,12 +84,12 @@ class MPLCanvasImg(FigureCanvas):
ax.add_collection(ec)
hl+=ax.plot(rec[:, 4], rec[:, 5], 'b-',label='recDesPos')
hl+=ax.plot(rec[:,1],rec[:,2],'g-',label='recActPos')
hl+=ax.plot(recPts[:,1],recPts[:,2],'g.',label='recDot')
hl+=ax.plot(rec[:, 3], rec[:, 2], 'b-',label='recDesPos')
hl+=ax.plot(rec[:,1],rec[:,0],'g-',label='recActPos')
hl+=ax.plot(recPts[:,1],recPts[:,0],'g.',label='recDot')
ax.xaxis.set_label_text('x-pos um')
ax.yaxis.set_label_text('y-pos um')
ax.axis('equal')
fig.obj=self
self.ax=ax
self.hl=hl
@@ -293,13 +293,13 @@ class MAxyPlotFrame(wx.Frame):
idx=usrData
rec=self.doc.fh['rec']
hl=canvas.hl
hl[2].set_data(rec[:idx+1, 4], rec[:idx+1, 5])
hl[3].set_data(rec[:idx+1, 1], rec[:idx+1, 2])
hl[2].set_data(rec[:idx+1, 3], rec[:idx+1, 2])
hl[3].set_data(rec[:idx+1, 1], rec[:idx+1, 0])
#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, 1]-x,rec[idx, 1]+x)
ax.set_ylim(rec[idx, 2]-y,rec[idx, 2]+y)
ax.set_ylim(rec[idx, 0]-y,rec[idx, 0]+y)
canvas.draw()
@staticmethod