Changeset 3193

Timestamp:

Dec 15, 2017 9:59:48 AM (5 years ago)

Author:

toby

Message:

better error msg w/o calibrant; search comments when Sample Parameters FreePrm? label is changed

Location:

trunk

Files:

• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 diffs)
• help/gsasII.html (modified) (2 diffs)

trunk/GSASIIimgGUI.py

@@ -176 +176 @@
 
     def OnCalibrate(event):
+        if not data['calibrant']:
+            G2G.G2MessageBox(G2frame,'No calibrant material specified.\n'+
+                             'Please correct this and try again.')
+            return
         G2frame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick (shift key to force pick), RB on point to delete else RB to finish',1)
         G2frame.ifGetRing = True

trunk/GSASIIpwdGUI.py

@@ -2344 +2344 @@
         wx.CallAfter(UpdateSampleGrid,G2frame,data)
         
+    def SearchAllComments(value,tc,*args,**kwargs):
+        '''Called when the label for a FreePrm is changed: the comments for all PWDR
+        histograms are searched for a "label=value" pair that matches the label (case
+        is ignored) and the values are then set to this value, if it can be converted
+        to a float.
+        '''
+        id, cookie = G2frame.GPXtree.GetFirstChild(G2frame.root)
+        while id:
+            name = G2frame.GPXtree.GetItemText(id)
+            if 'PWDR' in name:
+                Comments = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id,'Comments'))
+                Sample =   G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'Sample Parameters'))
+                for i,item in enumerate(Comments):
+                    itemSp = item.split('=')
+                    if value.lower() == itemSp[0].lower():
+                        try:
+                            Sample[tc.key] = float(itemSp[1])
+                        except:
+                            print('"{}" has an invalid value in Comments from {}'
+                                  .format(item.strip(),name))
+            id, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
+        wx.CallLater(100,UpdateSampleGrid,G2frame,data)
+        
+        
     ######## DEBUG #######################################################
     #import GSASIIpwdGUI
@@ -2464 +2488 @@
         parmSizer.Add(parmVal,0,WACV)
     Info = {}
-        
+    
     for key in ('FreePrm1','FreePrm2','FreePrm3'):
         parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,Controls,key,typeHint=str,
-                                        notBlank=False)
+                                        notBlank=False,OnLeave=SearchAllComments)
         parmSizer.Add(parmVal,1,wx.EXPAND)
         parmVal = G2G.ValidatedTxtCtrl(G2frame.dataWindow,data,key,typeHint=float)

trunk/help/gsasII.html

@@ -4678 +4678 @@
 <p class=MsoNormal style='margin-left:.5in'><span style='mso-fareast-font-family:
 "Times New Roman"'>This window show the various sample dependent parameters for
-this powder pattern. The presence of a refine button indicates which can be
-refined while others are fixed. All values can be changed in this window. NB:
-for powder data be sure the correct instrument type is selected (<b
+this powder pattern. The presence of a refine button indicates that a
+parameter can be refined (all others are fixed.) All values shown in
+this window can be edited. 
+
+Note that the last three parameters (named FreePrm<I>X</I>, <I>X</I>=1,2,3) have
+labels that can be changed. If changed in one histogram, the same
+label is used for all histograms. When a label is changed, the
+Comments tree item for each PWDR histogram is searched for a matching
+"Label=value" pair (differences in letter case between the two label
+strings is ignored). When found, the value is converted to a float and
+saved as the appropriate Sample Parameter.
+
+NB: for powder data be sure the correct instrument type is selected (<b
 style='mso-bidi-font-weight:normal'>Debye-<span class=SpellE>Scherrer</span></b>
 or <b style='mso-bidi-font-weight:normal'>Bragg-Brentano</b>).<span
-class=MsoHyperlink><span style='color:windowtext;text-decoration:none;
-text-underline:none'><o:p></o:p></span></span></span></p>
+class=MsoHyperlink></span></span></p>
 
 <h5 style='margin-left:.5in'>
@@ -7116 +7125 @@
 <hr size=2 width="100%" align=center>
 
-<!-- hhmts start -->Last modified: Sun Oct 15 18:58:51 CDT 2017 <!-- hhmts end -->
+<!-- hhmts start -->Last modified: Thu Dec 14 23:57:16 CST 2017 <!-- hhmts end -->
 
 </div>