fix RB mouse rotations

Author: vondreele

GSASII/GSASIIphsGUI.py

@@ -1536,23 +1536,23 @@ def SetDrawingDefaults(drawingData):
     for key in defaultDrawing:
         if key not in drawingData: drawingData[key] = defaultDrawing[key]
 
-def updateAddRBorientText(G2frame,testRBObj,Bmat):
+def updateAddRBorientText(G2frame,testRBObj,Bmat,ifSlide=True):
     '''Update all origin/orientation text on the Add RB panel or
     on main RB Models page in response to Alt+mouse movement
     '''
     A,V = G2mth.Q2AVdeg(testRBObj['rbObj']['Orient'][0])
     testRBObj['rbObj']['OrientVec'][0] = A
     testRBObj['rbObj']['OrientVec'][1:] = np.inner(Bmat,V)
     for i,val in enumerate(testRBObj['rbObj']['OrientVec']):
-        if G2frame.testRBObjSizers['OrientVecSiz'][i].GetClassName() != 'wxSpinButton':
+        if not ifSlide: #skip spin button
+            G2frame.testRBObjSizers['OrientVecSiz'][i+1].ChangeValue(val)
+        else:
             G2frame.testRBObjSizers['OrientVecSiz'][i].ChangeValue(val)
 #        G2frame.testRBObjSizers['OrientVecSiz'][i].SetValue(val)
-    try:
+    if ifSlide: #from the addRB GUI
 #        G2frame.testRBObjSizers['OrientVecSiz'][4].SetValue(
         G2frame.testRBObjSizers['OrientVecSiz'][4].ChangeValue(
             int(10*testRBObj['rbObj']['OrientVec'][0]))
-    except:
-        pass
     for i,sizer in enumerate(G2frame.testRBObjSizers['Xsizers']):
         sizer.ChangeValue(testRBObj['rbObj']['Orig'][0][i])
 #        sizer.SetValue(testRBObj['rbObj']['Orig'][0][i])

GSASII/GSASIIplot.py

@@ -6470,7 +6470,7 @@ def SetRBText():
         page = getSelection()
         if page:
             if G2frame.phaseDisplay.GetPageText(page) == 'RB Models':
-                G2phG.updateAddRBorientText(G2frame,testRBObj,Bmat)
+                G2phG.updateAddRBorientText(G2frame,testRBObj,Bmat,ifSlide=False)
         if pageCallback:
             try:
                 pageCallback()
@@ -6659,6 +6659,27 @@ def SetRotation(newxy):
         drawingData['viewDir'] = VD
         SetViewDirText(VD)
 
+    def SetRBRotation(newxy):
+#first get rotation vector in screen coords. & angle increment
+        oldxy = drawingData['oldxy']
+        if not len(oldxy): oldxy = list(newxy)
+        dxy = newxy-oldxy
+        if dxy[0] == dxy[1] == 0: return
+        drawingData['oldxy'] = list(newxy)
+        V = np.array([dxy[1],dxy[0],0.])
+        A = 0.1*np.sqrt(dxy[0]**2+dxy[1]**2)
+        if not A: return # nothing changed, nothing to do
+# next transform vector back to xtal coordinates via inverse quaternion
+# & make new quaternion
+        Q = rbObj['Orient'][0]              #rotate RB to Cart
+        QC = drawingData['Quaternion']      #rotate Cart to drawing
+        V = G2mth.prodQVQ(G2mth.invQ(QC),V)
+        V = G2mth.prodQVQ(G2mth.invQ(Q),V)
+        DQ = G2mth.AVdeg2Q(A,V)
+        Q = G2mth.prodQQ(Q,DQ)
+        rbObj['Orient'][0][:] = Q
+        SetRBText()
+        
     def SetRotationZ(newxy):
 #first get rotation vector (= view vector) in screen coords. & angle increment
         View = GL.glGetIntegerv(GL.GL_VIEWPORT)
@@ -6685,26 +6706,6 @@ def SetRotationZ(newxy):
         Q = G2mth.prodQQ(Q,Qy)
         drawingData['Quaternion'] = Q
 
-    def SetRBRotation(newxy):
-#first get rotation vector in screen coords. & angle increment
-        oldxy = drawingData['oldxy']
-        if not len(oldxy): oldxy = list(newxy)
-        dxy = newxy-oldxy
-        if dxy[0] == dxy[1] == 0: return
-        drawingData['oldxy'] = list(newxy)
-        V = np.array([dxy[1],dxy[0],0.])
-        A = 0.25*np.sqrt(dxy[0]**2+dxy[1]**2)
-# next transform vector back to xtal coordinates via inverse quaternion
-# & make new quaternion
-        Q = rbObj['Orient'][0]              #rotate RB to Cart
-        QC = drawingData['Quaternion']      #rotate Cart to drawing
-        V = G2mth.prodQVQ(G2mth.invQ(QC),V)
-        V = G2mth.prodQVQ(G2mth.invQ(Q),V)
-        DQ = G2mth.AVdeg2Q(A,V)
-        Q = G2mth.prodQQ(Q,DQ)
-        rbObj['Orient'][0][:] = Q
-        SetRBText()
-
     def SetRBRotationZ(newxy):
 #first get rotation vector (= view vector) in screen coords. & angle increment
         View = GL.glGetIntegerv(GL.GL_VIEWPORT)
@@ -6716,8 +6717,8 @@ def SetRBRotationZ(newxy):
         drawingData['oldxy'] = list(newxy)
         V = drawingData['viewDir']
         A = [0,0]
-        A[0] = dxy[1]*.25
-        A[1] = dxy[0]*.25
+        A[0] = dxy[1]*.1
+        A[1] = dxy[0]*.1
         if newxy[0] < cent[0]:
             A[0] *= -1
         if newxy[1] > cent[1]: