Changeset 2104

Timestamp:

Dec 23, 2015 2:44:11 PM (7 years ago)

Author:

toby

Message:

fix integration table bugs; start on int table edit

File:

• trunk/GSASIIimgGUI.py (modified) (7 diffs)

trunk/GSASIIimgGUI.py

@@ -2068 +2068 @@
                         self.Evaluator = DefineEvaluator(dlg)
                         self.params['Mode'] = 'table'
+                        r2E.Enable(True)
                     else:
                         self.useActive.SetValue(True)
@@ -2077 +2078 @@
                 self.useActive.SetLabel("Active Image: "+
                         G2frame.PatternTree.GetItemText(self.imageBase))
+
+        def OnEditTable(event): 
+            raise Exception
 
         ##################################################
@@ -2117 +2121 @@
         lblsizr.Add(self.useActive,1,wx.EXPAND,1)
         self.useActive.SetValue(True)
+        minisizer = wx.BoxSizer(wx.HORIZONTAL)
         r2 = wx.RadioButton(mnpnl, wx.ID_ANY, "From look-up table")
-        lblsizr.Add(r2,1,wx.EXPAND,1)
+        minisizer.Add(r2,1,wx.ALIGN_LEFT,1)
         r2.Bind(wx.EVT_RADIOBUTTON, OnRadioSelect)
+        r2E = wx.Button(mnpnl,  wx.ID_ANY, "Edit table")
+        minisizer.Add(r2E,1,wx.ALIGN_LEFT,1)
+        r2E.Enable(False)
+        r2E.Bind(wx.EVT_BUTTON, OnEditTable)
+        # bind button and deactivate be default
+        lblsizr.Add(minisizer)
         mnsizer.Add(lblsizr,1,wx.EXPAND,1)
 
@@ -2267 +2278 @@
                 G2IO.ExportPowder(G2frame,treename,fil,dfmt)
                 
-    def ResetFromTable(self):
+    def ResetFromTable(self,dist):
         '''Sets integration parameters based on values from
         the lookup table
         '''
-        dist = controlsDict['distance']
+        #dist = self.controlsDict['distance']
         interpDict,imgctrl,immask = self.Evaluator(dist) # interpolated calibration values
         #if GSASIIpath.GetConfigValue('debug'):
@@ -2388 +2399 @@
                 ImageMasks = G2frame.PatternTree.GetItemPyData(
                     G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
-                self.ResetFromTable()
+                self.ResetFromTable(controlsDict['distance'])
                 # update controls from master
                 controlsDict.update(self.ImageControls)
@@ -2409 +2420 @@
                     G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks'))
                 if self.params['Mode'] == 'table': # look up parameter values from table
-                    self.ResetFromTable()
+                    self.ResetFromTable(controlsDict['distance'])
                 # update controls from master
                 controlsDict.update(self.ImageControls)
@@ -2541 +2552 @@
             while S:
                 if S[0] != '#':
-                    [key,val] = S[:-1].split(':')
+                    [key,val] = S[:-1].split(':',1)
                     tmpDict[key] = eval(val)
                 S = fp.readline()