Changeset 3378

Timestamp:

May 10, 2018 11:43:22 AM (6 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:

• GSASIIdataGUI.py (modified) (5 diffs)
• GSASIIplot.py (modified) (1 diff)
• GSASIIstrMain.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -2728 +2728 @@
         self.lastTreeSetting = [] # used to track the selected Tree item before a refinement
         self.ExpandingAll = False
-        self.SeqTblHideList = []
+        self.SeqTblHideList = None
         self.lastSelectedPhaseTab = None # track the last tab pressed on a phase window
                 
@@ -4481 +4481 @@
                     self.GPXtree.RestoreExposedItems()
                     self.ResetPlots()
-                    Id = GetGPXtreeItemId(self,self.root,'Sequential results')
-                    self.GPXtree.SelectItem(Id)
+                    sId = GetGPXtreeItemId(self,self.root,'Sequential results')
+                    self.GPXtree.SelectItem(sId)
             finally:
                 dlg.Destroy()
-            self.SeqTblHideList = []
+            
+#            self.SeqTblHideList = []
         else:
             self.ErrorDialog('Sequential refinement error',Msg)
@@ -6481 +6482 @@
     def onSelectSeqVars(event):
         '''Select which variables will be shown in table'''
+        hides = [saveColLabels[1:].index(item) for item in G2frame.SeqTblHideList]
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select columns to hide',
-                'Hide columns',colLabels[1:])
+                'Hide columns',saveColLabels[1:])
+        dlg.SetSelections(hides)
         if dlg.ShowModal() == wx.ID_OK:
-            G2frame.SeqTblHideList = [colLabels[1:][sel] for sel in dlg.GetSelections()]
+            G2frame.SeqTblHideList = [saveColLabels[1:][sel] for sel in dlg.GetSelections()]
             dlg.Destroy()
             UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables
@@ -7004 +7007 @@
     # create a set of values for example evaluation of pseudovars and 
     # this does not work for refinements that have differing numbers of variables.
-    #raise Exception
+    saveColLabels = colLabels[:]
+    if G2frame.SeqTblHideList is None:      #set default hides
+        G2frame.SeqTblHideList = [item for item in saveColLabels if 'Back' in item]
+        G2frame.SeqTblHideList += [item for item in saveColLabels if 'dA' in item]
+        G2frame.SeqTblHideList += [item for item in saveColLabels if ':*:D' in item]
     VarDict = {}
     for i,var in enumerate(colLabels):
@@ -7014 +7021 @@
         else:
             val,sig = G2frame.colList[i][0],None
-#        if val is None: continue
-#        elif sig is None or sig == 0.:
-#            VarDict[var] = val
         if striphist(var) not in Dlookup:
             VarDict[var] = val

trunk/GSASIIplot.py

@@ -6976 +6976 @@
                 if SeqId:
                     Seqdata = G2frame.GPXtree.GetItemPyData(SeqId)
-                    histNames = [seqKey for seqKey in Seqdata.keys() if 'PWDR' in seqKey]
-                    histNames.sort()
+                    histNames = Seqdata['histNames']
                     if key == '0':
                         G2frame.seq = 0

trunk/GSASIIstrMain.py

@@ -496 +496 @@
 #            print (' ***** Refinement aborted *****')
 #            return False,Msg.msg
-    SeqResult['histNames'] = [item for item in G2stIO.GetHistogramNames(GPXfile,['PWDR',]) if item in SeqResult.keys()]
+    SeqResult['histNames'] = [itm for itm in G2stIO.GetHistogramNames(GPXfile,['PWDR',]) if itm in SeqResult.keys()]
     G2stIO.SetSeqResult(GPXfile,Histograms,SeqResult)
     printFile.close()