Changeset 2918 for branch

Timestamp:

Jul 7, 2017 5:30:18 PM (6 years ago)

Author:

toby

Message:

wxID w/extra spaces; start on ClearData/SetSizeData? pwdGUI fixes

Location:

branch/2frame

Files:

• GSASIIdataGUI.py (modified) (2 diffs)
• GSASIIpwdGUI.py (modified) (12 diffs)

branch/2frame/GSASIIdataGUI.py

@@ -4800 +4800 @@
             'wxID_PEAKSCOPY', 'wxID_SEQPEAKFIT',)
         
-        G2G.Define_wxId(' wxID_INDXRELOAD', 'wxID_INDEXPEAKS', 'wxID_REFINECELL', 'wxID_COPYCELL', 'wxID_MAKENEWPHASE',
+        G2G.Define_wxId('wxID_INDXRELOAD', 'wxID_INDEXPEAKS', 'wxID_REFINECELL', 'wxID_COPYCELL', 'wxID_MAKENEWPHASE',
             'wxID_EXPORTCELLS',)
         
@@ -5639 +5639 @@
         G2G.Define_wxId('wxID_DRAWATOMSTYLE', 'wxID_DRAWATOMLABEL', 'wxID_DRAWATOMCOLOR', 'wxID_DRAWATOMRESETCOLOR',
             'wxID_DRAWVIEWPOINT', 'wxID_DRAWTRANSFORM', 'wxID_DRAWDELETE', 'wxID_DRAWFILLCELL',
-            'wxID_DRAWADDEQUIV', 'wxID_DRAWFILLCOORD', 'wxID_DRAWDISAGLTOR', ' wxID_DRAWPLANE',
+            'wxID_DRAWADDEQUIV', 'wxID_DRAWFILLCOORD', 'wxID_DRAWDISAGLTOR', 'wxID_DRAWPLANE',
             'wxID_DRAWDISTVP', 'wxID_DRAWADDSPHERE', 'wxID_DRWAEDITRADII',)
         G2G.Define_wxId('wxID_DRAWRESTRBOND', 'wxID_DRAWRESTRANGLE', 'wxID_DRAWRESTRPLANE', 'wxID_DRAWRESTRCHIRAL',)

branch/2frame/GSASIIpwdGUI.py

@@ -66 +66 @@
         wx.Dialog.__init__(self,parent,-1,'Background radial distribution function',
             pos=wx.DefaultPosition,style=wx.DEFAULT_DIALOG_STYLE)
-        self.panel = wx.Panel(self)         #just a dummy - gets destroyed in Draw!
+        self.panel = None
         self.result = {'UseObsCalc':True,'maxR':20.0,'Smooth':'linear'}
         
@@ -79 +79 @@
             self.result['Smooth'] = smCombo.GetValue()
                     
-        self.panel.Destroy()
+        if self.panel: self.panel.Destroy()
         self.panel = wx.Panel(self)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
@@ -895 +895 @@
     '''respond to selection of PWDR background data tree item.
     '''
-    if len(data) < 2:       #add Debye diffuse & peaks scattering here
-        data.append({'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]})
-    if 'nPeaks' not in data[1]:
-        data[1].update({'nPeaks':0,'peaksList':[]})
-    G2frame.dataWindow.currentGrids = []
     
     def OnBackFlagCopy(event):
@@ -1250 +1245 @@
             peaksSizer.Add(peaksGrid)        
         return peaksSizer
-                
+
+    # UpdateBackground execution starts here
+    if len(data) < 2:       #add Debye diffuse & peaks scattering here
+        data.append({'nDebye':0,'debyeTerms':[],'nPeaks':0,'peaksList':[]})
+    if 'nPeaks' not in data[1]:
+        data[1].update({'nPeaks':0,'peaksList':[]})
+    G2frame.dataWindow.currentGrids = []
     G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.BackMenu)
     G2frame.Bind(wx.EVT_MENU,OnBackCopy,id=G2G.wxID_BACKCOPY)
@@ -1260 +1261 @@
     BackId = G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId, 'Background')
     Choices = ['chebyschev','cosine','Q^2 power series','Q^-2 power series','lin interpolate','inv interpolate','log interpolate']
+    G2frame.dataWindow.ClearData()
     mainSizer = G2frame.dataWindow.GetSizer()
     mainSizer.Add(BackSizer())
@@ -1266 +1268 @@
     mainSizer.Add((0,5),0)
     mainSizer.Add(PeaksSizer())
+    G2frame.dataWindow.SetDataSize()
         
 ################################################################################
@@ -1284 +1287 @@
         labels = ['Tmin','Tmax']
         for i in [0,1]:
-            limits.Add(wx.StaticText(G2frame.dataWindow,label=' Original %s: %.4f'%(labels[0],data[0][i])),0,WACV)
+            limits.Add(wx.StaticText(G2frame.dataWindow,
+                label=' Original {} {:.4f}'.format(labels[i],data[0][i])),0,WACV)
             limits.Add(wx.StaticText(G2frame.dataWindow,label=' New: '),0,WACV)
             limits.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[1],i,  \
@@ -1339 +1343 @@
             
     def Draw():
+        G2frame.dataWindow.ClearData()
         mainSizer = G2frame.dataWindow.GetSizer()
         mainSizer.Add(LimitSizer())
         if len(data)>2:
-#            mainSizer.Add((0,5),0)
+            mainSizer.Add((0,5),0)
             mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Excluded regions:'),0,WACV)
             mainSizer.Add(ExclSizer())
-        
+        G2frame.dataWindow.SetDataSize()
+
     G2frame.ifGetExclude = False
     G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.LimitMenu)
@@ -1688 +1694 @@
         #G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Instrument Parameters')
         G2frame.SetTitle('Instrument Parameters')
+        G2frame.dataWindow.ClearData()
         mainSizer = G2frame.dataWindow.GetSizer()
         instSizer = wx.FlexGridSizer(0,6,5,5)
@@ -1913 +1920 @@
 
         mainSizer.Add(instSizer,0)
+        G2frame.dataWindow.SetDataSize()
         # end of MakeParameterWindow
                 
@@ -2400 +2408 @@
     labelLst,elemKeysLst,dspLst,refFlgElem = [],[],[],[]
     parms = SetupSampleLabels(histName,data.get('Type'),Inst['Type'][0])
+    G2frame.dataWindow.ClearData()
     mainSizer = G2frame.dataWindow.GetSizer()
     topSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -2499 +2508 @@
         conSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Transmission (calc): %10.3f  '%(np.exp(-mut))),0,WACV)
         mainSizer.Add(conSizer,0)
+    G2frame.dataWindow.SetDataSize()
     
 ################################################################################