Changeset 3378


Ignore:
Timestamp:
May 10, 2018 11:43:22 AM (3 years ago)
Author:
vondreele
Message:

fix seq refine movie of structure
fix hide columns in seq table - saves settings & allows unhide of previously hidden columns
set default hides on Back, Dij & dAx,y,z parameters

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIdataGUI.py

    r3377 r3378  
    27282728        self.lastTreeSetting = [] # used to track the selected Tree item before a refinement
    27292729        self.ExpandingAll = False
    2730         self.SeqTblHideList = []
     2730        self.SeqTblHideList = None
    27312731        self.lastSelectedPhaseTab = None # track the last tab pressed on a phase window
    27322732               
     
    44814481                    self.GPXtree.RestoreExposedItems()
    44824482                    self.ResetPlots()
    4483                     Id = GetGPXtreeItemId(self,self.root,'Sequential results')
    4484                     self.GPXtree.SelectItem(Id)
     4483                    sId = GetGPXtreeItemId(self,self.root,'Sequential results')
     4484                    self.GPXtree.SelectItem(sId)
    44854485            finally:
    44864486                dlg.Destroy()
    4487             self.SeqTblHideList = []
     4487           
     4488#            self.SeqTblHideList = []
    44884489        else:
    44894490            self.ErrorDialog('Sequential refinement error',Msg)
     
    64816482    def onSelectSeqVars(event):
    64826483        '''Select which variables will be shown in table'''
     6484        hides = [saveColLabels[1:].index(item) for item in G2frame.SeqTblHideList]
    64836485        dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select columns to hide',
    6484                 'Hide columns',colLabels[1:])
     6486                'Hide columns',saveColLabels[1:])
     6487        dlg.SetSelections(hides)
    64856488        if dlg.ShowModal() == wx.ID_OK:
    6486             G2frame.SeqTblHideList = [colLabels[1:][sel] for sel in dlg.GetSelections()]
     6489            G2frame.SeqTblHideList = [saveColLabels[1:][sel] for sel in dlg.GetSelections()]
    64876490            dlg.Destroy()
    64886491            UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables
     
    70047007    # create a set of values for example evaluation of pseudovars and
    70057008    # this does not work for refinements that have differing numbers of variables.
    7006     #raise Exception
     7009    saveColLabels = colLabels[:]
     7010    if G2frame.SeqTblHideList is None:      #set default hides
     7011        G2frame.SeqTblHideList = [item for item in saveColLabels if 'Back' in item]
     7012        G2frame.SeqTblHideList += [item for item in saveColLabels if 'dA' in item]
     7013        G2frame.SeqTblHideList += [item for item in saveColLabels if ':*:D' in item]
    70077014    VarDict = {}
    70087015    for i,var in enumerate(colLabels):
     
    70147021        else:
    70157022            val,sig = G2frame.colList[i][0],None
    7016 #        if val is None: continue
    7017 #        elif sig is None or sig == 0.:
    7018 #            VarDict[var] = val
    70197023        if striphist(var) not in Dlookup:
    70207024            VarDict[var] = val
  • trunk/GSASIIplot.py

    r3372 r3378  
    69766976                if SeqId:
    69776977                    Seqdata = G2frame.GPXtree.GetItemPyData(SeqId)
    6978                     histNames = [seqKey for seqKey in Seqdata.keys() if 'PWDR' in seqKey]
    6979                     histNames.sort()
     6978                    histNames = Seqdata['histNames']
    69806979                    if key == '0':
    69816980                        G2frame.seq = 0
  • trunk/GSASIIstrMain.py

    r3377 r3378  
    496496#            print (' ***** Refinement aborted *****')
    497497#            return False,Msg.msg
    498     SeqResult['histNames'] = [item for item in G2stIO.GetHistogramNames(GPXfile,['PWDR',]) if item in SeqResult.keys()]
     498    SeqResult['histNames'] = [itm for itm in G2stIO.GetHistogramNames(GPXfile,['PWDR',]) if itm in SeqResult.keys()]
    499499    G2stIO.SetSeqResult(GPXfile,Histograms,SeqResult)
    500500    printFile.close()
Note: See TracChangeset for help on using the changeset viewer.