Changeset 2174 for trunk/GSASIIphsGUI.py


Ignore:
Timestamp:
Mar 16, 2016 1:25:24 PM (6 years ago)
Author:
vondreele
Message:

fix image integrate and integrate all with dark & background images
trap bad G2frame.PickId? (there may be more!)
fix cleanup after DIFFax crash & other stacking fault fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIphsGUI.py

    r2172 r2174  
    24112411            Obj = event.GetEventObject()
    24122412            data['Layers']['Laue'] = Obj.GetValue()
    2413             UpdateLayerData()
     2413            wx.CallAfter(UpdateLayerData)
    24142414       
    24152415        def OnToler(event): #used when Laue = unknown
     
    24272427                [['mmm'],8,zip([" a = "," b = "," c = "],["%.5f","%.5f","%.5f"],[True,True,True],[0,1,2,])],
    24282428                [['2/m(ab)','2/m(c)','-1','axial','unknown'],10,zip([" a = "," b = "," c = "," gamma = "],
    2429                     ["%.5f","%.5f","%.5f","%.3f"],[True,True,True,True],[0,1,2,3])]]
     2429                    ["%.5f","%.5f","%.5f","%.3f"],[True,True,True,True],[0,1,2,5])]]
    24302430               
    24312431            def OnCellRef(event):
     
    24592459                    cell[4] = cell[5] = cell[6] = 90.
    24602460                    Obj.SetValue("%.5f"%(cell[ObjId+1]))
    2461                 elif laue in ['2/m']:
     2461                elif laue in ['2/m','-1']:
    24622462                    cell[4] = cell[5] = 90.
    24632463                    if ObjId != 3:
     
    24672467                        cell[6] = value
    24682468                        Obj.SetValue("%.3f"%(cell[6]))
    2469                 else:
    2470                     cell[ObjId+1] = value
    2471                     if ObjId < 3:
    2472                         Obj.SetValue("%.5f"%(cell[1+ObjId]))
    2473                     else:
    2474                         Obj.SetValue("%.3f"%(cell[1+ObjId]))                       
    24752469                cell[7] = G2lat.calc_V(G2lat.cell2A(cell[1:7]))
    24762470                volVal.SetLabel(' Vol = %.3f'%(cell[7]))
Note: See TracChangeset for help on using the changeset viewer.