Changeset 4841 for trunk

Timestamp:

Mar 6, 2021 11:23:19 AM (2 years ago)

Author:

toby

Message:

fix bind problem w/Sequential plots; open sequential fit tree item on start

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (4 diffs)

trunk/GSASIIdataGUI.py

@@ -4355 +4355 @@
         Id = 0
         phaseId = None
+        seqId = None
         G2IO.ProjFileOpen(self)
         self.GPXtree.SetItemText(self.root,'Project: '+self.GSASprojectfile)
@@ -4368 +4369 @@
                     else:
                         Id = item
+            elif name.startswith("Sequential") and self.testSeqRefineMode():
+                seqId = item
             elif name == "Phases":
                 phaseId = item
@@ -4377 +4380 @@
         if phaseId: # show all phases
             self.GPXtree.Expand(phaseId)
-        if Id:
+        if seqId:
+            self.EnablePlot = True
+            SelectDataTreeItem(self,seqId)
+            self.GPXtree.SelectItem(seqId)  # needed on OSX or item is not selected in tree; perhaps not needed elsewhere
+        elif Id:
             self.EnablePlot = True
             self.GPXtree.Expand(Id)

trunk/GSASIIplot.py

@@ -6956 +6956 @@
         elif event.key == 'l':
             G2frame.seqLines = not G2frame.seqLines
-        wx.CallAfter(Draw)
-
-    def Draw():
+        wx.CallAfter(SeqDraw)
+
+    def SeqDraw():
         global Title,xLabel,yLabel
+        Plot=Page.figure.gca()
         G2frame.G2plotNB.status.SetStatusText(
             'press L to toggle lines, S to select X axis, T to change titles (reselect column to show?)',1)
@@ -7013 +7014 @@
                 Page.fitvals = Page.fitvals[::-1]
             Plot.plot(X,Page.fitvals,label='Fit',color=colors[(ic+2)%NC])
-            
+
+        #### Begin self.testSeqRefineMode() ===================== 
         Plot.legend(loc='best')
         if Title:
@@ -7028 +7030 @@
             Plot.set_ylabel('Parameter values')
         Page.canvas.draw()
-            
+
     G2frame.seqXselect = SelectX
     try:
@@ -7052 +7054 @@
     Page.fitvals = fitvals
         
-    Draw()
+    SeqDraw()
                 
 ##### PlotExposedImage & PlotImage ################################################################################