Changeset 1295 for trunk/GSASII.py


Ignore:
Timestamp:
Apr 22, 2014 9:37:51 AM (8 years ago)
Author:
vondreele
Message:

disable plotting while multiple PWDR & SASD data sets are imported - huge speedup
small fix in neutron anomalous data input (current not used)
begin sequential SASD fit
add an OnMotion? for sequential plots & add point plotting for Pseudo Variable plots

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r1288 r1295  
    11811181        lastdatafile = ''
    11821182        newHistList = []
     1183        self.EnablePlot = False
    11831184        for rd in rdlist:
    11841185            # get instrument parameters for each dataset
     
    12541255                self.PatternTree.AppendItem(Id,text='Reflection Lists'),
    12551256                {})
     1257            newHistList.append(HistName)
     1258        else:
     1259            self.EnablePlot = True
    12561260            self.PatternTree.Expand(Id)
    12571261            self.PatternTree.SelectItem(Id)
    1258             newHistList.append(HistName)
    12591262           
    12601263        if not newHistList: return # somehow, no new histograms
     
    15221525        lastdatafile = ''
    15231526        newHistList = []
     1527        self.EnablePlot = False
    15241528        for rd in rdlist:
    15251529            lastdatafile = rd.smallangleentry[0]
     
    15791583            self.PatternTree.SetItemPyData(
    15801584                self.PatternTree.AppendItem(Id,text='Models'),G2pdG.SetDefaultSASDModel())
     1585            newHistList.append(HistName)
     1586        else:
     1587            self.EnablePlot = True
    15811588            self.PatternTree.Expand(Id)
    15821589            self.PatternTree.SelectItem(Id)
    1583             newHistList.append(HistName)
    15841590           
    15851591        if not newHistList: return # somehow, no new histograms
     
    19061912        self.MaskKey = ''           #trigger for making image masks
    19071913        self.StrainKey = ''         #ditto for new strain d-zeros
     1914        self.EnablePlot = True
    19081915        arg = sys.argv
    19091916        if len(arg) > 1:
     
    20802087                        self.PickId = Id
    20812088                        self.Image = Id
    2082                 os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!
     2089                os.chdir(dlg.GetDirectory())           # to get Mac/Linux to change directory!               
    20832090                self.PatternTree.SelectItem(G2gd.GetPatternTreeItemId(self,Id,'Image Controls'))             #show last one
    20842091        finally:
Note: See TracChangeset for help on using the changeset viewer.