Changeset 4922 for trunk

Timestamp:

Jun 6, 2021 2:22:19 PM (4 months ago)

Author:

toby

Message:

improve version notice display

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (3 diffs)
• versioninfo.txt (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -5419 +5419 @@
       .gpx file
     '''
-    def tblLine():
-        txtbox = wx.StaticText(dlg,wx.ID_ANY,'',size=(-1,3))
+    def tblLine(dlg,pixels=3):
+        'place line in table'
+        txtbox = wx.StaticText(dlg,wx.ID_ANY,'',size=(-1,pixels))
         txtbox.SetBackgroundColour(wx.Colour(0,0,0))
         tblSizer.Add(txtbox,0,wx.EXPAND)
-        txtbox = wx.StaticText(dlg,wx.ID_ANY,'',size=(-1,3))
+        txtbox = wx.StaticText(dlg,wx.ID_ANY,'',size=(-1,pixels))
         txtbox.SetBackgroundColour(wx.Colour(0,0,0))
         tblSizer.Add(txtbox,0,wx.EXPAND)
-
+    size = (700,500)
     rev = GSASIIpath.svnGetRev()
     if rev is None: rev = GSASIIpath.GetVersionNumber()
@@ -5477 +5478 @@
     sizer = wx.BoxSizer(wx.VERTICAL)
     txtbox = wx.StaticText(dlg,wx.ID_ANY,
-            'Please read the notices below about GSAS-II updates since'
+            'Please read the notices below about major GSAS-II updates since'
             ' this project was last saved')
-    txtbox.Wrap(490)
     sizer.Add(txtbox,0)
+    txtbox.Wrap(size[0]-10)
     sizer.Add((10,10))
+    panel = wxscroll.ScrolledPanel(dlg, wx.ID_ANY, size=(size[0]-20, size[1]))
+    sizer.Add(panel,1,wx.EXPAND,1)
     tblSizer = wx.FlexGridSizer(0,2,5,10)
-    tblLine()
-    txtbox = wx.StaticText(dlg,wx.ID_ANY,'version')
+    tblLine(panel)
+    txtbox = wx.StaticText(panel,wx.ID_ANY,'Version')
     tblSizer.Add(txtbox,0,wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
-    txtbox = wx.StaticText(dlg,wx.ID_ANY,'notice')
+    txtbox = wx.StaticText(panel,wx.ID_ANY,'Notice')
     tblSizer.Add(txtbox,0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND)
-    tblLine()
-    sizer.Add(tblSizer)
+    tblLine(panel)
     sizer.Add((10,10))
     btnsizer = wx.StdDialogButtonSizer()
@@ -5503 +5505 @@
     sizer.Add((-1,5))
     sizer.Add(btnsizer,0,wx.ALIGN_CENTER,50)
-    for key in reversed(sorted(list(noticeDict.keys()))):
-        txtbox = wx.StaticText(dlg,wx.ID_ANY,str(key))
+    for i,key in enumerate(sorted(noticeDict,reverse=True)):
+        if i != 0: tblLine(panel,1)
+        txtbox = wx.StaticText(panel,wx.ID_ANY,str(key))
         txtbox.SetBackgroundColour(wx.Colour(250,250,250))
         tblSizer.Add(txtbox,0,wx.ALIGN_CENTER|wx.ALIGN_CENTER_VERTICAL)
-        txtbox = wx.StaticText(dlg,wx.ID_ANY,noticeDict[key])
-        txtbox.Wrap(420)
+        txtbox = wx.StaticText(panel,wx.ID_ANY,noticeDict[key])
+        txtbox.Wrap(size[0]-110)
         txtbox.SetBackgroundColour(wx.Colour(250,250,250))
         tblSizer.Add(txtbox)
-    tblLine()
-    
+    tblLine(panel)
+    panel.SetSizer(tblSizer)
+    panel.SetAutoLayout(1)
+    panel.SetupScrolling()
     dlg.SetSizer(sizer)
     sizer.Fit(dlg)

trunk/versioninfo.txt

@@ -2 +2 @@
 # update GSASIIctrlGUI.updateNoticeDict). Lines starting with "#" are
 # comments.
-# Each version is tagged with a version number and a colon. All subsequent text
-# is the notice for that version with one or more blank lines between.
-
-# 5000: This is text for version 5000. It spans several lines. 
-#   Note that indents are ignored, but 2 percent signs create a newline. %%%%This
-#  starts on a new line with a blank after the previous.
-
-# 1234: This is text for version 1234. The second colon here (:) is ignored. 
+# Each version should be tagged with a version number and a colon. All subsequent text
+# will be part of the the notice for that version. Separate versions
+# with one or more blank lines between. Note that line breaks and
+# indentation are ignored. Use && to insert a single "&"
+# character. Use %% to insert a new line. 
 
 4919: With this version of GSAS-II, the profile functions have been changed to account for possible variation in the powder 
-pattern step size across the scan. This will likely change the histogram scale factor (see Sample Parameters), peak
-intensities (see Peak List) and background peak intensities (see Background). For Constant Wavelength data, they will change 
-by a factor related to the pattern step size, e.g. for 11BM data with a step size of 0.001 deg 2-theta the new scale factor will be 
-~0.1 times the old one. If you choose to repeat the refinement for this project, you may need to be sure that parameters affecting 
-peak shape are turned off for the initial refinement. It should converge quickly to the new scale factor.
-%%For TOF data there may be similar changes to the scale factor && peak intensities as noted above. Significant improvement in profile 
-residuals have been observed in some cases with these new functions.
-This change is of no consequence for single crystal, small angle or reflectometry data in GSAS-II.
+  pattern step size across the scan. This will likely change the histogram scale factor (see Sample Parameters), peak
+  intensities (see Peak List) and background peak intensities (see
+  Background). %%%%If you choose to repeat the refinement for
+  this project, you may need to turn off the parameters affecting 
+  peak shape for an initial refinement. It should converge quickly to the new scale factor.
+  %%%%For Constant Wavelength data, the scale factor, etc. will change 
+  by a factor related to the pattern step size, e.g. for 11-BM data with a step size of 0.001 deg. 2-theta the new scale factor will be 
+  ~0.1 times the old one. 
+  For TOF data there may be similar changes to the scale factor &&
+  peak intensities, as noted above.
+  Significant improvement in profile residuals have been observed in some cases with these new functions.
+  This change is of no consequence for single crystal, small angle or
+  reflectometry data in GSAS-II.