From 404995561934c68c504f2ff4985f925f929db4f2 Mon Sep 17 00:00:00 2001 From: Thierry Zamofing Date: Wed, 20 Dec 2017 12:01:55 +0100 Subject: [PATCH] minor changes --- python/helicalscan.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/helicalscan.py b/python/helicalscan.py index 4eae577..219f79d 100755 --- a/python/helicalscan.py +++ b/python/helicalscan.py @@ -339,7 +339,7 @@ class HelicalScan: (cx, cz, w, fy)=self.rec[int(frm),:] #data/=. #scale from um to mm w*=d2r/1000 # scale from deg to rad - print (cx,cz,w,fy) + #print (cx,cz,w,fy) self.hCrist,pt=self.pltCrist(-cx,-cz,w,-fy,self.hCrist) self.fig.canvas.draw_idle() @@ -458,7 +458,7 @@ class HelicalScan: if h is None: lseg = tuple(lines) col=('r','g','b') - hlc = plt3d.art3d.Line3DCollection(lseg, colors=col) # , *args[argi:], **kwargs) + hlc = plt3d.art3d.Line3DCollection(lseg, colors=col, linewidths=2) # , *args[argi:], **kwargs) ax.add_collection(hlc) return hlc else: @@ -478,7 +478,7 @@ class HelicalScan: x+=cx;y+=fy;z+=cz;phi+=w pt[i] = (z, x, y) pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y) - obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('r', alpha=0.3)) + obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('y', alpha=0.2)) h1=ax.add_patch(obj) h2=plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z") #print h1._segment3d @@ -504,7 +504,7 @@ class HelicalScan: pt[i] = (z, x, y) pt[i + 2] = (z + r * np.cos(phi), x + r * np.sin(phi), y) h[i].remove() - obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('r', alpha=0.3)) + obj = mpl.patches.Circle((z, x), r, facecolor=mpl.colors.colorConverter.to_rgba('y', alpha=0.2)) ax.add_patch(obj) plt3d.art3d.pathpatch_2d_to_3d(obj, z=y, zdir="z") h[i]=obj @@ -947,8 +947,8 @@ Examples:'''+''.join(map(lambda s:cmd+s, exampleCmd))+'\n ' #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0) #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=0,cntHor=1) #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1) - hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1, - pt2pt_time=100,cnt=1,cntVert=35,cntHor=7,hRng=(-.3,.3),wRng=(0,360000*3),yRng=(6.2,2.3)) + #hs.gen_prog(fnPrg='/tmp/prg.cfg',host='MOTTEST-CPPM-CRM0485',mode=1, + # pt2pt_time=100,cnt=1,cntVert=35,cntHor=7,hRng=(-.3,.3),wRng=(0,360000*3),yRng=(6.2,2.3)) hs.load_rec() hs.interactive_anim() hs.show_vel(); plt.show()