Changeset 1991
- Timestamp:
- Oct 7, 2015 1:26:11 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIplot.py
r1986 r1991 575 575 global ifBox 576 576 Choice = {'F':'Fo','S':'Fosq','U':'Unit','D':'dFsq','W':'dFsq/sig'} 577 viewChoice = {'L': [[0,0,1],[1,0,0],[0,1,0]],'K':[[0,1,0],[0,0,1],[1,0,0]],'H':[[1,0,0],[0,0,1],[0,1,0]]}577 viewChoice = {'L':np.array([[0,0,1],[1,0,0],[0,1,0]]),'K':np.array([[0,1,0],[0,0,1],[1,0,0]]),'H':np.array([[1,0,0],[0,0,1],[0,1,0]])} 578 578 try: 579 579 keyCode = event.GetKeyCode() … … 588 588 key = 'L' 589 589 Data['viewKey'] = key 590 drawingData['viewPoint'][0] = drawingData['default']591 drawingData['viewDir'] = np.array(viewChoice[key][0])592 drawingData['viewUp'] = np.array(viewChoice[key][1])590 drawingData['viewPoint'][0] = np.array(drawingData['default']) 591 drawingData['viewDir'] = viewChoice[key][0] 592 drawingData['viewUp'] = viewChoice[key][1] 593 593 drawingData['oldxy'] = [] 594 594 if Data['Zone']: … … 596 596 Q = [-1,0,0,0] 597 597 else: 598 V0 = np.array(viewChoice[key][0])599 V1 = np.array(viewChoice[key][1])598 V0 = viewChoice[key][0] 599 V1 = viewChoice[key][1] 600 600 V0 = np.inner(Amat,V0) 601 601 V1 = np.inner(Amat,V1) … … 604 604 A = np.arccos(np.sum(V1*V0)) 605 605 Q = G2mth.AV2Q(-A,viewChoice[key][2]) 606 G2frame.G2plotNB.status.SetStatusText('zone = %s'%(str( viewChoice[key][0])),1)606 G2frame.G2plotNB.status.SetStatusText('zone = %s'%(str(list(viewChoice[key][0]))),1) 607 607 else: 608 V0 = np.array(viewChoice[key][0])608 V0 = viewChoice[key][0] 609 609 V = np.inner(Bmat,V0) 610 610 V /= np.sqrt(np.sum(V**2)) … … 628 628 drawingData['viewPoint'][0] += vec 629 629 elif key == '0': 630 drawingData['viewPoint'][0] = [0,0,0]630 drawingData['viewPoint'][0] = np.array([0,0,0]) 631 631 Data['Scale'] = 1.0 632 632 elif key == 'I': … … 758 758 Ty += V[1]*0.1 759 759 Tz += V[2]*0.1 760 drawingData['viewPoint'][0] = Tx,Ty,Tz760 drawingData['viewPoint'][0] = np.array([Tx,Ty,Tz]) 761 761 762 762 def SetRotation(newxy): … … 4394 4394 cx,ct = drawingData['atomPtrs'][:2] 4395 4395 if key in ['C']: 4396 drawingData['viewPoint'] = [ [.5,.5,.5],[0,0]]4396 drawingData['viewPoint'] = [np.array([.5,.5,.5]),[0,0]] 4397 4397 drawingData['viewDir'] = [0,0,1] 4398 4398 drawingData['oldxy'] = [] … … 4425 4425 if pI[0] >= len(drawAtoms): 4426 4426 pI[0] = 0 4427 drawingData['viewPoint'] = [ [Tx,Ty,Tz],pI]4427 drawingData['viewPoint'] = [np.array([Tx,Ty,Tz]),pI] 4428 4428 SetViewPointText(drawingData['viewPoint'][0]) 4429 4429 G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI),1) … … 4447 4447 if pI[0] < 0: 4448 4448 pI[0] = len(drawAtoms)-1 4449 drawingData['viewPoint'] = [ [Tx,Ty,Tz],pI]4449 drawingData['viewPoint'] = [np.array([Tx,Ty,Tz]),pI] 4450 4450 SetViewPointText(drawingData['viewPoint'][0]) 4451 4451 G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI),1) … … 4736 4736 Ty += V[1]*0.01 4737 4737 Tz += V[2]*0.01 4738 drawingData['viewPoint'][0] = Tx,Ty,Tz4738 drawingData['viewPoint'][0] = np.array([Tx,Ty,Tz]) 4739 4739 SetViewPointText([Tx,Ty,Tz]) 4740 4740 … … 5062 5062 rhoXYZ = [] 5063 5063 if len(mapData['rho']): 5064 VP = np.array(drawingData['viewPoint'][0])-np.array([.5,.5,.5])5064 VP = drawingData['viewPoint'][0]-np.array([.5,.5,.5]) 5065 5065 contLevel = drawingData['contourLevel']*mapData['rhoMax'] 5066 5066 if 'delt-F' in mapData['MapType'] or 'N' in mapData.get('Type',''): … … 5078 5078 rmax = math.exp(math.log(rcube)/3.)**2 5079 5079 radius = min(drawingData['mapSize']**2,rmax) 5080 view = np.array(drawingData['viewPoint'][0])5080 view = drawingData['viewPoint'][0] 5081 5081 Rok = np.sum(np.inner(Amat,rhoXYZ-view).T**2,axis=1)>radius 5082 5082 Ind = GetSelectedAtoms()
Note: See TracChangeset
for help on using the changeset viewer.