Changeset 2649

Timestamp:

Jan 20, 2017 10:04:50 AM (6 years ago)

Author:

vondreele

Message:

fix progress bar issues in peak fitting
remove busy cursors where progress bar is used
fix display issues in Limits with excluded regions

File:

• trunk/GSASIIpwdGUI.py (modified) (10 diffs)

trunk/GSASIIpwdGUI.py

@@ -549 +549 @@
             names.reverse()
         try:
-            wx.BeginBusyCursor()
             for i,name in enumerate(names):
                 print ' Sequential fit for ',name
                 GoOn = dlg.Update(i,newmsg='Data set name = '+name)[0]
                 if not GoOn:
+                    dlg.Destroy()
                     break
                 PatternId =  G2gd.GetPatternTreeItemId(G2frame,G2frame.root,name)
@@ -577 +577 @@
                     dlg2.Destroy()
                 if len(result[0]) != len(fullvaryList):
+                    dlg.Destroy()
                     print ' ***** Sequential peak fit stopped at '+name+' *****'
                     break
@@ -588 +589 @@
         finally:
             dlg.Destroy()
-            wx.EndBusyCursor()
         if Reverse:
             Names.reverse()
@@ -625 +625 @@
         inst,inst2 = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Instrument Parameters'))
         data = G2frame.PatternTree.GetItemPyData(PatternId)[1]
-        wx.BeginBusyCursor()
         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)
@@ -637 +636 @@
         finally:
             print 'finished'
-            wx.EndBusyCursor()
             dlg.Destroy()    
         G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'Peak List'),copy.copy(peaks))
@@ -1242 +1240 @@
     '''respond to selection of PWDR Limits data tree item.
     '''
+    def AfterChange(invalid,value,tc):
+        if invalid: return
+        plottype = G2frame.PatternTree.GetItemText(G2frame.PatternId)[:4]
+#        print 'new plot'
+        wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=plottype)  #unfortunately this resets the plot width
+
     def LimitSizer():
-        limits = wx.FlexGridSizer(2,3,0,5)
+        limits = wx.FlexGridSizer(0,3,0,5)
         labels = ['Tmin','Tmax']
         for i in [0,1]:
@@ -1252 +1256 @@
         return limits
         
-    def AfterChange(invalid,value,tc):
-        if invalid: return
-        plottype = G2frame.PatternTree.GetItemText(G2frame.PatternId)[:4]
-#        print 'new plot'
-        wx.CallAfter(G2plt.PlotPatterns,G2frame,newPlot=False,plotType=plottype)  #unfortunately this resets the plot width
-
     def ExclSizer():
         
@@ -1282 +1280 @@
         return excl
                
+    def OnAddExcl(event):
+        G2frame.ifGetExclude = True
+        print 'Add excluded region'
+        
     def OnLimitCopy(event):
         hst = G2frame.PatternTree.GetItemText(G2frame.PatternId)
@@ -1302 +1304 @@
             dlg.Destroy()
             
-    def OnAddExcl(event):
-        G2frame.ifGetExclude = True
-        print 'Add excluded region'
-        
     def Draw():
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add(LimitSizer())
         if len(data)>2:
-            mainSizer.Add((0,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.dataFrame,label=' Excluded regions:'),0,WACV)
+#            mainSizer.Add((0,5),0)
+            mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Excluded regions:'),0,WACV)
             mainSizer.Add(ExclSizer())
         mainSizer.Layout()    
@@ -1317 +1315 @@
         Size = mainSizer.Fit(G2frame.dataFrame)
         G2frame.dataFrame.setSizePosLeft(Size)
-        
         
     if G2frame.dataDisplay: