Changeset 4650

Timestamp:

Nov 5, 2020 1:59:07 PM (15 months ago)

Author:

vondreele

Message:

fix the 'N' & 'P' key operation in structure drawings. They now properly increment & decrement Atom, Draw Atom & Map Peak tables while centering the item in the drawing.

File:

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

trunk/GSASIIplot.py

@@ -348 +348 @@
             self.canvas = wx.glcanvas.GLCanvas(self,-1,attribList=attribs,**kwargs)
             GL.glEnable(GL.GL_NORMALIZE)
-        #GSASIIpath.IPyBreak()
         # create GL context
         i,j= wx.__version__.split('.')[0:2]
@@ -8111 +8110 @@
     def OnKey(event):           #on key UP!!
         keyBox = False
+        NPkey = False
         try:
             keyCode = event.GetKeyCode()
@@ -8119 +8119 @@
             keyBox = True
             key = str(event.key).upper()
-        indx = drawingData['selectedAtoms']
-        cx,ct = drawingData['atomPtrs'][:2]
+#        indx = drawingData['selectedAtoms']
         if key in ['C']:
             drawingData['viewPoint'] = [np.array([.5,.5,.5]),[0,0]]
@@ -8134 +8133 @@
             SetViewDirText(drawingData['viewDir'])
             G2frame.G2plotNB.status.SetStatusText('New quaternion: %.2f+, %.2fi+ ,%.2fj+, %.2fk'%(Q[0],Q[1],Q[2],Q[3]),1)
-        elif key in ['N']:
-            drawAtoms = drawingData['Atoms']
-            if not len(drawAtoms):      #no atoms
+        elif key in ['N','P',]:
+            if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
+                cx = 1
+                ct = 0
+                atoms = data.get('Map Peaks',[])
+            elif G2frame.phaseDisplay.GetPageText(getSelection()) == 'Draw Atoms':
+                cx,ct = drawingData['atomPtrs'][:2]
+                atoms = drawingData['Atoms']
+            elif G2frame.phaseDisplay.GetPageText(getSelection()) == 'Atoms':
+                cx,ct = data['General']['AtomPtrs'][:2]
+                atoms = data['Atoms'] 
+            else:
+                return
+            if not len(atoms):      #no atoms
                 return
             pI = drawingData['viewPoint'][1]
             if not len(pI):
                 pI = [0,0]
-            if indx:
-                try:
-                    pI[0] = indx[pI[1]]
-                    Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
-                except IndexError:
-                    pI = [0,0]
-                    Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
+            if key in ['N',]:
                 pI[1] += 1
-                pI[1] %= len(indx)
-                txt = ' in selection'
             else:
-                pI[0] += 1
-                pI[0] %= len(drawAtoms)
-                Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
-                txt = ''
+                pI[1] -= 1                    
+            pI[1] %= len(atoms)
+            Tx,Ty,Tz = atoms[pI[1]][cx:cx+3]
+            txt = ''
+            SetSelectedAtoms(pI[1])
             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]+txt,1)
+            if ct: G2frame.G2plotNB.status.SetStatusText('View point at atom '+atoms[pI[0]][ct-1]+txt,1)
+            NPkey = True
             
         elif key in ['K'] and generalData['Map']['MapType']:
@@ -8173 +8177 @@
             dlg.Destroy()
                 
-        elif key in ['P']:
-            drawAtoms = drawingData['Atoms']
-            if not len(drawAtoms):      #no atoms
-                return
-            pI = drawingData['viewPoint'][1]
-            if not len(pI):
-                pI = [0,0]
-            if indx:
-                try:
-                    pI[0] = indx[pI[1]]
-                    Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
-                except IndexError:
-                    pI = [0,0]
-                    Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
-                pI[1] -= 1
-                pI[1] %= len(indx)
-                txt = ' in selection'
-            else:
-                pI[0] -= 1
-                pI[0] %= len(drawAtoms)
-                Tx,Ty,Tz = drawAtoms[pI[0]][cx:cx+3]
-                txt = ''
-            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]+txt,1)
         elif key in ['U','D','L','R'] and mapData['Flip'] == True:
             dirDict = {'U':[0,1],'D':[0,-1],'L':[-1,0],'R':[1,0]}
@@ -8248 +8227 @@
                 OnKeyPressed(event)
             return
-        Draw('key up')
+        Draw('key up',NPkey=NPkey)
         
     def OnKeyPressed(event):    #On key down for repeating operation - used to change tau...
@@ -9162 +9141 @@
             RenderBonds(ax,ay,az,bondData[i],bondR,Color[i])
                 
-    def Draw(caller='',Fade=[]):
+    def Draw(caller='',Fade=[],NPkey=False):
         vdWRadii = generalData['vdWRadii']
         mapData = generalData['Map']
@@ -9267 +9246 @@
             else:
                 bndColor = atColor
-            if iat in Ind and G2frame.phaseDisplay.GetPageText(getSelection()) != 'Map peaks':
+            if iat in Ind and (G2frame.phaseDisplay.GetPageText(getSelection()) != 'Map peaks') and not NPkey:
                 atColor = np.array(Gr)/255.
                 bndColor = atColor
@@ -9762 +9741 @@
         
     def Draw(caller=''):
-#useful debug?        
-#        if caller:
-#            print caller
-# end of useful debug
         cPos = defaults['cameraPos']
         VS = np.array(Page.canvas.GetSize())