Changeset 4667

Timestamp:

Dec 2, 2020 11:18:21 AM (3 years ago)

Author:

vondreele

Message:

Add '?' help button to upper right hand corner of various PWDR data entries (e.g. Limits, Background). Each points to its respective entry in the Help document.

File:

• trunk/GSASIIpwdGUI.py (modified) (5 diffs)

trunk/GSASIIpwdGUI.py

@@ -1682 +1682 @@
     G2frame.dataWindow.ClearData()
     mainSizer = G2frame.dataWindow.GetSizer()
+    topSizer = wx.BoxSizer(wx.HORIZONTAL)
+    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Background used in refinement'),0,WACV)
+    # add help button to bring up help web page - at right sede of window
+    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     mainSizer.Add(BackSizer())
     mainSizer.Add((0,5),0)
@@ -1764 +1770 @@
         G2frame.dataWindow.ClearData()
         mainSizer = G2frame.dataWindow.GetSizer()
-        mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Data used in refinement'),0,WACV)
+        topSizer = wx.BoxSizer(wx.HORIZONTAL)
+        topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Data used in refinement'),0,WACV)
+        # add help button to bring up help web page - at right sede of window
+        topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+        topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+        mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
         mainSizer.Add((5,5))
         mainSizer.Add(LimitSizer())
@@ -2173 +2184 @@
         text = ' Histogram Type: %s  Bank: %d'%(insVal['Type'],insVal['Bank'])
         subSizer.Add(wx.StaticText(G2frame.dataWindow,-1,text),0,WACV)
-        mainSizer.Add(subSizer)
+        # add help button to bring up help web page - at right sede of window
+        subSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+        subSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+        mainSizer.Add(subSizer,0,WACV|wx.EXPAND)
+#        mainSizer.Add(subSizer)
         labelLst[:],elemKeysLst[:],dspLst[:],refFlgElem[:] = [],[],[],[]
         if 'P' in insVal['Type']:                   #powder data
@@ -2907 +2922 @@
     mainSizer = G2frame.dataWindow.GetSizer()
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
+    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
+    # add help button to bring up help web page - at right sede of window
     topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
-    topSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Sample and Experimental Parameters'))
-    # add help button to bring up help web page
-    helpkey = G2frame.dataWindow.helpKey
-    topSizer.Add((30,-1))
-    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=helpkey))
-    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
     mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     nameSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -4377 +4389 @@
     G2frame.dataWindow.ClearData()
     mainSizer = G2frame.dataWindow.GetSizer()
-    mainSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Indexing controls: '),0,WACV)
+    topSizer = wx.BoxSizer(wx.HORIZONTAL)
+    topSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' Indexing controls: '),0,WACV)
+    # add help button to bring up help web page - at right sede of window
+    topSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+    topSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
+    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     mainSizer.Add((5,5),0)
     littleSizer = wx.FlexGridSizer(0,5,5,5)