Changeset 1143 for trunk/GSASIIgrid.py

Timestamp:

Nov 10, 2013 8:32:26 PM (9 years ago)

Author:

toby

Message:

rework constraints to handle names and refine flag for new var (input linear constraints); redo powder 'Sample Parameters'

File:

• trunk/GSASIIgrid.py (modified) (8 diffs)

trunk/GSASIIgrid.py

@@ -141 +141 @@
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
-
+DefaultControls = {
+    'deriv type':'analytic Hessian',    #default controls
+    'min dM/M':0.0001,'shift factor':1.,'max cyc':3,'F**2':True,
+    'minF/sig':0,
+    'Author':'no name',
+    'FreeVar1':'Sample humidity (%)',
+    'FreeVar2':'Sample voltage (V)',
+    'FreeVar3':'Applied load (MN)',
+    }
 ################################################################################
 #### GSAS-II class definitions
@@ -314 +322 @@
                 else:
                     self.invalid = True
-            wx.TextCtrl.SetValue(self,str(val))
+            wx.TextCtrl.SetValue(self,str(G2py3.FormatValue(val)))
         else:
             wx.TextCtrl.SetValue(self,str(val))
@@ -397 +405 @@
         if not self.evaluated: return # true when an expression is evaluated
         if self.result is not None: # retrieve the stored result
-            val = self.result[self.key]
-            self.SetValue(G2py3.FormatValue(val))
+            self.SetValue(self.result[self.key])
         self.evaluated = False # expression has been recast as value, reset flag
         
@@ -716 +723 @@
             self.dct[self.item] = self.values[0] # unknown
 
+################################################################################
+class G2CheckBox(wx.CheckBox):
+    '''A customized version of a CheckBox that automatically initializes
+    the control to match a supplied 
+
+    :param wx.Panel parent: name of panel or frame that will be
+      the parent to the TextCtrl. Can be None.
+    :param str label: text to put on check button
+    :param dict/list loc: the dict or list with the initial value to be
+      placed in the CheckBox. 
+    :param int/str key: the dict key or the list index for the value to be
+      edited by the CheckBox. The ``loc[key]`` element must exist.
+      The CheckBox will be initialized from this value.
+      If the value is anything other that True (or 1), it will be taken as
+      False. 
+    '''
+    def __init__(self,parent,label,loc,key):
+        wx.CheckBox.__init__(self,parent,id=wx.ID_ANY,label=label)
+        self.loc = loc
+        self.key = key
+        self.SetValue(self.loc[self.key]==True)
+        self.Bind(wx.EVT_CHECKBOX, self._OnCheckBox)
+    def _OnCheckBox(self,event):
+        self.loc[self.key] = self.GetValue()
 ################################################################################    
 def CallScrolledMultiEditor(parent,dictlst,elemlst,prelbl=[],postlbl=[],
@@ -2881 +2912 @@
     if 'Author' not in data:
         data['Author'] = 'no name'
+    if 'FreePrm1' not in data:
+        data['FreePrm1'] = 'Sample humidity (%)'
+    if 'FreePrm2' not in data:
+        data['FreePrm2'] = 'Sample voltage (V)'
+    if 'FreePrm3' not in data:
+        data['FreePrm3'] = 'Applied load (MN)'
     #end patch
 
@@ -3085 +3122 @@
        
     def GetSampleParms():
-        sampleParmDict = {'Temperature':[],'Pressure':[],'Humidity':[],'Voltage':[],'Force':[],}
+        sampleParmDict = {'Temperature':300.,'Pressure':1.,
+                          'FreePrm1':0.,'FreePrm2':0.,'FreePrm3':0.,}
         sampleParm = {}
         for name in histNames:
@@ -3513 +3551 @@
             data = G2frame.PatternTree.GetItemPyData(item)
             if not data:           #fill in defaults
-                data = {
-                    #least squares controls
-                    'deriv type':'analytic Hessian','min dM/M':0.0001,'shift factor':1.0,'max cyc':3}
+                data = copy.copy(DefaultControls)    #least squares controls
                 G2frame.PatternTree.SetItemPyData(item,data)                             
             for i in G2frame.Refine: i.Enable(True)
@@ -3668 +3704 @@
         if 'Temperature' not in data:           #temp fix for old gpx files
             data = {'Scale':[1.0,True],'Type':'Debye-Scherrer','Absorption':[0.0,False],'DisplaceX':[0.0,False],
-                'DisplaceY':[0.0,False],'Diffuse':[],'Temperature':300.,'Pressure':1.0,'Humidity':0.0,'Voltage':0.0,
-                'Force':0.0,'Gonio. radius':200.0}
+                'DisplaceY':[0.0,False],'Diffuse':[],'Temperature':300.,'Pressure':1.0,
+                    'FreePrm1':0.,'FreePrm2':0.,'FreePrm3':0.,
+                    'Gonio. radius':200.0}
             G2frame.PatternTree.SetItemPyData(item,data)