Changeset 3973

Timestamp:

May 12, 2019 10:08:22 PM (4 years ago)

Author:

toby

Message:

Load all fix; doc updates

Location:

trunk

Files:

• GSASIIctrlGUI.py (modified) (2 diffs)
• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIfiles.py (modified) (3 diffs)
• config_example.py (modified) (1 diff)

trunk/GSASIIctrlGUI.py

@@ -2576 +2576 @@
             txt.SetFont(font1)
             Sizer.Add(txt,0,wx.ALL|wx.EXPAND|WACV,0)
+            txtSize = txt.GetSize()[1]
         else:
             Sizer.Add(wx.StaticText(panel,label=title),0,WACV)
+            txtSize = 0
         columnsSizer = wx.BoxSizer(wx.HORIZONTAL)
         self.sel = []
@@ -2620 +2622 @@
         Size = [450,375]
         panel.SetSize(Size)
-        Size[0] += 25; Size[1]+= 25+txt.GetSize()[1]
+        Size[0] += 25; Size[1]+= 25+txtSize
         self.SetSize(Size)
         

trunk/GSASIIdataGUI.py

@@ -5239 +5239 @@
         self.SampleEdit.Append(G2G.wxID_SAMPLEFLAGCOPY,'Copy flags','Copy sample parameter refinement flags to other histograms')
         self.SampleEdit.Append(G2G.wxID_SAMPLE1VAL,'Set one value','Set one sample parameter value across multiple histograms')
-        self.SampleEdit.Append(G2G.wxID_ALLSAMPLELOAD,'Load all','Load sample parmameters over multiple histograms')
+        self.SampleEdit.Append(G2G.wxID_ALLSAMPLELOAD,'Load all','Load sample parameters over multiple histograms')
         self.SampleEdit.Append(G2G.wxID_RESCALEALL,'Rescale all','Rescale all data with selected range')
         self.PostfillDataMenu()

trunk/GSASIIfiles.py

@@ -8 +8 @@
 ########### SVN repository information ###################
 '''
-*GSASIIfile: data (non-GUI) I/O routines*
-=========================================
+*GSASIIfiles: data (non-GUI) I/O routines*
+==========================================
 
 Module with miscellaneous routines for input and output from files.
@@ -430 +430 @@
     The .par file has any number of columns separated by spaces.
     The directory for the file must be specified in
-    Config variable ``Column_Metadata_directory``.
+    Config variable :var:`config_example.Column_Metadata_directory`.
     As an index to the .par file a second "label file" must be specified with the
     same file root name as the .par file but the extension must be .XXX_lbls (where
@@ -480 +480 @@
     Note that several keywords, if defined in the Comments, will be found and
     placed in the appropriate section of the powder histogram(s)'s Sample
-    Parameters after an integration: ``Temperature``,``Pressure``,``Time``,
-    ``FreePrm1``,``FreePrm2``,``FreePrm3``,``Omega``,``Chi``, and ``Phi``. 
+    Parameters after an integration: ``Temperature``, ``Pressure``, ``Time``,
+    ``FreePrm1``, ``FreePrm2``, ``FreePrm3``, ``Omega``, ``Chi``, and ``Phi``. 
 
     After the Python code, supply a vertical bar (|) and then a list of one

trunk/config_example.py

@@ -184 +184 @@
 Column_Metadata_directory = None
 '''When specified and when images are read, GSAS-II will read metadata from a 1-ID
-style .par and a .EXT_lbls (EXT = image extension) or .lbls file. See :func:`GSASfiles.readColMetadata` for
+style .par and a .EXT_lbls (EXT = image extension) or .lbls file. See :func:`GSASIIfile.readColMetadata` for
 information on how this is done.
 '''