Changeset 4669

Timestamp:

Dec 2, 2020 1:05:56 PM (2 years ago)

Author:

vondreele

Message:

Add '?' help button to upper right for phase tabs General, etc.

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (6 diffs)

trunk/GSASIIddataGUI.py

@@ -1027 +1027 @@
         DData.GetSizer().Clear(True)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,wx.LEFT,5)
+    topSizer = wx.BoxSizer(wx.HORIZONTAL)
+    topSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,wx.LEFT,5)
+    # 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(DData,helpIndex=G2frame.dataWindow.helpKey))
+    mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
     if G2frame.hist:
         topSizer = wx.FlexGridSizer(1,2,5,5)

trunk/GSASIIphsGUI.py

@@ -1870 +1870 @@
                 modulated.Bind(wx.EVT_CHECKBOX,OnModulated)
                 nameSizer.Add(modulated,0,WACV)           
+            # add help button to bring up help web page - at right sede of window
+            nameSizer.Add((-1,-1),1,WACV)
+            nameSizer.Add(G2G.HelpButton(General,helpIndex=G2frame.dataWindow.helpKey),0,WACV)
             return nameSizer
             
@@ -2769 +2772 @@
         mainSizer = wx.BoxSizer(wx.VERTICAL)
         mainSizer.Add((5,5),0)
-        mainSizer.Add(NameSizer(),0)
+        mainSizer.Add(NameSizer(),0,wx.EXPAND)
         mainSizer.Add((5,5),0)        
         mainSizer.Add(CellSizer(),0)
@@ -5158 +5161 @@
  Jour. Phys.: Cond. Matter 2007, 19, 335218. doi: https://doi.org/10.1088/0953-8984/19/33/335218 
  '''))
-            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' RMCProfile setup:'))
+            topSizer = wx.BoxSizer(wx.HORIZONTAL)
+            topSizer.Add(wx.StaticText(G2frame.FRMC,label=' RMCProfile setup:'),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.FRMC,helpIndex=G2frame.dataWindow.helpKey))
+            mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
+#            mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' RMCProfile setup:'))
             if not data['RMC']['RMCProfile']:
                 Atypes = [atype.split('+')[0].split('-')[0] for atype in data['General']['AtomTypes']]
@@ -8977 +8986 @@
             drawOptions.GetSizer().Clear(True)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        #mainSizer.Add(wx.StaticText(drawOptions,-1,' Drawing controls'),0,
-        #                  wx.ALL|wx.CENTER)
-        #G2G.HorizontalLine(mainSizer,drawOptions)
+        topSizer = wx.BoxSizer(wx.HORIZONTAL)
+        topSizer.Add(wx.StaticText(drawOptions,label=' Drawing 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(drawOptions,helpIndex=G2frame.dataWindow.helpKey))
+        mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
         mainSizer.Add(SlopSizer(),0)
         G2G.HorizontalLine(mainSizer,drawOptions)
@@ -9293 +9305 @@
             ' Texture Index J = %7.3f'%(G2lat.textureIndex(textureData['SH Coeff'][1]))),
             0,WACV)
-        mainSizer.Add(titleSizer,0)
+        # add help button to bring up help web page - at right sede of window
+        titleSizer.Add((-1,-1),1,WACV|wx.EXPAND)
+        titleSizer.Add(G2G.HelpButton(Texture,helpIndex=G2frame.dataWindow.helpKey))
+        mainSizer.Add(titleSizer,0,wx.EXPAND)
         mainSizer.Add((0,5),0)
         shSizer = wx.FlexGridSizer(0,6,5,5)
@@ -11498 +11513 @@
         else:
             mainSizer.Add((5,5),0)
-            mainSizer.Add(wx.StaticText(G2frame.MCSA,-1,'MC/SA models:'),0)
+            topSizer = wx.BoxSizer(wx.HORIZONTAL)
+            topSizer.Add(wx.StaticText(G2frame.MCSA,label='MC/SA models:'),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.MCSA,helpIndex=G2frame.dataWindow.helpKey))
+            mainSizer.Add(topSizer,0,WACV|wx.EXPAND)
             mainSizer.Add((5,5),0)
             rbNames = []