Changeset 2870

Timestamp:

Jun 19, 2017 4:30:36 PM (6 years ago)

Author:

toby

Message:

Allow hiding of columns in Seq Table

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIgrid.py (modified) (7 diffs)

trunk/GSASII.py

@@ -2654 +2654 @@
         self.lastTreeSetting = []
         self.ExpandingAll = False
+        self.SeqTblHideList = []
                 
         arg = sys.argv
@@ -4279 +4280 @@
             finally:
                 dlg.Destroy()
+            self.SeqTblHideList = []
         else:
             self.ErrorDialog('Sequential refinement error',Msg)

trunk/GSASIIgrid.py

@@ -139 +139 @@
 [ wxID_RENAMESEQSEL,wxID_SAVESEQSEL,wxID_SAVESEQSELCSV,wxID_SAVESEQCSV,wxID_PLOTSEQSEL,
   wxID_ORGSEQSEL,wxADDSEQVAR,wxDELSEQVAR,wxEDITSEQVAR,wxCOPYPARFIT,wxID_AVESEQSEL,
-  wxADDPARFIT,wxDELPARFIT,wxEDITPARFIT,wxDOPARFIT,wxADDSEQDIST,wxADDSEQANGLE
-] = [wx.NewId() for item in range(17)]
+  wxADDPARFIT,wxDELPARFIT,wxEDITPARFIT,wxDOPARFIT,wxADDSEQDIST,wxADDSEQANGLE,wxID_ORGSEQINC,
+] = [wx.NewId() for item in range(18)]
 
 [ wxID_MODELCOPY,wxID_MODELFIT,wxID_MODELADD,wxID_ELEMENTADD,wxID_ELEMENTDELETE,
@@ -1775 +1775 @@
         self.SequentialFile.Append(id=wxID_AVESEQSEL, kind=wx.ITEM_NORMAL,text='Compute average',
             help='Compute average for selected parameter')            
-        self.SequentialFile.Append(id=wxID_ORGSEQSEL, kind=wx.ITEM_NORMAL,text='Reorganize',
-            help='Reorganize variables where variables change')
+#        self.SequentialFile.Append(id=wxID_ORGSEQSEL, kind=wx.ITEM_NORMAL,text='Reorganize',
+#            help='Reorganize variables where variables change')
+        self.SequentialFile.Append(id=wxID_ORGSEQINC, kind=wx.ITEM_NORMAL,text='Hide columns...',
+            help='Select columns to remove from displayed table')
         self.SequentialPvars = wx.Menu(title='')
         self.SequentialMenu.Append(menu=self.SequentialPvars, title='Pseudo Vars')
@@ -3089 +3091 @@
             
     def OnReOrgSelSeq(event):
-        'Reorder the columns'
+        'Reorder the columns -- probably not fully implemented'
         G2G.GetItemOrder(G2frame,VaryListChanges,vallookup,posdict)    
         UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables
@@ -3706 +3708 @@
             print('Error: Id not found. This should not happen!')
         G2IO.ExportSequential(G2frame,data,*vals)
+
+    def onSelectSeqVars(event):
+        '''Select which variables will be shown in table'''
+        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame, 'Select columns to hide',
+                'Hide columns',colLabels[1:])
+        if dlg.ShowModal() == wx.ID_OK:
+            G2frame.SeqTblHideList = [colLabels[1:][sel] for sel in dlg.GetSelections()]
+            dlg.Destroy()
+            UpdateSeqResults(G2frame,data,G2frame.dataDisplay.GetSize()) # redisplay variables
+        else:
+            dlg.Destroy()
     
     #def GridRowLblToolTip(row): return 'Row ='+str(row)
@@ -3807 +3820 @@
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnPlotSelSeq, id=wxID_PLOTSEQSEL)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnAveSelSeq, id=wxID_AVESEQSEL)
-    G2frame.dataFrame.Bind(wx.EVT_MENU, OnReOrgSelSeq, id=wxID_ORGSEQSEL)
+    #G2frame.dataFrame.Bind(wx.EVT_MENU, OnReOrgSelSeq, id=wxID_ORGSEQSEL)
+    G2frame.dataFrame.Bind(wx.EVT_MENU, onSelectSeqVars, id=wxID_ORGSEQINC)
     G2frame.dataFrame.Bind(wx.EVT_MENU, AddNewPseudoVar, id=wxADDSEQVAR)
     G2frame.dataFrame.Bind(wx.EVT_MENU, AddNewDistPseudoVar, id=wxADDSEQDIST)
@@ -3866 +3880 @@
     if missing:
         print ' Warning: Total of %d data sets missing from sequential results'%(missing)
-    if len(VaryListChanges) > 1:
-        G2frame.dataFrame.SequentialFile.Enable(wxID_ORGSEQSEL,True)
-    else:
-        G2frame.dataFrame.SequentialFile.Enable(wxID_ORGSEQSEL,False)
+    #if len(VaryListChanges) > 1:
+    #    G2frame.dataFrame.SequentialFile.Enable(wxID_ORGSEQSEL,True)
+    #else:
+    #    G2frame.dataFrame.SequentialFile.Enable(wxID_ORGSEQSEL,False)
     #-----------------------------------------------------------------------------------
     # build up the data table by columns -----------------------------------------------
@@ -4125 +4139 @@
     # add recip cell coeff. values
     VarDict.update({var:val for var,val in newCellDict.values()})
+
+    # remove items to be hidden from table
+    for l in reversed(range(len(colLabels))):
+        if colLabels[l] in G2frame.SeqTblHideList:
+            del colLabels[l]
+            del G2frame.colList[l]
+            del G2frame.colSigs[l]
 
     G2frame.dataFrame.currentGrids = []