Changeset 2106


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIimgGUI.py

    r2105 r2106  
    351351                    S = File.readline()
    352352                data.update(save)
    353                 G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))
    354                 wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
    355                 G2plt.PlotExposedImage(G2frame,event=event)
    356                
     353                G2frame.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(G2frame,G2frame.Image, 'Image Controls'),copy.deepcopy(data))               
    357354                File.close()
    358355        finally:
    359356            dlg.Destroy()
     357        G2plt.PlotExposedImage(G2frame,event=event)
     358        wx.CallLater(100,UpdateImageControls,G2frame,data,masks)
    360359           
    361360# Sizers
     
    21312130        self.params['filter'] = '*'+os.path.splitext(fileroot)[1]
    21322131        self.params['outdir'] = os.path.abspath(self.imagedir)
    2133         wx.Frame.__init__(self, G2frame,title='Automatic Integration')
     2132        wx.Frame.__init__(self, G2frame, title='Automatic Integration',
     2133                          style=wx.DEFAULT_FRAME_STYLE ^ wx.CLOSE_BOX)
    21342134        self.Status = self.CreateStatusBar()
    21352135        self.Status.SetStatusText('Press Start to load and integrate images matching filter')
  • trunk/GSASIIplot.py

    r2091 r2106  
    19271927            Plot.plot(x,y,'rD',clip_on=False,picker=3.)
    19281928    if not newPlot:
     1929        # this restores previous plot limits (but I'm not sure why there are two .push_current calls)
    19291930        Page.toolbar.push_current()
     1931        if G2frame.Contour: # for contour plots expand y-axis to include all histograms
     1932            G2frame.xylim = (G2frame.xylim[0], (0.,len(PlotList)-1.))
    19301933        Plot.set_xlim(G2frame.xylim[0])
    19311934        Plot.set_ylim(G2frame.xylim[1])
     
    39073910            G2frame.itemPicked = None
    39083911           
     3912    # PlotImage execution starts here       
     3913    xylim = []
    39093914    try:
    39103915        plotNum = G2frame.G2plotNB.plotList.index('2D Powder Image')
     
    39703975        G2frame.oldImagefile = imagefile # save name of the last image file read
    39713976        G2frame.oldImageTag = imagetag   # save tag of the last image file read
    3972     else:
    3973         if GSASIIpath.GetConfigValue('debug'): print('Skipping image reread')
     3977    #else:
     3978    #    if GSASIIpath.GetConfigValue('debug'): print('Skipping image reread')
    39743979
    39753980    imScale = 1
Note: See TracChangeset for help on using the changeset viewer.