Changeset 2113 for trunk/GSASIIphsGUI.py

Timestamp:

Jan 6, 2016 10:14:21 AM (8 years ago)

Author:

vondreele

Message:

better cleanup when main window is closed
add FlagSetDialog? class & use it for wave parameters

File:

• trunk/GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -2539 +2539 @@
                 atomSizer.Add(WaveSizer(iatm,atm[-1]['SS1']['waveType'],atm[-1]['SS1'][Stype],Stype,typeNames[Stype],Labels[Stype]))                        
             return atomSizer
-                
 
         atms = wx.ComboBox(waveData,value=G2frame.atmSel,choices=atNames,
@@ -2548 +2547 @@
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        #wxID_WAVEVARY
         SetPhaseWindow(G2frame.dataFrame,G2frame.waveData,mainSizer,Scroll)
     
     def OnWaveVary(event):
-        print 'set vary flags for all waves - TBD'
+        generalData = data['General']
+        cx,ct,cs,cia = generalData['AtomPtrs']
+        atomData = data['Atoms']
+        atNames = []
+        names = ['Sfrac','Spos','Sadp','Smag']
+        flags = dict(zip(names,[[],[],[],[]]))
+        for atom in atomData:
+            atNames.append(atom[ct-1])
+            waves = atom[-1]['SS1']
+            for name in names:
+                if waves[name]:
+                    flags[name].append(True)
+                else:
+                    flags[name].append(False)
+        dlg = G2G.FlagSetDialog(G2frame,'Wave refinement flags',['Atom',]+names,atNames,flags)
+        try:
+            if dlg.ShowModal() == wx.ID_OK:
+                flags = dlg.GetSelection()
+                for ia,atom in enumerate(atomData):
+                    for name in names:
+                        for wave in atom[-1]['SS1'][name]:
+                            wave[1] = flags[name][ia]
+        finally:
+            dlg.Destroy()
+        UpdateWavesData()
 
 ################################################################################