Changeset 754

Timestamp:

Sep 7, 2012 2:48:44 PM (11 years ago)

Author:

vondreele

Message:

final cleanup of quaternion stuff

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (7 diffs)

trunk/GSASIIphsGUI.py

@@ -1563 +1563 @@
             'radiusFactor':0.85,'contourLevel':1.,'bondRadius':0.1,'ballScale':0.33,
             'vdwScale':0.67,'ellipseProb':50,'sizeH':0.50,'unitCellBox':False,
-            'showABC':True,'selectedAtoms':[],'Atoms':[],'Rotation':[0.0,0.0,0.0,[]],
+            'showABC':True,'selectedAtoms':[],'Atoms':[],'oldxy':[],
             'Quaternion':[0.0,0.0,1.0,0.0],'bondList':{},'viewDir':[0,0,1]}
         try:

trunk/GSASIIplot.py

@@ -2394 +2394 @@
             VD /= np.sqrt(np.sum(VD**2))
             drawingData['viewDir'] = VD
-            drawingData['Rotation'] = [0.0,0.0,0.0,[]]
+            drawingData['oldxy'] = []
             drawingData['Quaternion'] = [0.0,0.0,1.0,0.0]
             SetViewPointText(drawingData['viewPoint'][0])
@@ -2486 +2486 @@
                 GetTruePosition(xy,True)
         else:
-            drawingData['Rotation'][3] = list(xy)
+            drawingData['oldxy'] = list(xy)
         Draw()
         
@@ -2618 +2618 @@
         roll = GetRoll(newxy,rho)
         mapData['rho'] = np.roll(np.roll(np.roll(rho,roll[0],axis=0),roll[1],axis=1),roll[2],axis=2)
-        drawingData['Rotation'][3] = list(newxy)
+        drawingData['oldxy'] = list(newxy)
         
     def SetPeakRoll(newxy):
@@ -2632 +2632 @@
     def SetTranslation(newxy):
 #first get translation vector in screen coords.       
-        oldxy = drawingData['Rotation'][3]
+        oldxy = drawingData['oldxy']
         if not len(oldxy): oldxy = list(newxy)
         dxy = newxy-oldxy
-        drawingData['Rotation'][3] = list(newxy)
+        drawingData['oldxy'] = list(newxy)
         V = np.array([-dxy[0],dxy[1],0.])
 #then transform to rotated crystal coordinates & apply to view point        
@@ -2644 +2644 @@
         Ty += V[1]*0.01
         Tz += V[2]*0.01
-        drawingData['Rotation'][3] = list(newxy)
+        drawingData['oldxy'] = list(newxy)
         drawingData['viewPoint'][0] =  Tx,Ty,Tz
         SetViewPointText([Tx,Ty,Tz])
@@ -2650 +2650 @@
     def SetRotation(newxy):
 #first get rotation vector in screen coords. & angle increment        
-        oldxy = drawingData['Rotation'][3]
+        oldxy = drawingData['oldxy']
         if not len(oldxy): oldxy = list(newxy)
         dxy = newxy-oldxy
-        drawingData['Rotation'][3] = list(newxy)
+        drawingData['oldxy'] = list(newxy)
         V = np.array([dxy[1],dxy[0],0.])
         A = 0.25*np.sqrt(dxy[0]**2+dxy[1]**2)
@@ -2672 +2672 @@
 #first get rotation vector (= view vector) in screen coords. & angle increment        
         View = glGetIntegerv(GL_VIEWPORT)
-        oldxy = drawingData['Rotation'][3]
+        oldxy = drawingData['oldxy']
         if not len(oldxy): oldxy = list(newxy)
         dxy = newxy-oldxy
-        drawingData['Rotation'][3] = list(newxy)
+        drawingData['oldxy'] = list(newxy)
         V = drawingData['viewDir']
         X0 = drawingData['viewPoint'][0]