Changeset 439 for trunk/GSASIIphsGUI.py
- Timestamp:
- Dec 10, 2011 7:04:47 PM (11 years ago)
- File:
-
- 1 edited
-
trunk/GSASIIphsGUI.py (modified) (35 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIphsGUI.py
r437 r439 1993 1993 textureData['PFxyz'] = xyz 1994 1994 G2plt.PlotTexture(self,data) 1995 1996 Texture.DestroyChildren()1997 dataDisplay = wx.Panel(Texture)1995 1996 if Texture.GetSizer(): 1997 Texture.GetSizer().Clear(True) 1998 1998 mainSizer = wx.BoxSizer(wx.VERTICAL) 1999 1999 titleSizer = wx.BoxSizer(wx.HORIZONTAL) 2000 titleSizer.Add(wx.StaticText( dataDisplay,-1,'Spherical harmonics texture data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL)2001 titleSizer.Add(wx.StaticText( dataDisplay,-1,2000 titleSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonics texture data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL) 2001 titleSizer.Add(wx.StaticText(Texture,-1, 2002 2002 ' Texture Index J = %7.3f'%(G2lat.textureIndex(textureData['SH Coeff'][1]))), 2003 2003 0,wx.ALIGN_CENTER_VERTICAL) … … 2005 2005 mainSizer.Add((0,5),0) 2006 2006 shSizer = wx.FlexGridSizer(1,6,5,5) 2007 shSizer.Add(wx.StaticText( dataDisplay,-1,'Texture model: '),0,wx.ALIGN_CENTER_VERTICAL)2008 shModel = wx.ComboBox( dataDisplay,-1,value=textureData['Model'],choices=shModels,2007 shSizer.Add(wx.StaticText(Texture,-1,'Texture model: '),0,wx.ALIGN_CENTER_VERTICAL) 2008 shModel = wx.ComboBox(Texture,-1,value=textureData['Model'],choices=shModels, 2009 2009 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2010 2010 shModel.Bind(wx.EVT_COMBOBOX,OnShModel) 2011 2011 shSizer.Add(shModel,0,wx.ALIGN_CENTER_VERTICAL) 2012 shSizer.Add(wx.StaticText( dataDisplay,-1,' Harmonic order: '),0,wx.ALIGN_CENTER_VERTICAL)2013 shOrder = wx.ComboBox( dataDisplay,-1,value=str(textureData['Order']),choices=[str(2*i) for i in range(18)],2012 shSizer.Add(wx.StaticText(Texture,-1,' Harmonic order: '),0,wx.ALIGN_CENTER_VERTICAL) 2013 shOrder = wx.ComboBox(Texture,-1,value=str(textureData['Order']),choices=[str(2*i) for i in range(18)], 2014 2014 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2015 2015 shOrder.Bind(wx.EVT_COMBOBOX,OnShOrder) 2016 2016 shSizer.Add(shOrder,0,wx.ALIGN_CENTER_VERTICAL) 2017 shRef = wx.CheckBox( dataDisplay,-1,label=' Refine texture?')2017 shRef = wx.CheckBox(Texture,-1,label=' Refine texture?') 2018 2018 shRef.SetValue(textureData['SH Coeff'][0]) 2019 2019 shRef.Bind(wx.EVT_CHECKBOX, OnSHRefine) 2020 2020 shSizer.Add(shRef,0,wx.ALIGN_CENTER_VERTICAL) 2021 shShow = wx.CheckBox( dataDisplay,-1,label=' Show coeff.?')2021 shShow = wx.CheckBox(Texture,-1,label=' Show coeff.?') 2022 2022 shShow.SetValue(textureData['SHShow']) 2023 2023 shShow.Bind(wx.EVT_CHECKBOX, OnSHShow) … … 2026 2026 mainSizer.Add((0,5),0) 2027 2027 PTSizer = wx.FlexGridSizer(2,4,5,5) 2028 PTSizer.Add(wx.StaticText( dataDisplay,-1,' Texture plot type: '),0,wx.ALIGN_CENTER_VERTICAL)2028 PTSizer.Add(wx.StaticText(Texture,-1,' Texture plot type: '),0,wx.ALIGN_CENTER_VERTICAL) 2029 2029 choices = ['Axial pole distribution','Pole figure','Inverse pole figure'] 2030 pfType = wx.ComboBox( dataDisplay,-1,value=str(textureData['PlotType']),choices=choices,2030 pfType = wx.ComboBox(Texture,-1,value=str(textureData['PlotType']),choices=choices, 2031 2031 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2032 2032 pfType.Bind(wx.EVT_COMBOBOX,OnPfType) 2033 2033 PTSizer.Add(pfType,0,wx.ALIGN_CENTER_VERTICAL) 2034 2034 if 'Axial' not in textureData['PlotType']: 2035 PTSizer.Add(wx.StaticText( dataDisplay,-1,' Projection type: '),0,wx.ALIGN_CENTER_VERTICAL)2036 projSel = wx.ComboBox( dataDisplay,-1,value=self.Projection,choices=['equal area','stereographic','3D display'],2035 PTSizer.Add(wx.StaticText(Texture,-1,' Projection type: '),0,wx.ALIGN_CENTER_VERTICAL) 2036 projSel = wx.ComboBox(Texture,-1,value=self.Projection,choices=['equal area','stereographic','3D display'], 2037 2037 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2038 2038 projSel.Bind(wx.EVT_COMBOBOX,OnProjSel) 2039 2039 PTSizer.Add(projSel,0,wx.ALIGN_CENTER_VERTICAL) 2040 2040 if textureData['PlotType'] in ['Pole figure','Axial pole distribution']: 2041 PTSizer.Add(wx.StaticText( dataDisplay,-1,' Pole figure HKL: '),0,wx.ALIGN_CENTER_VERTICAL)2041 PTSizer.Add(wx.StaticText(Texture,-1,' Pole figure HKL: '),0,wx.ALIGN_CENTER_VERTICAL) 2042 2042 PH = textureData['PFhkl'] 2043 pfVal = wx.TextCtrl( dataDisplay,-1,'%d %d %d'%(PH[0],PH[1],PH[2]),style=wx.TE_PROCESS_ENTER)2043 pfVal = wx.TextCtrl(Texture,-1,'%d %d %d'%(PH[0],PH[1],PH[2]),style=wx.TE_PROCESS_ENTER) 2044 2044 else: 2045 PTSizer.Add(wx.StaticText( dataDisplay,-1,' Inverse pole figure XYZ: '),0,wx.ALIGN_CENTER_VERTICAL)2045 PTSizer.Add(wx.StaticText(Texture,-1,' Inverse pole figure XYZ: '),0,wx.ALIGN_CENTER_VERTICAL) 2046 2046 PX = textureData['PFxyz'] 2047 pfVal = wx.TextCtrl( dataDisplay,-1,'%3.1f %3.1f %3.1f'%(PX[0],PX[1],PX[2]),style=wx.TE_PROCESS_ENTER)2047 pfVal = wx.TextCtrl(Texture,-1,'%3.1f %3.1f %3.1f'%(PX[0],PX[1],PX[2]),style=wx.TE_PROCESS_ENTER) 2048 2048 pfVal.Bind(wx.EVT_TEXT_ENTER,OnPFValue) 2049 2049 pfVal.Bind(wx.EVT_KILL_FOCUS,OnPFValue) 2050 2050 PTSizer.Add(pfVal,0,wx.ALIGN_CENTER_VERTICAL) 2051 2051 if 'Axial' not in textureData['PlotType']: 2052 PTSizer.Add(wx.StaticText( dataDisplay,-1,' Color scheme'),0,wx.ALIGN_CENTER_VERTICAL)2052 PTSizer.Add(wx.StaticText(Texture,-1,' Color scheme'),0,wx.ALIGN_CENTER_VERTICAL) 2053 2053 choice = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")] 2054 2054 choice.sort() 2055 colorSel = wx.ComboBox( dataDisplay,-1,value=self.ContourColor,choices=choice,2055 colorSel = wx.ComboBox(Texture,-1,value=self.ContourColor,choices=choice, 2056 2056 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2057 2057 colorSel.Bind(wx.EVT_COMBOBOX,OnColorSel) … … 2060 2060 mainSizer.Add((0,5),0) 2061 2061 if textureData['SHShow']: 2062 mainSizer.Add(wx.StaticText( dataDisplay,-1,'Spherical harmonic coefficients: '),0,wx.ALIGN_CENTER_VERTICAL)2062 mainSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonic coefficients: '),0,wx.ALIGN_CENTER_VERTICAL) 2063 2063 mainSizer.Add((0,5),0) 2064 2064 ODFSizer = wx.FlexGridSizer(2,8,2,2) … … 2067 2067 ODFkeys.sort() 2068 2068 for item in ODFkeys: 2069 ODFSizer.Add(wx.StaticText( dataDisplay,-1,item),0,wx.ALIGN_CENTER_VERTICAL)2070 ODFval = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%8.3f'%(textureData['SH Coeff'][1][item]),style=wx.TE_PROCESS_ENTER)2069 ODFSizer.Add(wx.StaticText(Texture,-1,item),0,wx.ALIGN_CENTER_VERTICAL) 2070 ODFval = wx.TextCtrl(Texture,wx.ID_ANY,'%8.3f'%(textureData['SH Coeff'][1][item]),style=wx.TE_PROCESS_ENTER) 2071 2071 ODFIndx[ODFval.GetId()] = item 2072 2072 ODFval.Bind(wx.EVT_TEXT_ENTER,OnODFValue) … … 2076 2076 mainSizer.Add((0,5),0) 2077 2077 mainSizer.Add((0,5),0) 2078 mainSizer.Add(wx.StaticText( dataDisplay,-1,'Sample orientation angles: '),0,wx.ALIGN_CENTER_VERTICAL)2078 mainSizer.Add(wx.StaticText(Texture,-1,'Sample orientation angles: '),0,wx.ALIGN_CENTER_VERTICAL) 2079 2079 mainSizer.Add((0,5),0) 2080 2080 angSizer = wx.BoxSizer(wx.HORIZONTAL) … … 2082 2082 valIndx = {} 2083 2083 for item in ['Sample omega','Sample chi','Sample phi']: 2084 angRef = wx.CheckBox( dataDisplay,-1,label=item+': ')2084 angRef = wx.CheckBox(Texture,-1,label=item+': ') 2085 2085 angRef.SetValue(textureData[item][0]) 2086 2086 angIndx[angRef.GetId()] = item 2087 2087 angRef.Bind(wx.EVT_CHECKBOX, OnAngRef) 2088 2088 angSizer.Add(angRef,0,wx.ALIGN_CENTER_VERTICAL) 2089 angVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%8.2f'%(textureData[item][1]),style=wx.TE_PROCESS_ENTER)2089 angVal = wx.TextCtrl(Texture,wx.ID_ANY,'%8.2f'%(textureData[item][1]),style=wx.TE_PROCESS_ENTER) 2090 2090 valIndx[angVal.GetId()] = item 2091 2091 angVal.Bind(wx.EVT_TEXT_ENTER,OnAngValue) … … 2094 2094 angSizer.Add((5,0),0) 2095 2095 mainSizer.Add(angSizer,0,wx.ALIGN_CENTER_VERTICAL) 2096 dataDisplay.SetSizer(mainSizer,True)2096 Texture.SetSizer(mainSizer,True) 2097 2097 mainSizer.Fit(self.dataFrame) 2098 2098 Size = mainSizer.GetMinSize() 2099 2099 Size[0] += 40 2100 2100 Size[1] = max(Size[1],250) + 20 2101 dataDisplay.SetSize(Size)2101 Texture.SetSize(Size) 2102 2102 Texture.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1) 2103 2103 Size[1] = min(Size[1],450) … … 2385 2385 plotSizer = wx.BoxSizer(wx.VERTICAL) 2386 2386 choice = ['Mustrain','Size','Preferred orientation'] 2387 plotSel = wx.RadioBox( dataDisplay,-1,'Select plot type:',choices=choice,2387 plotSel = wx.RadioBox(DData,-1,'Select plot type:',choices=choice, 2388 2388 majorDimension=3,style=wx.RA_SPECIFY_COLS) 2389 2389 plotSel.SetStringSelection(generalData['Data plot type']) … … 2392 2392 if generalData['Data plot type'] == 'Preferred orientation': 2393 2393 POhklSizer = wx.BoxSizer(wx.HORIZONTAL) 2394 POhklSizer.Add(wx.StaticText( dataDisplay,-1,' Plot preferred orientation for H K L: '),0,wx.ALIGN_CENTER_VERTICAL)2394 POhklSizer.Add(wx.StaticText(DData,-1,' Plot preferred orientation for H K L: '),0,wx.ALIGN_CENTER_VERTICAL) 2395 2395 h,k,l = generalData['POhkl'] 2396 poAxis = wx.TextCtrl( dataDisplay,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)2396 poAxis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER) 2397 2397 poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOhkl) 2398 2398 poAxis.Bind(wx.EVT_KILL_FOCUS,OnPOhkl) … … 2403 2403 def ScaleSizer(): 2404 2404 scaleSizer = wx.BoxSizer(wx.HORIZONTAL) 2405 scaleRef = wx.CheckBox( dataDisplay,-1,label=' Phase fraction: ')2405 scaleRef = wx.CheckBox(DData,-1,label=' Phase fraction: ') 2406 2406 scaleRef.SetValue(UseList[item]['Scale'][1]) 2407 2407 Indx[scaleRef.GetId()] = item 2408 2408 scaleRef.Bind(wx.EVT_CHECKBOX, OnScaleRef) 2409 2409 scaleSizer.Add(scaleRef,0,wx.ALIGN_CENTER_VERTICAL) 2410 scaleVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,2410 scaleVal = wx.TextCtrl(DData,wx.ID_ANY, 2411 2411 '%.4f'%(UseList[item]['Scale'][0]),style=wx.TE_PROCESS_ENTER) 2412 2412 Indx[scaleVal.GetId()] = item … … 2418 2418 def TopSizer(name,choices,parm,OnType): 2419 2419 topSizer = wx.BoxSizer(wx.HORIZONTAL) 2420 topSizer.Add(wx.StaticText( dataDisplay,-1,name),0,wx.ALIGN_CENTER_VERTICAL)2421 sizeType = wx.ComboBox( dataDisplay,wx.ID_ANY,value=UseList[item][parm][0],choices=choices,2420 topSizer.Add(wx.StaticText(DData,-1,name),0,wx.ALIGN_CENTER_VERTICAL) 2421 sizeType = wx.ComboBox(DData,wx.ID_ANY,value=UseList[item][parm][0],choices=choices, 2422 2422 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2423 2423 sizeType.Bind(wx.EVT_COMBOBOX, OnType) … … 2429 2429 def IsoSizer(name,parm,fmt,OnVal,OnRef): 2430 2430 isoSizer = wx.BoxSizer(wx.HORIZONTAL) 2431 sizeRef = wx.CheckBox( dataDisplay,-1,label=name)2431 sizeRef = wx.CheckBox(DData,-1,label=name) 2432 2432 sizeRef.thisown = False 2433 2433 sizeRef.SetValue(UseList[item][parm][2][0]) … … 2435 2435 sizeRef.Bind(wx.EVT_CHECKBOX, OnRef) 2436 2436 isoSizer.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL) 2437 sizeVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,2437 sizeVal = wx.TextCtrl(DData,wx.ID_ANY, 2438 2438 fmt%(UseList[item][parm][1][0]),style=wx.TE_PROCESS_ENTER) 2439 2439 Indx[sizeVal.GetId()] = [item,0] … … 2445 2445 def UniSizer(parm,OnAxis): 2446 2446 uniSizer = wx.BoxSizer(wx.HORIZONTAL) 2447 uniSizer.Add(wx.StaticText( dataDisplay,-1,' Unique axis, H K L: '),0,wx.ALIGN_CENTER_VERTICAL)2447 uniSizer.Add(wx.StaticText(DData,-1,' Unique axis, H K L: '),0,wx.ALIGN_CENTER_VERTICAL) 2448 2448 h,k,l = UseList[item][parm][3] 2449 Axis = wx.TextCtrl( dataDisplay,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)2449 Axis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER) 2450 2450 Indx[Axis.GetId()] = item 2451 2451 Axis.Bind(wx.EVT_TEXT_ENTER,OnAxis) … … 2459 2459 UseList[item][parm][1],UseList[item][parm][2],range(2)) 2460 2460 for Pa,val,ref,id in parms: 2461 sizeRef = wx.CheckBox( dataDisplay,-1,label=Pa)2461 sizeRef = wx.CheckBox(DData,-1,label=Pa) 2462 2462 sizeRef.thisown = False 2463 2463 sizeRef.SetValue(ref) … … 2465 2465 sizeRef.Bind(wx.EVT_CHECKBOX, OnRef) 2466 2466 dataSizer.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL) 2467 sizeVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,fmt%(val),style=wx.TE_PROCESS_ENTER)2467 sizeVal = wx.TextCtrl(DData,wx.ID_ANY,fmt%(val),style=wx.TE_PROCESS_ENTER) 2468 2468 Indx[sizeVal.GetId()] = [item,id] 2469 2469 sizeVal.Bind(wx.EVT_TEXT_ENTER,OnVal) … … 2478 2478 dataSizer = wx.FlexGridSizer(1,6,5,5) 2479 2479 for Pa,val,ref,id in parms: 2480 sizeRef = wx.CheckBox( dataDisplay,-1,label=Pa)2480 sizeRef = wx.CheckBox(DData,-1,label=Pa) 2481 2481 sizeRef.thisown = False 2482 2482 sizeRef.SetValue(ref) … … 2484 2484 sizeRef.Bind(wx.EVT_CHECKBOX, OnSizeRef) 2485 2485 dataSizer.Add(sizeRef,0,wx.ALIGN_CENTER_VERTICAL) 2486 sizeVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%.3f'%(val),style=wx.TE_PROCESS_ENTER)2486 sizeVal = wx.TextCtrl(DData,wx.ID_ANY,'%.3f'%(val),style=wx.TE_PROCESS_ENTER) 2487 2487 Indx[sizeVal.GetId()] = [item,id] 2488 2488 sizeVal.Bind(wx.EVT_TEXT_ENTER,OnSizeVal) … … 2500 2500 dataSizer = wx.FlexGridSizer(1,6,5,5) 2501 2501 for Pa,val,ref,id in parms: 2502 strainRef = wx.CheckBox( dataDisplay,-1,label=Pa)2502 strainRef = wx.CheckBox(DData,-1,label=Pa) 2503 2503 strainRef.thisown = False 2504 2504 strainRef.SetValue(ref) … … 2506 2506 strainRef.Bind(wx.EVT_CHECKBOX, OnStrainRef) 2507 2507 dataSizer.Add(strainRef,0,wx.ALIGN_CENTER_VERTICAL) 2508 strainVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%.5f'%(val),style=wx.TE_PROCESS_ENTER)2508 strainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.5f'%(val),style=wx.TE_PROCESS_ENTER) 2509 2509 Indx[strainVal.GetId()] = [item,id] 2510 2510 strainVal.Bind(wx.EVT_TEXT_ENTER,OnStrainVal) … … 2518 2518 parms = zip(Hsnames,UseList[item]['HStrain'][0],UseList[item]['HStrain'][1],range(len(Hsnames))) 2519 2519 for Pa,val,ref,id in parms: 2520 hstrainRef = wx.CheckBox( dataDisplay,-1,label=Pa)2520 hstrainRef = wx.CheckBox(DData,-1,label=Pa) 2521 2521 hstrainRef.thisown = False 2522 2522 hstrainRef.SetValue(ref) … … 2524 2524 hstrainRef.Bind(wx.EVT_CHECKBOX, OnHstrainRef) 2525 2525 hstrainSizer.Add(hstrainRef,0,wx.ALIGN_CENTER_VERTICAL) 2526 hstrainVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%.5f'%(val),style=wx.TE_PROCESS_ENTER)2526 hstrainVal = wx.TextCtrl(DData,wx.ID_ANY,'%.5f'%(val),style=wx.TE_PROCESS_ENTER) 2527 2527 Indx[hstrainVal.GetId()] = [item,id] 2528 2528 hstrainVal.Bind(wx.EVT_TEXT_ENTER,OnHstrainVal) … … 2535 2535 choice = ['March-Dollase','Spherical harmonics'] 2536 2536 POtype = choice[['MD','SH'].index(POData[0])] 2537 poSizer.Add(wx.StaticText( dataDisplay,-1,' Preferred orientation model '),0,wx.ALIGN_CENTER_VERTICAL)2538 POType = wx.ComboBox( dataDisplay,wx.ID_ANY,value=POtype,choices=choice,2537 poSizer.Add(wx.StaticText(DData,-1,' Preferred orientation model '),0,wx.ALIGN_CENTER_VERTICAL) 2538 POType = wx.ComboBox(DData,wx.ID_ANY,value=POtype,choices=choice, 2539 2539 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2540 2540 Indx[POType.GetId()] = item … … 2542 2542 poSizer.Add(POType) 2543 2543 if POData[0] == 'SH': 2544 poSizer.Add(wx.StaticText( dataDisplay,-1,' Harmonic order: '),0,wx.ALIGN_CENTER_VERTICAL)2545 poOrder = wx.ComboBox( dataDisplay,wx.ID_ANY,value=str(POData[4]),choices=[str(2*i) for i in range(18)],2544 poSizer.Add(wx.StaticText(DData,-1,' Harmonic order: '),0,wx.ALIGN_CENTER_VERTICAL) 2545 poOrder = wx.ComboBox(DData,wx.ID_ANY,value=str(POData[4]),choices=[str(2*i) for i in range(18)], 2546 2546 style=wx.CB_READONLY|wx.CB_DROPDOWN) 2547 2547 Indx[poOrder.GetId()] = item 2548 2548 poOrder.Bind(wx.EVT_COMBOBOX,OnPOOrder) 2549 2549 poSizer.Add(poOrder,0,wx.ALIGN_CENTER_VERTICAL) 2550 poRef = wx.CheckBox( dataDisplay,-1,label=' Refine? ')2550 poRef = wx.CheckBox(DData,-1,label=' Refine? ') 2551 2551 poRef.SetValue(POData[2]) 2552 2552 Indx[poRef.GetId()] = item … … 2557 2557 def MDDataSizer(POData): 2558 2558 poSizer = wx.BoxSizer(wx.HORIZONTAL) 2559 poRef = wx.CheckBox( dataDisplay,-1,label=' March-Dollase ratio: ')2559 poRef = wx.CheckBox(DData,-1,label=' March-Dollase ratio: ') 2560 2560 poRef.SetValue(POData[2]) 2561 2561 Indx[poRef.GetId()] = item 2562 2562 poRef.Bind(wx.EVT_CHECKBOX,OnPORef) 2563 2563 poSizer.Add(poRef,0,wx.ALIGN_CENTER_VERTICAL) 2564 poVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,2564 poVal = wx.TextCtrl(DData,wx.ID_ANY, 2565 2565 '%.3f'%(POData[1]),style=wx.TE_PROCESS_ENTER) 2566 2566 Indx[poVal.GetId()] = item … … 2568 2568 poVal.Bind(wx.EVT_KILL_FOCUS,OnPOVal) 2569 2569 poSizer.Add(poVal,0,wx.ALIGN_CENTER_VERTICAL) 2570 poSizer.Add(wx.StaticText( dataDisplay,-1,' Unique axis, H K L: '),0,wx.ALIGN_CENTER_VERTICAL)2570 poSizer.Add(wx.StaticText(DData,-1,' Unique axis, H K L: '),0,wx.ALIGN_CENTER_VERTICAL) 2571 2571 h,k,l =POData[3] 2572 poAxis = wx.TextCtrl( dataDisplay,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)2572 poAxis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER) 2573 2573 Indx[poAxis.GetId()] = item 2574 2574 poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOAxis) … … 2579 2579 def SHDataSizer(POData): 2580 2580 textJ = G2lat.textureIndex(POData[5]) 2581 mainSizer.Add(wx.StaticText( dataDisplay,-1,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ)),0,wx.ALIGN_CENTER_VERTICAL)2581 mainSizer.Add(wx.StaticText(DData,-1,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ)),0,wx.ALIGN_CENTER_VERTICAL) 2582 2582 mainSizer.Add((0,5),0) 2583 2583 ODFSizer = wx.FlexGridSizer(2,8,2,2) … … 2586 2586 ODFkeys.sort() 2587 2587 for odf in ODFkeys: 2588 ODFSizer.Add(wx.StaticText( dataDisplay,-1,odf),0,wx.ALIGN_CENTER_VERTICAL)2589 ODFval = wx.TextCtrl( dataDisplay,wx.ID_ANY,'%8.3f'%(POData[5][odf]),style=wx.TE_PROCESS_ENTER)2588 ODFSizer.Add(wx.StaticText(DData,-1,odf),0,wx.ALIGN_CENTER_VERTICAL) 2589 ODFval = wx.TextCtrl(DData,wx.ID_ANY,'%8.3f'%(POData[5][odf]),style=wx.TE_PROCESS_ENTER) 2590 2590 ODFIndx[ODFval.GetId()] = odf 2591 2591 # ODFval.Bind(wx.EVT_TEXT_ENTER,OnODFValue) … … 2596 2596 def ExtSizer(): 2597 2597 extSizer = wx.BoxSizer(wx.HORIZONTAL) 2598 extRef = wx.CheckBox( dataDisplay,-1,label=' Extinction: ')2598 extRef = wx.CheckBox(DData,-1,label=' Extinction: ') 2599 2599 extRef.SetValue(UseList[item]['Extinction'][1]) 2600 2600 Indx[extRef.GetId()] = item 2601 2601 extRef.Bind(wx.EVT_CHECKBOX, OnExtRef) 2602 2602 extSizer.Add(extRef,0,wx.ALIGN_CENTER_VERTICAL) 2603 extVal = wx.TextCtrl( dataDisplay,wx.ID_ANY,2603 extVal = wx.TextCtrl(DData,wx.ID_ANY, 2604 2604 '%.2f'%(UseList[item]['Extinction'][0]),style=wx.TE_PROCESS_ENTER) 2605 2605 Indx[extVal.GetId()] = item … … 2609 2609 return extSizer 2610 2610 2611 2612 DData.DestroyChildren() 2613 dataDisplay = wx.Panel(DData) 2611 if DData.GetSizer(): 2612 DData.GetSizer().Clear(True) 2614 2613 mainSizer = wx.BoxSizer(wx.VERTICAL) 2615 mainSizer.Add(wx.StaticText( dataDisplay,-1,'Histogram data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL)2614 mainSizer.Add(wx.StaticText(DData,-1,'Histogram data for '+PhaseName+':'),0,wx.ALIGN_CENTER_VERTICAL) 2616 2615 mainSizer.Add(PlotSizer()) 2617 2616 … … 2620 2619 2621 2620 showSizer = wx.BoxSizer(wx.HORIZONTAL) 2622 showData = wx.CheckBox( dataDisplay,-1,label=' Show '+item)2621 showData = wx.CheckBox(DData,-1,label=' Show '+item) 2623 2622 showData.SetValue(UseList[item]['Show']) 2624 2623 Indx[showData.GetId()] = item 2625 2624 showData.Bind(wx.EVT_CHECKBOX, OnShowData) 2626 2625 showSizer.Add(showData,0,wx.ALIGN_CENTER_VERTICAL) 2627 copyData = wx.Button( dataDisplay,-1,label=' Copy?')2626 copyData = wx.Button(DData,-1,label=' Copy?') 2628 2627 Indx[copyData.GetId()] = item 2629 2628 copyData.Bind(wx.EVT_BUTTON,OnCopyData) … … 2656 2655 ellSizer.Add(TopSizer(' Size model: ',['isotropic','uniaxial','ellipsoidal'], 2657 2656 'Size',OnSizeType),0,wx.ALIGN_CENTER_VERTICAL) 2658 ellSizer.Add(wx.StaticText( dataDisplay,-1,u' Coefficients(\xb5m): '),0,wx.ALIGN_CENTER_VERTICAL)2657 ellSizer.Add(wx.StaticText(DData,-1,u' Coefficients(\xb5m): '),0,wx.ALIGN_CENTER_VERTICAL) 2659 2658 mainSizer.Add(ellSizer) 2660 2659 mainSizer.Add(EllSizeDataSizer()) … … 2680 2679 genSizer.Add(TopSizer(' Mustrain model: ',['isotropic','uniaxial','generalized',], 2681 2680 'Mustrain',OnStrainType),0,wx.ALIGN_CENTER_VERTICAL) 2682 genSizer.Add(wx.StaticText( dataDisplay,-1,' Coefficients: '),0,wx.ALIGN_CENTER_VERTICAL)2681 genSizer.Add(wx.StaticText(DData,-1,' Coefficients: '),0,wx.ALIGN_CENTER_VERTICAL) 2683 2682 mainSizer.Add(genSizer) 2684 2683 mainSizer.Add(GenStrainDataSizer()) 2685 2684 mainSizer.Add((0,5),0) 2686 2685 2687 mainSizer.Add(wx.StaticText( dataDisplay,-1,' Hydrostatic/elastic strain:'))2686 mainSizer.Add(wx.StaticText(DData,-1,' Hydrostatic/elastic strain:')) 2688 2687 mainSizer.Add(HstrainSizer()) 2689 2688 … … 2707 2706 mainSizer.Add((5,5),0) 2708 2707 2709 dataDisplay.SetSizer(mainSizer,True)2708 DData.SetSizer(mainSizer,True) 2710 2709 mainSizer.FitInside(self.dataFrame) 2711 2710 Size = mainSizer.GetMinSize() 2712 2711 Size[0] += 40 2713 2712 Size[1] = max(Size[1],250) + 20 2714 dataDisplay.SetSize(Size)2713 DData.SetSize(Size) 2715 2714 DData.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1) 2716 2715 Size[1] = min(Size[1],450)
Note: See TracChangeset
for help on using the changeset viewer.
