Changeset 460 for trunk/GSASIIplot.py

Timestamp:

Jan 31, 2012 3:40:48 PM (11 years ago)

Author:

vondreele

Message:

add more text to help/gsasII.html
finish best plane calcs
allow multiple atom selection from plot
begin torsion calc

File:

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

trunk/GSASIIplot.py

@@ -2184 +2184 @@
         self.G2plotNB.status.SetStatusText('Drawing saved to: '+Fname,1)
     
-    def GetTruePosition(xy):
+    def GetTruePosition(xy,Add=False):
         View = glGetIntegerv(GL_VIEWPORT)
         Proj = glGetDoublev(GL_PROJECTION_MATRIX)
         Model = glGetDoublev(GL_MODELVIEW_MATRIX)
         Zmax = 1.
+        if Add:
+            Indx = GetSelectedAtoms()
         for i,atom in enumerate(drawAtoms):
             x,y,z = atom[cx:cx+3]
@@ -2195 +2197 @@
             if np.allclose(xy,XY,atol=10) and Z < Zmax:
                 Zmax = Z
-                SetSelectedAtoms(i)
+                try:
+                    Indx.remove(i)
+                    ClearSelectedAtoms()
+                    for id in Indx:
+                        SetSelectedAtoms(id,Add)
+                except:
+                    SetSelectedAtoms(i,Add)
                     
     def OnMouseDown(event):
         xy = event.GetPosition()
         if event.ShiftDown():
-            GetTruePosition(xy)
+            if event.LeftIsDown():
+                GetTruePosition(xy)
+            elif event.RightIsDown():
+                GetTruePosition(xy,True)
         else:
             drawingData['Rotation'][3] = xy
@@ -2206 +2217 @@
         
     def OnMouseMove(event):
+        if event.ShiftDown():
+            return        
         newxy = event.GetPosition()
         page = getSelection()
@@ -2217 +2230 @@
             x,y,z = drawingData['testPos'][0]
             self.G2plotNB.status.SetStatusText('moving test point %.4f,%.4f,%.4f'%(x,y,z),1)
-                
-                
+                                
         if event.Dragging() and not event.ControlDown():
             if event.LeftIsDown():
@@ -2235 +2247 @@
         
     def OnMouseWheel(event):
+        if event.ShiftDown():
+            return
         drawingData['cameraPos'] += event.GetWheelRotation()/24
         drawingData['cameraPos'] = max(10,min(500,drawingData['cameraPos']))
@@ -2271 +2285 @@
                 self.dataDisplay.GetPage(page).ClearSelection()      #this is the Atoms grid in Atoms
                     
-    def SetSelectedAtoms(ind):
+    def SetSelectedAtoms(ind,Add=False):
         page = getSelection()
         if page:
             if self.dataDisplay.GetPageText(page) == 'Draw Atoms':
-                self.dataDisplay.GetPage(page).SelectRow(ind)      #this is the Atoms grid in Draw Atoms
+                self.dataDisplay.GetPage(page).SelectRow(ind,Add)      #this is the Atoms grid in Draw Atoms
             elif self.dataDisplay.GetPageText(page) == 'Atoms':
                 Id = drawAtoms[ind][-2]