Changeset 2106

Timestamp:

Dec 24, 2015 1:09:50 PM (6 years ago)

Author:

toby

Message:

more for Andrey: 3. no update on contour plot (change so y-axis is expanded); give up on 2. Load Controls” menu entry messes up plot redraw.

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIimgGUI.py

@@ -351 +351 @@
                     S = File.readline()
                 data.update(save)
-                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
-                wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
-                G2plt.PlotExposedImage(G2frame,event=event)
-                
+                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))                
                 File.close()
         finally:
             dlg.Destroy()
+        G2plt.PlotExposedImage(G2frame,event=event)
+        wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
             
 # Sizers
@@ -2131 +2130 @@
         self.params['filter'] = '*'+os.path.splitext(fileroot)[1]
         self.params['outdir'] = os.path.abspath(self.imagedir)
-        wx.Frame.__init__(self, G2frame,title='Automatic Integration')
+        wx.Frame.__init__(self, G2frame, title='Automatic Integration',
+                          style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)
         self.Status = self.CreateStatusBar()
         self.Status.SetStatusText('Press Start to load and integrate images matching filter')

trunk/GSASIIplot.py

@@ -1927 +1927 @@
             Plot.plot(x,y,'rD',clip_on=False,picker=3.)
     if not newPlot:
+        # this restores previous plot limits (but I'm not sure why there are two .push_current calls)
         Page.toolbar.push_current()
+        if G2frame.Contour: # for contour plots expand y-axis to include all histograms
+            G2frame.xylim = (G2frame.xylim[0], (0.,len(PlotList)-1.))
         Plot.set_xlim(G2frame.xylim[0])
         Plot.set_ylim(G2frame.xylim[1])
@@ -3907 +3910 @@
             G2frame.itemPicked = None
             
+    # PlotImage execution starts here        
+    xylim = []
     try:
         plotNum = G2frame.G2plotNB.plotList.index('2D Powder Image')
@@ -3970 +3975 @@
         G2frame.oldImagefile = imagefile # save name of the last image file read
         G2frame.oldImageTag = imagetag   # save tag of the last image file read
-    else:
-        if GSASIIpath.GetConfigValue('debug'): print('Skipping image reread')
+    #else:
+    #    if GSASIIpath.GetConfigValue('debug'): print('Skipping image reread')
 
     imScale = 1