Changeset 2104
- Timestamp:
- Dec 23, 2015 2:44:11 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIimgGUI.py
r2103 r2104 2068 2068 self.Evaluator = DefineEvaluator(dlg) 2069 2069 self.params['Mode'] = 'table' 2070 r2E.Enable(True) 2070 2071 else: 2071 2072 self.useActive.SetValue(True) … … 2077 2078 self.useActive.SetLabel("Active Image: "+ 2078 2079 G2frame.PatternTree.GetItemText(self.imageBase)) 2080 2081 def OnEditTable(event): 2082 raise Exception 2079 2083 2080 2084 ################################################## … … 2117 2121 lblsizr.Add(self.useActive,1,wx.EXPAND,1) 2118 2122 self.useActive.SetValue(True) 2123 minisizer = wx.BoxSizer(wx.HORIZONTAL) 2119 2124 r2 = wx.RadioButton(mnpnl, wx.ID_ANY, "From look-up table") 2120 lblsizr.Add(r2,1,wx.EXPAND,1)2125 minisizer.Add(r2,1,wx.ALIGN_LEFT,1) 2121 2126 r2.Bind(wx.EVT_RADIOBUTTON, OnRadioSelect) 2127 r2E = wx.Button(mnpnl, wx.ID_ANY, "Edit table") 2128 minisizer.Add(r2E,1,wx.ALIGN_LEFT,1) 2129 r2E.Enable(False) 2130 r2E.Bind(wx.EVT_BUTTON, OnEditTable) 2131 # bind button and deactivate be default 2132 lblsizr.Add(minisizer) 2122 2133 mnsizer.Add(lblsizr,1,wx.EXPAND,1) 2123 2134 … … 2267 2278 G2IO.ExportPowder(G2frame,treename,fil,dfmt) 2268 2279 2269 def ResetFromTable(self ):2280 def ResetFromTable(self,dist): 2270 2281 '''Sets integration parameters based on values from 2271 2282 the lookup table 2272 2283 ''' 2273 dist =controlsDict['distance']2284 #dist = self.controlsDict['distance'] 2274 2285 interpDict,imgctrl,immask = self.Evaluator(dist) # interpolated calibration values 2275 2286 #if GSASIIpath.GetConfigValue('debug'): … … 2388 2399 ImageMasks = G2frame.PatternTree.GetItemPyData( 2389 2400 G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks')) 2390 self.ResetFromTable( )2401 self.ResetFromTable(controlsDict['distance']) 2391 2402 # update controls from master 2392 2403 controlsDict.update(self.ImageControls) … … 2409 2420 G2gd.GetPatternTreeItemId(G2frame,imgId, 'Masks')) 2410 2421 if self.params['Mode'] == 'table': # look up parameter values from table 2411 self.ResetFromTable( )2422 self.ResetFromTable(controlsDict['distance']) 2412 2423 # update controls from master 2413 2424 controlsDict.update(self.ImageControls) … … 2541 2552 while S: 2542 2553 if S[0] != '#': 2543 [key,val] = S[:-1].split(':' )2554 [key,val] = S[:-1].split(':',1) 2544 2555 tmpDict[key] = eval(val) 2545 2556 S = fp.readline()
Note: See TracChangeset
for help on using the changeset viewer.