Changeset 2931 for branch/2frame/GSASIIplot.py

Timestamp:

Jul 13, 2017 1:08:24 PM (5 years ago)

Author:

vondreele

Message:

remove duplicate code from G2dataGUI lines 5922-3; same thing is done on next line
Add a selectuse option for sequential results table - Use column no longer editable.
Use selects plottable points for seq results plots.

File:

• branch/2frame/GSASIIplot.py (modified) (3 diffs)

branch/2frame/GSASIIplot.py

@@ -4244 +4244 @@
         Plot.clear()
         colors=['b','g','r','c','m','k']
+        uselist = Page.seqTableGet(0)[1]
         if G2frame.seqXaxis is not None:    
             xName,X,Xsig = Page.seqTableGet(G2frame.seqXaxis)
@@ -4257 +4258 @@
             Ysnew = []
             for i in range(len(X)):
+                if not uselist[i]:
+                    continue
                 if X[i] is None or Y[i] is None:
                     if Ysnew:
@@ -5668 +5671 @@
         except AttributeError:       #if from OnKeyBox above
             key = str(event.key).upper()
-        if key in ['+','-','=','0'] and generalData['Modulated']:
-            if key == '0':
-                G2frame.tau = 0.
-            elif key in ['+','=']:
-                G2frame.tau += 0.1
-            elif key == '-':
-                G2frame.tau -= 0.1
-            G2frame.tau %= 1.   #force 0-1 range
-            G2frame.G2plotNB.status.SetStatusText('Modulation tau = %.2f'%(G2frame.tau),1)
-            data['Drawing']['Atoms'],Fade = G2mth.ApplyModulation(data,G2frame.tau)     #modifies drawing atom array!          
-            SetDrawAtomsText(data['Drawing']['Atoms'])
-            G2phG.FindBondsDraw(data)           #rebuild bonds & polygons
-            if not np.any(Fade):
-                Fade += 1
-            Draw('key down',Fade)
+        if key in ['+','-','=','0']:
+            if generalData['Modulated']:
+                if key == '0':
+                    G2frame.tau = 0.
+                elif key in ['+','=']:
+                    G2frame.tau += 0.1
+                elif key == '-':
+                    G2frame.tau -= 0.1
+                G2frame.tau %= 1.   #force 0-1 range
+                G2frame.G2plotNB.status.SetStatusText('Modulation tau = %.2f'%(G2frame.tau),1)
+                data['Drawing']['Atoms'],Fade = G2mth.ApplyModulation(data,G2frame.tau)     #modifies drawing atom array!          
+                SetDrawAtomsText(data['Drawing']['Atoms'])
+                G2phG.FindBondsDraw(data)           #rebuild bonds & polygons
+                if not np.any(Fade):
+                    Fade += 1
+                Draw('key down',Fade)
+            else:
+                pass        #TODO sequential result movie here
             
     def GetTruePosition(xy,Add=False):