Changeset 4428 for trunk

Timestamp:

May 21, 2020 7:42:24 AM (4 years ago)

Author:

toby

Message:

minor RB stuff in prep for new add RB code

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIdataGUI.py

@@ -6088 +6088 @@
         self.DrawAtomEdit.Append(G2G.wxID_DRAWATOMCOLOR,'Atom color','Select atoms first')
         self.DrawAtomEdit.Append(G2G.wxID_DRAWATOMRESETCOLOR,'Reset atom colors','Resets all atom colors to defaults')
-        self.DrawAtomEdit.Append(G2G.wxID_DRWAEDITRADII,'Edit atom radii','Edit drawing atom radii')
+#        self.DrawAtomEdit.Append(G2G.wxID_DRWAEDITRADII,'Edit atom radii','Edit drawing atom radii') # TODO: removed until it can be made to do something
         self.DrawAtomEdit.Append(G2G.wxID_DRAWVIEWPOINT,'View point','View point is 1st atom selected')
         self.DrawAtomEdit.Append(G2G.wxID_DRAWADDEQUIV,'Add atoms','Add symmetry & cell equivalents to drawing set from selected atoms')

trunk/GSASIIplot.py

@@ -8181 +8181 @@
         if Add:
             Indx = GetSelectedAtoms()
-        if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
-            for i,peak in enumerate(mapPeaks):
-                x,y,z = peak[1:4]
-                X,Y,Z = GLU.gluProject(x,y,z,Model,Proj,View)
-                XY = [int(X),int(View[3]-Y)]
-                if np.allclose(xy,XY,atol=10) and Z < Zmax:
-                    Zmax = Z
-                    try:
-                        Indx.remove(i)
-                        ClearSelectedAtoms()
-                        for Id in Indx:
-                            SetSelectedAtoms(Id,Add)
-                    except:
-                        SetSelectedAtoms(i,Add)
-        else:
+        try:
+            if G2frame.phaseDisplay.GetPageText(getSelection()) == 'Map peaks':
+                for i,peak in enumerate(mapPeaks):
+                    x,y,z = peak[1:4]
+                    X,Y,Z = GLU.gluProject(x,y,z,Model,Proj,View)
+                    XY = [int(X),int(View[3]-Y)]
+                    if np.allclose(xy,XY,atol=10) and Z < Zmax:
+                        Zmax = Z
+                        try:
+                            Indx.remove(i)
+                            ClearSelectedAtoms()
+                            for Id in Indx:
+                                SetSelectedAtoms(Id,Add)
+                        except:
+                            SetSelectedAtoms(i,Add)
+        except:
             cx = drawingData['atomPtrs'][0]
             for i,atom in enumerate(drawAtoms):
@@ -8310 +8311 @@
             if G2frame.phaseDisplay.GetPageText(page) == 'RB Models':
                 for i,sizer in enumerate(G2frame.testRBObjSizers['Osizers']):
-                    sizer.SetValue('%8.5f'%(testRBObj['rbObj']['Orient'][0][i]))
+                    sizer.SetLabel('%8.5f'%(testRBObj['rbObj']['Orient'][0][i]))
                 
     def SetViewDirText(VD):
@@ -8519 +8520 @@
         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.])
@@ -8530 +8532 @@
         DQ = G2mth.AVdeg2Q(A,V)
         Q = G2mth.prodQQ(Q,DQ)
-        rbObj['Orient'][0] = Q
+        rbObj['Orient'][0][:] = Q
         SetRBOrienText()
         
@@ -8540 +8542 @@
         if not len(oldxy): oldxy = list(newxy)
         dxy = newxy-oldxy
+        if dxy[0] == dxy[1] == 0: return
         drawingData['oldxy'] = list(newxy)
         V = drawingData['viewDir']
@@ -8557 +8560 @@
         Q = G2mth.prodQQ(Q,Qx)
         Q = G2mth.prodQQ(Q,Qy)
-        rbObj['Orient'][0] = Q
+        rbObj['Orient'][0][:] = Q
         SetRBOrienText()