Changeset 172

Timestamp:

Nov 12, 2010 1:41:27 PM (12 years ago)

Author:

vondreele

Message:

 

File:

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

trunk/GSASIIplot.py

@@ -1149 +1149 @@
         [uBox[4],uBox[5]],[uBox[5],uBox[6]],[uBox[6],uBox[7]],[uBox[7],uBox[4]]])
     uColors = [Rd,Gr,Bl,Wt, Wt,Wt,Wt,Wt, Wt,Wt,Wt,Wt]
+    altDown = False
+    shiftDown = False
+    ctrlDown = False
     
     def OnKeyBox(event):
@@ -1173 +1176 @@
         Model = glGetDoublev(GL_MODELVIEW_MATRIX)
         Zmax = 1.
+        ClearSelectedAtoms()
         for i,atom in enumerate(drawAtoms):
             x,y,z = atom[cx:cx+3]
@@ -1183 +1187 @@
     def OnMouseDown(event):
         xy = event.GetPosition()
-        if event.AltDown():
+        if event.ShiftDown():
             GetTruePosition(xy)
         else:
             drawingData['Rotation'][3] = xy
+        Draw()
+        
+    def OnMouseMove(event):
+        newxy = event.GetPosition()
+        if event.AltDown() and drawingData['showABC']:
+            if event.RightIsDown():
+                altDown = True
+                SetTestPos(newxy)
+        if event.Dragging() and not event.AltDown():
+            altDown = False
+            if event.LeftIsDown():
+                SetRotation(newxy)
+            elif event.RightIsDown():
+                SetTranslation(newxy)
+            elif event.MiddleIsDown():
+                SetRotationZ(newxy)
+        Draw()
         
     def OnMouseWheel(event):
@@ -1206 +1227 @@
             panel[names.index('viewPoint')].SetValue('%.3f, %.3f, %.3f'%(VP[0],VP[1],VP[2]))
             
+    def ClearSelectedAtoms():
+        page = self.dataDisplay.GetSelection()
+        if self.dataDisplay.GetPageText(page) == 'Draw Atoms':
+            self.dataDisplay.GetPage(page).ClearSelection()      #this is the Atoms grid in Draw Atoms
+                    
     def SetSelectedAtoms(ind):
         page = self.dataDisplay.GetSelection()
         if self.dataDisplay.GetPageText(page) == 'Draw Atoms':
             self.dataDisplay.GetPage(page).SelectRow(ind)      #this is the Atoms grid in Draw Atoms
-        
-            
+                  
     def GetSelectedAtoms():
         page = self.dataDisplay.GetSelection()
@@ -1265 +1290 @@
         Draw()
             
-    def OnMouseMove(event):
-        newxy = event.GetPosition()
-        if event.ShiftDown() and drawingData['showABC']:
-            if event.RightIsDown():
-                SetTestPos(newxy)
-            if event.LeftIsDown():
-                SetNewPos(newxy)
-        if event.Dragging() and not event.AltDown():
-            if event.LeftIsDown():
-                SetRotation(newxy)
-            elif event.RightIsDown():
-                SetTranslation(newxy)
-            elif event.MiddleIsDown():
-                SetRotationZ(newxy)
-            Draw()
-        
     def SetBackground():
         R,G,B,A = Page.camera['backColor']
@@ -1486 +1495 @@
         Ind = GetSelectedAtoms()
         x,y,z = drawingData['testPos']
-        self.G2plotNB.status.SetStatusText('test point %.4f,%.4f,%.4f'%(x,y,z),1)
+        if altDown:
+            self.G2plotNB.status.SetStatusText('moving test point %.4f,%.4f,%.4f'%(x,y,z),1)
+        else:
+            self.G2plotNB.status.SetStatusText('test point %.4f,%.4f,%.4f'%(x,y,z),1)            
         VS = np.array(Page.canvas.GetSize())
         aspect = float(VS[0])/float(VS[1])
@@ -1647 +1659 @@
         Page.views = False
         view = False
+        altDown = False
     Page.SetFocus()
     cb = wx.ComboBox(self.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,