Changeset 4803 for trunk/GSASIIdataGUI.py

Timestamp:

Feb 7, 2021 7:35:35 PM (2 years ago)

Author:

toby

Message:

don't reuse dataWindow sizer for background or PWDR; plotting: reset f by select all (or none).

File:

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

trunk/GSASIIdataGUI.py

@@ -5195 +5195 @@
             if 'msg' in Rvals: text += '\n' + Rvals['msg'] + '\n'
             if 'Aborted' in Rvals:
-                text += '\ERROR: Minimizer failed to reduce chi**2!\n'
+                text += '\nWARNING: Minimizer halted because chi**2 increased\n'
             if lamMax >= 10.:
                 text += '\nWARNING: Steepest descents dominates;'+   \
@@ -8523 +8523 @@
     
     if G2frame.dataWindow:
-        G2frame.dataWindow.ClearData() 
-    mainSizer = G2frame.dataWindow.GetSizer()
+        G2frame.dataWindow.ClearData()
+    #G2frame.dataWindow.GetSizer() # don't use this since may be wx.HORIZONTAL or wx.VERTICAL
+    bigSizer = wx.BoxSizer(wx.HORIZONTAL)
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,5),)
     wtSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -8636 +8638 @@
         mainSizer.Add(mSizer)
         
+    bigSizer.Add(mainSizer)    
+    bigSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=kind))
+    G2frame.dataWindow.SetSizer(bigSizer)
+    
     G2frame.GPXtree.SetItemPyData(item,data)
     G2frame.PatternId = item