Changeset 4835 for trunk

Timestamp:

Mar 1, 2021 4:53:48 PM (2 years ago)

Author:

toby

Message:

fix tick animation with weight (w) plot; unable to fix seq plot update with s (select x-axis) option from direct keypress -- works from 'K' button(!)

Location:

trunk

Files:

• GSASIIplot.py (modified) (6 diffs)
• GSASIIseqGUI.py (modified) (1 diff)

trunk/GSASIIplot.py

@@ -805 +805 @@
             if dlg.ShowModal() == wx.ID_OK:
                 sel = dlg.GetSelection()
+                dlg.Destroy()
                 event.key = choices[sel][0]
                 if event.key != ' ':
                     parent.keyPress(event)
                 else:
-                    dlg.Destroy()
                     G2G.G2MessageBox(self.TopLevelParent,
                                      'Use this command only from the keyboard',
                                      'Key not in menu')
                     return
-            dlg.Destroy()
+            else:
+                dlg.Destroy()
 
 
@@ -2200 +2201 @@
                 refOffset = event.ydata
                 refDelt = Page.plotStyle['refDelt']
+            if G2frame.Weight:
+                axis = Page.figure.axes[1]
+            else:
+                axis = Page.figure.gca()
             for pId,phase in enumerate(Page.phaseList):
                 pos = refOffset - pId*refDelt
@@ -2205 +2210 @@
                 coords[1][:] = pos
                 Page.tickDict[phase].set_data(coords)
-                Page.figure.gca().draw_artist(Page.tickDict[phase])
-            Page.canvas.blit(Page.figure.gca().bbox)
+                axis.draw_artist(Page.tickDict[phase])
+            Page.canvas.blit(axis.bbox)
 
         def OnDragDiffCurve(event):
@@ -2342 +2347 @@
                     Page.tickDict[phase].set_zorder(99) # put on top
                 Page.canvas.draw() # refresh with dimmed tickmarks 
-                savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox)
+                if G2frame.Weight:
+                    axis = Page.figure.axes[1]
+                else:
+                    axis = Page.figure.gca()
+                savedplot = Page.canvas.copy_from_bbox(axis.bbox)
                 for f,v in resetlist:  # reset colors back
                     f.set_zorder(0)
@@ -6725 +6734 @@
         if event.key == 's':
             G2frame.seqXaxis = G2frame.seqXselect()
-            wx.CallAfter(Draw)
         elif event.key == 't':
             dlg = G2G.MultiStringDialog(G2frame,'Set titles & labels',[' Title ',' x-Label ',' y-Label '],
@@ -6732 +6740 @@
                 Title,xLabel,yLabel = dlg.GetValues()
             dlg.Destroy()
-            Draw()
         elif event.key == 'l':
             G2frame.seqLines = not G2frame.seqLines
-            Draw()
-            
+        wx.CallAfter(Draw)
+
     def Draw():
         global Title,xLabel,yLabel

trunk/GSASIIseqGUI.py

@@ -394 +394 @@
         dlg = G2G.G2SingleChoiceDialog(
             G2frame.dataDisplay,
-            'Select x-axis parameter for plot or Cancel for sequence number',
+            'Select x-axis parameter for\nplot (Cancel=sequence #)',
             'Select X-axis',
             colNames)