Changeset 482 for trunk/GSASIIpwd.py

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:

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

trunk/GSASIIpwd.py

@@ -11 +11 @@
 import sys
 import math
-import wx
 import time
 
@@ -23 +22 @@
 
 import GSASIIpath
-import GSASIIplot as G2plt
 import GSASIIlattice as G2lat
 import GSASIIElem as G2elem
@@ -945 +943 @@
     parmdict.update(zip(varylist,values))
     
-def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None):
+def DoPeakFit(FitPgm,Peaks,Background,Limits,Inst,data,oneCycle=False,controls=None,dlg=None):
     
     def SetBackgroundParms(Background):
@@ -1200 +1198 @@
         values =  np.array(Dict2Values(parmDict, varyList))
         if FitPgm == 'LSQ':
-            dlg = wx.ProgressDialog('Residual','Peak fit Rwp = ',101.0, 
-            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_REMAINING_TIME|wx.PD_CAN_ABORT)
-            screenSize = wx.ClientDisplayRect()
-            Size = dlg.GetSize()
-            dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
             try:
                 result = so.leastsq(errPeakProfile,values,Dfun=devPeakProfile,full_output=True,ftol=Ftol,col_deriv=True,