Changeset 1591

Timestamp:

Dec 2, 2014 1:30:45 PM (9 years ago)

Author:

toby

Message:

fix progress dialog problems; remove cruft from GSASII.BAT

Location:

trunk

Files:

• GSASII.BAT (modified) (1 diff)
• GSASII.py (modified) (2 diffs)
• GSASIIstrMath.py (modified) (1 diff)

trunk/GSASII.BAT

@@ -14 +14 @@
 @set gsasloc=%gsasloc:\\*=\*%
 @set gsasloc=%gsasloc:\*=\%
-D:\Python27\python "%gsasloc%\GSASII.py" %1
+python "%gsasloc%\GSASII.py" %1
 @REM To keep the window from disappearing with any error messages
 pause

trunk/GSASII.py

@@ -3434 +3434 @@
         #works - but it'd be better if it could restore plots
         dlg = wx.ProgressDialog('Residual','All data Rw =',101.0, 
-            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
-        screenSize = wx.ClientDisplayRect()
+            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT,
+            parent=self)
         Size = dlg.GetSize()
-        Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x
-        dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
-        dlg.SetSize(Size)
+        if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+            dlg.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+        dlg.CenterOnParent()
         Rw = 100.00
         try:
             Rw = G2stMn.Refine(self.GSASprojectfile,dlg)
         finally:
+            dlg.Update(101.) # forces the Auto_Hide; needed after move w/Win & wx3.0
             dlg.Destroy()
             wx.Yield()
@@ -3507 +3508 @@
             return
         dlg = wx.ProgressDialog('Residual for histogram 0','Powder profile Rwp =',101.0, 
-            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)
-        screenSize = wx.ClientDisplayRect()
+            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT,
+            parent=self)            
         Size = dlg.GetSize()
-        Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x
-        dlg.SetPosition(wx.Point(screenSize[2]-Size[0]-305,screenSize[1]+5))
-        dlg.SetSize(Size)
+        if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0
+            dlg.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x
+        dlg.CenterOnParent()
         try:
             G2stMn.SeqRefine(self.GSASprojectfile,dlg)
         finally:
-            dlg.Destroy()        
+            dlg.Update(101.) # forces the Auto_Hide; needed after move w/Win & wx3.0
+            dlg.Destroy()
+            wx.Yield()
         dlg = wx.MessageDialog(self,'Load new result?','Refinement results',wx.OK|wx.CANCEL)
         try:

trunk/GSASIIstrMath.py

@@ -2166 +2166 @@
             dMdvh *= Wt
             if dlg:
-                dlg.Update(Histogram['Residuals']['wR'],newmsg='Hessian for histogram %d\nAll data Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))[0]
+                dlg.Update(Histogram['Residuals']['wR'],newmsg='Hessian for histogram %d\nAll data Rw=%8.3f%s'%(hId,Histogram['Residuals']['wR'],'%'))
             if len(Hess):
                 Hess += np.inner(dMdvh,dMdvh)