Changeset 2106
- Timestamp:
- Dec 24, 2015 1:09:50 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimgGUI.py
r2105 r2106 351 351 S = File.readline() 352 352 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)) 357 354 File.close() 358 355 finally: 359 356 dlg.Destroy() 357 G2plt.PlotExposedImage(G2frame,event=event) 358 wx.CallLater(100,UpdateImageControls,G2frame,data,masks) 360 359 361 360 # Sizers … … 2131 2130 self.params['filter'] = '*'+os.path.splitext(fileroot)[1] 2132 2131 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) 2134 2134 self.Status = self.CreateStatusBar() 2135 2135 self.Status.SetStatusText('Press Start to load and integrate images matching filter') -
trunk/GSASIIplot.py
r2091 r2106 1927 1927 Plot.plot(x,y,'rD',clip_on=False,picker=3.) 1928 1928 if not newPlot: 1929 # this restores previous plot limits (but I'm not sure why there are two .push_current calls) 1929 1930 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.)) 1930 1933 Plot.set_xlim(G2frame.xylim[0]) 1931 1934 Plot.set_ylim(G2frame.xylim[1]) … … 3907 3910 G2frame.itemPicked = None 3908 3911 3912 # PlotImage execution starts here 3913 xylim = [] 3909 3914 try: 3910 3915 plotNum = G2frame.G2plotNB.plotList.index('2D Powder Image') … … 3970 3975 G2frame.oldImagefile = imagefile # save name of the last image file read 3971 3976 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') 3974 3979 3975 3980 imScale = 1
Note: See TracChangeset
for help on using the changeset viewer.