Changeset 1991

Timestamp:

Oct 7, 2015 1:26:11 PM (7 years ago)

Author:

vondreele

Message:

fix 3D plot zone p/n key problem

File:

• trunk/GSASIIplot.py (modified) (12 diffs)

trunk/GSASIIplot.py

@@ -575 +575 @@
         global ifBox
         Choice = {'F':'Fo','S':'Fosq','U':'Unit','D':'dFsq','W':'dFsq/sig'}
-        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]]}
+        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]])}
         try:
             keyCode = event.GetKeyCode()
@@ -588 +588 @@
                 key = 'L'
             Data['viewKey'] = key
-            drawingData['viewPoint'][0] = drawingData['default']
-            drawingData['viewDir'] = np.array(viewChoice[key][0])
-            drawingData['viewUp'] = np.array(viewChoice[key][1])
+            drawingData['viewPoint'][0] = np.array(drawingData['default'])
+            drawingData['viewDir'] = viewChoice[key][0]
+            drawingData['viewUp'] = viewChoice[key][1]
             drawingData['oldxy'] = []
             if Data['Zone']:
@@ -596 +596 @@
                     Q = [-1,0,0,0]
                 else:
-                    V0 = np.array(viewChoice[key][0])
-                    V1 = np.array(viewChoice[key][1])
+                    V0 = viewChoice[key][0]
+                    V1 = viewChoice[key][1]
                     V0 = np.inner(Amat,V0)
                     V1 = np.inner(Amat,V1)
@@ -604 +604 @@
                     A = np.arccos(np.sum(V1*V0))
                     Q = G2mth.AV2Q(-A,viewChoice[key][2])
-                G2frame.G2plotNB.status.SetStatusText('zone = %s'%(str(viewChoice[key][0])),1)
+                G2frame.G2plotNB.status.SetStatusText('zone = %s'%(str(list(viewChoice[key][0]))),1)
             else:
-                V0 = np.array(viewChoice[key][0])
+                V0 = viewChoice[key][0]
                 V = np.inner(Bmat,V0)
                 V /= np.sqrt(np.sum(V**2))
@@ -628 +628 @@
             drawingData['viewPoint'][0] += vec
         elif key == '0':
-            drawingData['viewPoint'][0] = [0,0,0]
+            drawingData['viewPoint'][0] = np.array([0,0,0])
             Data['Scale'] = 1.0
         elif key == 'I':
@@ -758 +758 @@
         Ty += V[1]*0.1
         Tz += V[2]*0.1
-        drawingData['viewPoint'][0] =  Tx,Ty,Tz
+        drawingData['viewPoint'][0] =  np.array([Tx,Ty,Tz])
         
     def SetRotation(newxy):
@@ -4394 +4394 @@
         cx,ct = drawingData['atomPtrs'][:2]
         if key in ['C']:
-            drawingData['viewPoint'] = [[.5,.5,.5],[0,0]]
+            drawingData['viewPoint'] = [np.array([.5,.5,.5]),[0,0]]
             drawingData['viewDir'] = [0,0,1]
             drawingData['oldxy'] = []
@@ -4425 +4425 @@
                 if pI[0] >= len(drawAtoms):
                     pI[0] = 0
-            drawingData['viewPoint'] = [[Tx,Ty,Tz],pI]
+            drawingData['viewPoint'] = [np.array([Tx,Ty,Tz]),pI]
             SetViewPointText(drawingData['viewPoint'][0])
             G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI),1)
@@ -4447 +4447 @@
                 if pI[0] < 0:
                     pI[0] = len(drawAtoms)-1
-            drawingData['viewPoint'] = [[Tx,Ty,Tz],pI]
+            drawingData['viewPoint'] = [np.array([Tx,Ty,Tz]),pI]
             SetViewPointText(drawingData['viewPoint'][0])            
             G2frame.G2plotNB.status.SetStatusText('View point at atom '+drawAtoms[pI[0]][ct-1]+str(pI),1)
@@ -4736 +4736 @@
         Ty += V[1]*0.01
         Tz += V[2]*0.01
-        drawingData['viewPoint'][0] =  Tx,Ty,Tz
+        drawingData['viewPoint'][0] =  np.array([Tx,Ty,Tz])
         SetViewPointText([Tx,Ty,Tz])
         
@@ -5062 +5062 @@
         rhoXYZ = []
         if len(mapData['rho']):
-            VP = np.array(drawingData['viewPoint'][0])-np.array([.5,.5,.5])
+            VP = drawingData['viewPoint'][0]-np.array([.5,.5,.5])
             contLevel = drawingData['contourLevel']*mapData['rhoMax']
             if 'delt-F' in mapData['MapType'] or 'N' in mapData.get('Type',''):
@@ -5078 +5078 @@
             rmax = math.exp(math.log(rcube)/3.)**2
             radius = min(drawingData['mapSize']**2,rmax)
-            view = np.array(drawingData['viewPoint'][0])
+            view = drawingData['viewPoint'][0]
             Rok = np.sum(np.inner(Amat,rhoXYZ-view).T**2,axis=1)>radius
         Ind = GetSelectedAtoms()