Changeset 3878 for trunk/GSASIIdataGUI.py

Timestamp:

Apr 7, 2019 12:07:20 PM (4 years ago)

Author:

toby

Message:

fix problems due to addition of column to SeqRes? table

File:

• trunk/GSASIIdataGUI.py (modified) (4 diffs)

trunk/GSASIIdataGUI.py

@@ -6109 +6109 @@
     def OnSelectUse(event):
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select rows to use','Select rows',histNames)
-        sellist = [i for i,item in enumerate(G2frame.colList[0]) if item]
+        sellist = [i for i,item in enumerate(G2frame.colList[1]) if item]
         dlg.SetSelections(sellist)
         if dlg.ShowModal() == wx.ID_OK:
             sellist = dlg.GetSelections()
             for row in range(G2frame.SeqTable.GetNumberRows()):
-                G2frame.SeqTable.SetValue(row,0,False)
-                G2frame.colList[0][row] = False
+                G2frame.SeqTable.SetValue(row,1,False)
+                G2frame.colList[1][row] = False
             for row in sellist:
-                G2frame.SeqTable.SetValue(row,0,True)
-                G2frame.colList[0][row] = True
+                G2frame.SeqTable.SetValue(row,1,True)
+                G2frame.colList[1][row] = True
             G2frame.dataDisplay.ForceRefresh()
         dlg.Destroy()
@@ -6587 +6587 @@
         else:
             eqObjList = data['SeqParFitEqList']
-        UseFlags = G2frame.SeqTable.GetColValues(0)         
+        UseFlags = G2frame.SeqTable.GetColValues(1)
         for obj in eqObjList:
             # assemble refined vars for this equation
@@ -7003 +7003 @@
                 break
         else: # should not happen
-            uniqCellIndx[pId] = range(6)
+            uniqCellIndx[pId] = list(range(6))
         for i in uniqCellIndx[pId]:
             initialCell[str(pId)+'::A'+str(i)] =  RecpCellTerms[pId][i]
@@ -7084 +7084 @@
     histNames = foundNames
     nRows = len(histNames)
-    G2frame.colList = [range(nRows),nRows*[True]]
+    G2frame.colList = [list(range(nRows)),nRows*[True]]
     G2frame.colSigs = [None,None,]
     colLabels = ['No.','Use',]