Changeset 482 for trunk/GSASIIpwd.py


Ignore:
Timestamp:
Feb 13, 2012 11:33:35 AM (10 years ago)
Author:
vondreele
Message:

move FileDlgFixExt? to G2IO
begin to add a save selected seq results to file
move IO routines called in G2struct back there
remove wx stuff from G2pwd & G2struct
put progress bar in G2pwdGUI (not G2pwd)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIpwd.py

    r453 r482  
    1111import sys
    1212import math
    13 import wx
    1413import time
    1514
     
    2322
    2423import GSASIIpath
    25 import GSASIIplot as G2plt
    2624import GSASIIlattice as G2lat
    2725import GSASIIElem as G2elem
     
    945943    parmdict.update(zip(varylist,values))
    946944   
    947 def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None):
     945def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None,dlg=None):
    948946   
    949947    def SetBackgroundParms(Background):
     
    12001198        values =  np.array(Dict2Values(parmDict, varyList))
    12011199        if FitPgm == 'LSQ':
    1202             dlg = wx.ProgressDialog('Residual','Peak fit Rwp = ',101.0,
    1203             style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT)
    1204             screenSize = wx.ClientDisplayRect()
    1205             Size = dlg.GetSize()
    1206             dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
    12071200            try:
    12081201                result = so.leastsq(errPeakProfile,values,Dfun=devPeakProfile,full_output=True,ftol=Ftol,col_deriv=True,
Note: See TracChangeset for help on using the changeset viewer.