Changeset 3269

Timestamp:

Feb 10, 2018 10:43:45 AM (5 years ago)

Author:

vondreele

Message:

fix editing of wave data to account for new waveType definitions

File:

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

trunk/GSASIIphsGUI.py

@@ -4671 +4671 @@
                     Obj = event.GetEventObject()
                     item = Indx[Obj.GetId()]
-                    if not len(atm[-1]['SS1'][item]):
-                        atm[-1]['SS1']['Spos'] = [0,[]]
-                        atm[-1]['SS1'][Stype][0] = waveType.GetValue()
+                    if len(atm[-1]['SS1'][item]) <= 1:
+                        atm[-1]['SS1'][item] = [0,]
+                        atm[-1]['SS1'][item][0] = waveType.GetValue()
                         wx.CallAfter(RepaintAtomInfo,G2frame.waveData.GetScrollPos(wx.VERTICAL))
                     else:
@@ -4684 +4684 @@
                     item = Indx[Obj.GetId()]
                     nt = numVals[Stype]
-                    if not len(atm[-1]['SS1'][item][1]) and waveTyp in ['ZigZag','Block','Crenel','SawTooth']:
+                    if not len(atm[-1]['SS1'][item]) and waveTyp in ['ZigZag','Block','Crenel','SawTooth']:
                         nt = numVals[waveTyp]
-                    atm[-1]['SS1'][item][1].append([[0.0 for i in range(nt)],False])
+                    atm[-1]['SS1'][item].append([[0.0 for i in range(nt)],False])
                     wx.CallAfter(RepaintAtomInfo,G2frame.waveData.GetScrollPos(wx.VERTICAL))
                     
@@ -4699 +4699 @@
                                 val = min(1.0,max(0.0,val))
                             elif ival == 0: #Tmin
-                                val = max(-1.,min(val,atm[-1]['SS1'][item][1][iwave][1][1]))
+                                val = max(-1.,min(val,atm[-1]['SS1'][item][1][0][ival]))
                     except ValueError:
-                        val = atm[-1]['SS1'][item][iwave][1][ival]
+                        val = atm[-1]['SS1'][item][iwave+1][0][ival]
                     Obj.SetValue('%.5f'%val)
-                    atm[-1]['SS1'][item][iwave][1][ival] = val
+                    atm[-1]['SS1'][item][iwave+1][0][ival] = val
                     
                 def OnRefWave(event):
                     Obj = event.GetEventObject()
                     item,iwave = Indx[Obj.GetId()]
-                    atm[-1]['SS1'][item][1][iwave][2] = not atm[-1]['SS1'][item][1][iwave][2]
+                    atm[-1]['SS1'][item][iwave+1][1] = not atm[-1]['SS1'][item][iwave+1][1]
                     
                 def OnDelWave(event):
                     Obj = event.GetEventObject()
                     item,iwave = Indx[Obj.GetId()]
-                    del atm[-1]['SS1'][item][1][iwave]
+                    del atm[-1]['SS1'][item][iwave+1]
                     wx.CallAfter(RepaintAtomInfo,G2frame.waveData.GetScrollPos(wx.VERTICAL))                
                 
@@ -4835 +4835 @@
                 for ia,atom in enumerate(atomData):
                     for name in names:
-                        for wave in atom[-1]['SS1'][name]:
+                        for wave in atom[-1]['SS1'][name][1:]:
                             wave[1] = flags[name][ia]
         finally: