Changeset 2322

Timestamp:

Jun 15, 2016 7:40:20 AM (7 years ago)

Author:

vondreele

Message:

(partially) fixed Cancel/Pause? behavior in AutoIntegrate?. Will crash 32-bit if Cancel pressed too soon & if Pause pressed repeatedly during integration. 64-bit seems immune to this.

Location:

trunk

Files:

• GSASIIimage.py (modified) (3 diffs)
• GSASIIimgGUI.py (modified) (6 diffs)

trunk/GSASIIimage.py

@@ -904 +904 @@
             Nup += 1
             if dlg:
-                dlg.Update(Nup)
+                pause = dlg.Update(Nup)
             Block = image[iBeg:iFin,jBeg:jFin]
             t0 = time.time()
@@ -912 +912 @@
             Nup += 1
             if dlg:
-                dlg.Update(Nup)
+                pause = dlg.Update(Nup)
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
@@ -934 +934 @@
             del tax; del tay; del taz; del tad; del tabs
             if dlg:
-                dlg.Update(Nup)
+                pause = dlg.Update(Nup)
     t0 = time.time()
     NST = np.array(NST,dtype=np.float)

trunk/GSASIIimgGUI.py

@@ -1995 +1995 @@
     cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type',
             'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
-            'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+            'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg',
             'PolaVal','SampleAbs','dark image','background image']
     File = open(filename,'r')
@@ -2034 +2034 @@
     cntlList = ['wavelength','distance','tilt','invert_x','invert_y','type',
                         'fullIntegrate','outChannels','outAzimuths','LRazimuth','IOtth','azmthOff','DetDepth',
-                        'calibskip','pixLimit','cutoff','calibdmin','chisq','Flat Bkg',
+                        'calibskip','pixLimit','cutoff','calibdmin','Flat Bkg',
                         'PolaVal','SampleAbs','dark image','background image']
     File = open(imctrl_file,'r')
@@ -2494 +2494 @@
         '''A method that is called every :meth:`PollTime` seconds that is
         used to check for new files and process them. This is called only
-        after the "Start" button is pressed (when its label reads "Pause").
+        after the "Start" button is pressed (then its label reads "Pause").
         '''
         G2frame = self.G2frame
@@ -2528 +2528 @@
             ImageMasks.update(self.ImageMasks)
             self.IntegrateImage(img)
+            self.Pause = G2frame.PauseIntegration
             self.G2frame.oldImagefile = '' # mark image as changed; reread as needed
             wx.Yield()
             self.ShowMatchingFiles(self.params['filter'])
             wx.Yield()
-            if self.Pause: return
+            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
 
         # loop over image files matching glob, reading in any new ones
         for newImage in self.currImageList:
 
-            if newImage in imageFileList: continue # already read?
+            if newImage in imageFileList or self.Pause: continue # already read?
             for imgId in G2IO.ReadImages(G2frame,newImage):
                 controlsDict = G2frame.PatternTree.GetItemPyData(
@@ -2557 +2563 @@
                 wx.Yield()
                 self.Pause = G2frame.PauseIntegration
+                print 'pause',self.Pause
             if self.Pause:
                 self.btnstart.SetLabel('Resume')
@@ -2562 +2569 @@
                 print('\nPausing autointegration\n')
                 self.Status.SetStatusText('Press Resume to continue integration or Reset to prepare to reintegrate all images')
-                return
+                break
         
         if GSASIIpath.GetConfigValue('debug'):