Changeset 117

Timestamp:

Jul 16, 2010 10:19:12 AM (13 years ago)

Author:

vondreel

Message:

refactor background GUI
implement "KILL_FOCUS" for all TextCtrl?

File:

• trunk/GSASIIpwdGUI.py (modified) (10 diffs)

trunk/GSASIIpwdGUI.py

@@ -229 +229 @@
         
 def UpdateBackgroundGrid(self,data):
-    if self.dataDisplay:
-        self.dataFrame.Clear()
+#    if self.dataDisplay:
+    self.dataFrame.Clear()
     BackId = G2gd.GetPatternTreeItemId(self,self.PatternId, 'Background')
+    maxTerm = 9
+    Types = [wg.GRID_VALUE_CHOICE+':chebyschev,another,more',
+        wg.GRID_VALUE_BOOL,
+        wg.GRID_VALUE_NUMBER+':1,'+str(maxTerm)]
+    for i in range(maxTerm):
+        Types.append(wg.GRID_VALUE_FLOAT+':10,3')
     
     def RefreshBackgroundGrid(event):
@@ -253 +259 @@
             msg = wg.GridTableMessage(self.BackTable, 
                 wg.GRIDTABLE_NOTIFY_COLS_DELETED,0,M-N)
-            self.dataDisplay.ProcessTableMessage(msg)                         
+            self.dataDisplay.ProcessTableMessage(msg)
         self.PatternTree.SetItemPyData(BackId,data)
-        UpdateBackgroundGrid(self,data)
                   
-    maxTerm = 9
     self.BackTable = []
     N = len(data[0])
@@ -264 +268 @@
     rowLabels=['background']
     for i in range(M): colLabels.append(str(i+1))
-    Types = [wg.GRID_VALUE_CHOICE+':chebyschev,another,more',
-        wg.GRID_VALUE_BOOL,
-        wg.GRID_VALUE_NUMBER+':1,'+str(maxTerm)]
-    for i in range(maxTerm):
-        Types.append(wg.GRID_VALUE_FLOAT+':10,3')
     self.BackTable = G2gd.Table(data,rowLabels=rowLabels,colLabels=colLabels,types=Types)
     self.dataFrame.SetLabel('Background')
@@ -274 +273 @@
     gridPanel = wx.Panel(self.dataFrame)
     self.dataDisplay = G2gd.GSGrid(gridPanel)                
+    self.dataDisplay.SetTable(self.BackTable, True)
     self.dataDisplay.Bind(wg.EVT_GRID_CELL_CHANGE, RefreshBackgroundGrid)                
-    self.dataDisplay.SetTable(self.BackTable, True)
     self.dataDisplay.SetMargins(0,0)
     self.dataDisplay.AutoSizeColumns(False)
@@ -372 +371 @@
         self.dataDisplay.SetMargins(0,0)
         self.dataDisplay.AutoSizeColumns(False)
-        print len(Types)
         beg = 4
         if Ka2: beg = 6
@@ -508 +506 @@
             stVol = 25
         controls[3] = stVol
+        startVol.SetValue("%d"%(stVol))
         
     def OnBravais(event):
@@ -517 +516 @@
             Zero = min(0.1,max(-0.1,float(zero.GetValue())))
         except ValueError:
-            Zero = 0.0
+            Zero = 0.1
         controls[1] = Zero
         zero.SetValue("%.2f"%(Zero))
@@ -738 +737 @@
     startVol = wx.TextCtrl(self.dataDisplay,value=str(controls[3]),style=wx.TE_PROCESS_ENTER)
     startVol.Bind(wx.EVT_TEXT_ENTER,OnStartVol)
+    startVol.Bind(wx.EVT_KILL_FOCUS,OnStartVol)
     littleSizer.Add(startVol,0,wx.ALIGN_CENTER_VERTICAL)
     mainSizer.Add(littleSizer,0)
@@ -759 +759 @@
     zero = wx.TextCtrl(self.dataDisplay,value=str(controls[1]),style=wx.TE_PROCESS_ENTER)
     zero.Bind(wx.EVT_TEXT_ENTER,OnZero)
+    zero.Bind(wx.EVT_KILL_FOCUS,OnZero)
     littleSizer.Add(zero,0,wx.ALIGN_CENTER_VERTICAL)
     zeroVar = wx.CheckBox(self.dataDisplay,label="Vary? (not implemented)")
@@ -787 +788 @@
             cellVal = wx.TextCtrl(self.dataDisplay,value=(fmt%(controls[6+Id])),style=wx.TE_PROCESS_ENTER)
             cellVal.Bind(wx.EVT_TEXT_ENTER,OnCellChange)        
+            cellVal.Bind(wx.EVT_KILL_FOCUS,OnCellChange)
             littleSizer.Add(cellVal,0,wx.ALIGN_CENTER_VERTICAL)
             cellList.append(cellVal.GetId())