Changeset 4803 for trunk

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).

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIphsGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 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

trunk/GSASIIphsGUI.py

@@ -10961 +10961 @@
             choices = sorted(list(rbNames.keys()))
             dlg = G2G.G2SingleChoiceDialog(
-                G2frame,'Select rigid body to add to structure',
+                G2frame,'Select rigid body to\nadd to structure',
                 'Select rigid body',choices)
             dlg.CenterOnParent()

trunk/GSASIIplot.py

@@ -1946 +1946 @@
                 G2frame.selections = []
                 select = dlg.GetSelections()
-                if select:
+                if select and len(select) != len(choices):
                     for Id in select:
                         G2frame.selections.append(choices[Id])

trunk/GSASIIpwdGUI.py

@@ -1700 +1700 @@
     Choices = ['chebyschev','chebyschev-1','cosine','Q^2 power series','Q^-2 power series','lin interpolate','inv interpolate','log interpolate']
     G2frame.dataWindow.ClearData()
-    mainSizer = G2frame.dataWindow.GetSizer()
+    mainSizer = wx.BoxSizer(wx.VERTICAL)
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
     topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Background used in refinement'),0,WACV)
@@ -1714 +1714 @@
     mainSizer.Add((0,5),0)
     mainSizer.Add(BackFileSizer())
+    G2frame.dataWindow.SetSizer(mainSizer)
     G2frame.dataWindow.SetDataSize()