Changeset 2304

Timestamp:

Jun 2, 2016 12:43:45 PM (7 years ago)

Author:

vondreele

Message:

add Cancel to image integration ProgressDialog? - will do a Pause in AutoIntegrate?

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (8 diffs)

trunk/GSASII.py

@@ -2311 +2311 @@
         self.oldImagefile = '' # the name of the last image file read
         self.oldImageTag = None # the name of the tag for multi-image files
+        self.PauseIntegration = False
         self.ImageZ = []
         self.Integrate = 0

trunk/GSASIIimage.py

@@ -962 +962 @@
     Nup += 1
     if dlg:
-        dlg.Update(Nup)
+        pause = dlg.Update(Nup)
     times[4] += time.time()-t0
     print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
@@ -969 +969 @@
     print 'Integration complete'
     if returnN:     #As requested by Steven Weigand
-        return H0,H1,H2,NST
+        return H0,H1,H2,NST,not pause[0]
     else:
-        return H0,H1,H2
+        return H0,H1,H2,not pause[0]
     
 def MakeStrStaRing(ring,Image,Controls):

trunk/GSASIIimgGUI.py

@@ -204 +204 @@
         nYBlks = (Ny-1)/blkSize+1
         Nup = nXBlks*nYBlks*3+1     #exact count expected so AUTO_HIDE works!
-        pdlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
-            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
+        if IntegrateOnly:
+            pdlg = wx.ProgressDialog("Elapsed time","2D image integration\nCancel to pause",
+                Nup,style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE|wx.PD_CAN_ABORT)            
+        else:
+            pdlg = wx.ProgressDialog("Elapsed time","2D image integration",Nup,
+                style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
         try:
             sumImg = GetImageZ(G2frame,data)
@@ -215 +219 @@
             G2frame.PatternTree.Expand(Id)
         finally:
-            pdlg.Destroy()
+            if pdlg:
+                pdlg.Destroy()
         for item in G2frame.MakePDF: item.Enable(True)
+        G2frame.PauseIntegration = G2frame.Integrate[-1]
         
     def OnIntegrateAll(event):
@@ -246 +252 @@
                     finally:
                         dlgp.Destroy()
+                    if G2frame.Integrate[-1]:       #Cancel from progress bar?
+                        break
                 else:
                     G2frame.EnablePlot = True
@@ -2018 +2026 @@
             self.Pause = False
             # change button label
-            if btnstart.GetLabel() != 'Pause':
-                btnstart.SetLabel('Pause')
+            if self.btnstart.GetLabel() != 'Pause':
+                self.btnstart.SetLabel('Pause')
                 if self.timer.IsRunning(): self.timer.Stop()
                 self.PreventReEntryTimer = False
@@ -2027 +2035 @@
                 self.Status.SetStatusText('Press Pause to delay integration or Reset to prepare to reintegrate all images')
             else:
-                btnstart.SetLabel('Resume')
+                self.btnstart.SetLabel('Resume')
                 if self.timer.IsRunning(): self.timer.Stop()
                 print('\nPausing autointegration\n')
@@ -2038 +2046 @@
             all images can be reintegrated. 
             '''
-            btnstart.SetLabel('Restart')
+            self.btnstart.SetLabel('Restart')
             self.Status.SetStatusText('Press Restart to reload and re-integrate images matching filter')
             if self.timer.IsRunning(): self.timer.Stop()
@@ -2214 +2222 @@
         sizer = wx.BoxSizer(wx.HORIZONTAL)
         sizer.Add((20,-1))
-        btnstart = wx.Button(mnpnl,  wx.ID_ANY, "Start")
-        btnstart.Bind(wx.EVT_BUTTON, OnStart)
-        sizer.Add(btnstart)
+        self.btnstart = wx.Button(mnpnl,  wx.ID_ANY, "Start")
+        self.btnstart.Bind(wx.EVT_BUTTON, OnStart)
+        sizer.Add(self.btnstart)
         btnstop = wx.Button(mnpnl,  wx.ID_ANY, "Reset")
         btnstop.Bind(wx.EVT_BUTTON, OnReset)
@@ -2475 +2483 @@
                 self.ShowMatchingFiles(self.params['filter'])
                 wx.Yield()
-            if self.Pause: return
+                self.Pause = G2frame.PauseIntegration
+            if self.Pause:
+                self.btnstart.SetLabel('Resume')
+                if self.timer.IsRunning(): self.timer.Stop()
+                print('\nPausing autointegration\n')
+                self.Status.SetStatusText('Press Resume to continue integration or Reset to prepare to reintegrate all images')
+                return
         
         if GSASIIpath.GetConfigValue('debug'):