Changeset 1827 for trunk

Timestamp:

Apr 30, 2015 2:38:20 PM (10 years ago)

Author:

toby

Message:

fix scrollbar problems in many places; phase data in particular

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (2 diffs)
• GSASIIddataGUI.py (modified) (41 diffs)
• GSASIIphsGUI.py (modified) (5 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIconstrGUI.py ¶

@@ -1501 +1501 @@
                 refChoice[rbId][i].sort()     
             
-        VectorRB.DestroyChildren()
+        #VectorRB.DestroyChildren() # bad, deletes scrollbars on Mac!
+        if VectorRB.GetSizer():
+            VectorRB.GetSizer().Clear(True)
         VectorRBDisplay = wx.Panel(VectorRB)
         VectorRBSizer = wx.BoxSizer(wx.VERTICAL)
@@ -1779 +1781 @@
                 refChoice[rbId][i].sort()     
             
-        ResidueRB.DestroyChildren()
+        #ResidueRB.DestroyChildren() # bad, deletes scrollbars on Mac!
+        if ResidueRB.GetSizer():
+            ResidueRB.GetSizer().Clear(True)
         ResidueRBDisplay = wx.Panel(ResidueRB)
         ResidueRBSizer = wx.BoxSizer(wx.VERTICAL)

trunk/GSASIIddataGUI.py ¶

@@ -72 +72 @@
     if not hist and len(keyList):
         DData.G2hist = keyList[0]
+    elif hist:
+        DData.G2hist = hist
 
     PWDR = any(['PWDR' in item for item in keyList])
@@ -82 +84 @@
             generalData['Data plot type'] = Obj.GetStringSelection()
             G2plt.PlotSizeStrainPO(G2frame,data,DData.G2hist)
-            wx.CallLater(100,UpdateDData,G2frame,DData,data)
-#            wx.CallLater(100,RepaintHistogramInfo)
+            wx.CallLater(100,UpdateDData,G2frame,DData,data,DData.G2hist)
             
         def OnPOhkl(event):
@@ -101 +102 @@
         plotSizer = wx.BoxSizer(wx.VERTICAL)
         choice = ['None','Mustrain','Size','Preferred orientation']
-        plotSel = wx.RadioBox(DData,-1,'Select plot type:',choices=choice,
+        plotSel = wx.RadioBox(DData,wx.ID_ANY,'Select plot type:',choices=choice,
             majorDimension=1,style=wx.RA_SPECIFY_COLS)
         plotSel.SetStringSelection(generalData['Data plot type'])
@@ -108 +109 @@
         if generalData['Data plot type'] == 'Preferred orientation':
             POhklSizer = wx.BoxSizer(wx.HORIZONTAL)
-            POhklSizer.Add(wx.StaticText(DData,-1,' Plot preferred orientation for H K L: '),0,WACV)
+            POhklSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Plot preferred orientation for H K L: '),0,WACV)
             h,k,l = generalData['POhkl']
-            poAxis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
+            poAxis = wx.TextCtrl(DData,wx.ID_ANY,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
             poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOhkl)
             poAxis.Bind(wx.EVT_KILL_FOCUS,OnPOhkl)
@@ -135 +136 @@
         scaleSizer = wx.BoxSizer(wx.HORIZONTAL)
         if 'PWDR' in DData.G2hist:
-            scaleRef = wx.CheckBox(DData,-1,label=' Phase fraction: ')
+            scaleRef = wx.CheckBox(DData,wx.ID_ANY,label=' Phase fraction: ')
         elif 'HKLF' in DData.G2hist:
-            scaleRef = wx.CheckBox(DData,-1,label=' Scale factor: ')                
+            scaleRef = wx.CheckBox(DData,wx.ID_ANY,label=' Scale factor: ')                
         scaleRef.SetValue(UseList[DData.G2hist]['Scale'][1])
         scaleRef.Bind(wx.EVT_CHECKBOX, OnScaleRef)
@@ -174 +175 @@
         UseList[DData.G2hist]['Size'][0] = Obj.GetValue()
         G2plt.PlotSizeStrainPO(G2frame,data,DData.G2hist)
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
         
@@ -235 +235 @@
                 UseList[item]['Size'][4][i+3] = 0.0
         G2plt.PlotSizeStrainPO(G2frame,data,item)
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
             
@@ -241 +240 @@
         Obj = event.GetEventObject()
         UseList[DData.G2hist]['Mustrain'][0] = Obj.GetValue()
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         G2plt.PlotSizeStrainPO(G2frame,data,DData.G2hist)
         wx.CallLater(100,RepaintHistogramInfo)
@@ -306 +304 @@
                 UseList[item]['Mustrain'][4][i] = vals[i]
         G2plt.PlotSizeStrainPO(G2frame,data,item)
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
             
@@ -353 +350 @@
         UseList[DData.G2hist]['Pref.Ori.'][4] = Order
         UseList[DData.G2hist]['Pref.Ori.'][5] = SetPOCoef(Order,DData.G2hist)
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
 
@@ -362 +358 @@
         else:
             UseList[DData.G2hist]['Pref.Ori.'][0] = 'SH'
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
 
@@ -448 +443 @@
         item = Indx[Obj.GetId()]
         UseList[item[0]]['Extinction'][item[1]] = Obj.GetValue()
-        #wx.CallLater(100,UpdateDData,G2frame,DData,data)
         wx.CallLater(100,RepaintHistogramInfo)
             
@@ -458 +452 @@
     def TopSizer(name,choices,parm,OnType):
         topSizer = wx.BoxSizer(wx.HORIZONTAL)
-        topSizer.Add(wx.StaticText(DData,-1,name),0,WACV)
+        topSizer.Add(wx.StaticText(DData,wx.ID_ANY,name),0,WACV)
         sizeType = wx.ComboBox(DData,wx.ID_ANY,value=UseList[DData.G2hist][parm][0],choices=choices,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -467 +461 @@
     def LGmixSizer(name,OnVal,OnRef):
         lgmixSizer = wx.BoxSizer(wx.HORIZONTAL)
-        lgmixRef = wx.CheckBox(DData,-1,label='LGmix')
+        lgmixRef = wx.CheckBox(DData,wx.ID_ANY,label='LGmix')
         lgmixRef.thisown = False
         lgmixRef.SetValue(UseList[DData.G2hist][name][2][2])
@@ -483 +477 @@
     def ResetSizer(name,OnReset):
         resetSizer = wx.BoxSizer(wx.HORIZONTAL)
-        reset = wx.CheckBox(DData,-1,label='Reset?')
+        reset = wx.CheckBox(DData,wx.ID_ANY,label='Reset?')
         reset.thisown = False
         reset.SetValue(False)
@@ -493 +487 @@
     def IsoSizer(name,parm,fmt,OnVal,OnRef):
         isoSizer = wx.BoxSizer(wx.HORIZONTAL)
-        sizeRef = wx.CheckBox(DData,-1,label=name)
+        sizeRef = wx.CheckBox(DData,wx.ID_ANY,label=name)
         sizeRef.thisown = False
         sizeRef.SetValue(UseList[DData.G2hist][parm][2][0])
@@ -509 +503 @@
     def UniSizer(parm,OnAxis):
         uniSizer = wx.BoxSizer(wx.HORIZONTAL)
-        uniSizer.Add(wx.StaticText(DData,-1,' Unique axis, H K L: '),0,WACV)
+        uniSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Unique axis, H K L: '),0,WACV)
         h,k,l = UseList[DData.G2hist][parm][3]
-        Axis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
+        Axis = wx.TextCtrl(DData,wx.ID_ANY,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
         Axis.Bind(wx.EVT_TEXT_ENTER,OnAxis)
         Axis.Bind(wx.EVT_KILL_FOCUS,OnAxis)
@@ -522 +516 @@
             UseList[DData.G2hist][parm][1],UseList[DData.G2hist][parm][2],range(2))
         for Pa,val,ref,id in parms:
-            sizeRef = wx.CheckBox(DData,-1,label=Pa)
+            sizeRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             sizeRef.thisown = False
             sizeRef.SetValue(ref)
@@ -540 +534 @@
         dataSizer = wx.FlexGridSizer(0,6,5,5)
         for Pa,val,ref,id in parms:
-            sizeRef = wx.CheckBox(DData,-1,label=Pa)
+            sizeRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             sizeRef.thisown = False
             sizeRef.SetValue(ref)
@@ -562 +556 @@
         dataSizer = wx.FlexGridSizer(0,6,5,5)
         for Pa,val,ref,id in parms:
-            strainRef = wx.CheckBox(DData,-1,label=Pa)
+            strainRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             strainRef.thisown = False
             strainRef.SetValue(ref)
@@ -580 +574 @@
         parms = zip(Hsnames,UseList[DData.G2hist]['HStrain'][0],UseList[DData.G2hist]['HStrain'][1],range(len(Hsnames)))
         for Pa,val,ref,id in parms:
-            hstrainRef = wx.CheckBox(DData,-1,label=Pa)
+            hstrainRef = wx.CheckBox(DData,wx.ID_ANY,label=Pa)
             hstrainRef.thisown = False
             hstrainRef.SetValue(ref)
@@ -597 +591 @@
         choice = ['March-Dollase','Spherical harmonics']
         POtype = choice[['MD','SH'].index(POData[0])]
-        poSizer.Add(wx.StaticText(DData,-1,' Preferred orientation model '),0,WACV)
+        poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Preferred orientation model '),0,WACV)
         POType = wx.ComboBox(DData,wx.ID_ANY,value=POtype,choices=choice,
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
@@ -603 +597 @@
         poSizer.Add(POType)
         if POData[0] == 'SH':
-            poSizer.Add(wx.StaticText(DData,-1,' Harmonic order: '),0,WACV)
+            poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Harmonic order: '),0,WACV)
             poOrder = wx.ComboBox(DData,wx.ID_ANY,value=str(POData[4]),choices=[str(2*i) for i in range(18)],
                 style=wx.CB_READONLY|wx.CB_DROPDOWN)
             poOrder.Bind(wx.EVT_COMBOBOX,OnPOOrder)
             poSizer.Add(poOrder,0,WACV)
-            poRef = wx.CheckBox(DData,-1,label=' Refine? ')
+            poRef = wx.CheckBox(DData,wx.ID_ANY,label=' Refine? ')
             poRef.SetValue(POData[2])
             poRef.Bind(wx.EVT_CHECKBOX,OnPORef)
@@ -616 +610 @@
     def MDDataSizer(POData):
         poSizer = wx.BoxSizer(wx.HORIZONTAL)
-        poRef = wx.CheckBox(DData,-1,label=' March-Dollase ratio: ')
+        poRef = wx.CheckBox(DData,wx.ID_ANY,label=' March-Dollase ratio: ')
         poRef.SetValue(POData[2])
         poRef.Bind(wx.EVT_CHECKBOX,OnPORef)
@@ -625 +619 @@
         poVal.Bind(wx.EVT_KILL_FOCUS,OnPOVal)
         poSizer.Add(poVal,0,WACV)
-        poSizer.Add(wx.StaticText(DData,-1,' Unique axis, H K L: '),0,WACV)
+        poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Unique axis, H K L: '),0,WACV)
         h,k,l =POData[3]
-        poAxis = wx.TextCtrl(DData,-1,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
+        poAxis = wx.TextCtrl(DData,wx.ID_ANY,'%3d %3d %3d'%(h,k,l),style=wx.TE_PROCESS_ENTER)
         poAxis.Bind(wx.EVT_TEXT_ENTER,OnPOAxis)
         poAxis.Bind(wx.EVT_KILL_FOCUS,OnPOAxis)
@@ -651 +645 @@
         ODFkeys.sort()
         for odf in ODFkeys:
-            ODFSizer.Add(wx.StaticText(DData,-1,odf),0,WACV)
+            ODFSizer.Add(wx.StaticText(DData,wx.ID_ANY,odf),0,WACV)
             ODFval = wx.TextCtrl(DData,wx.ID_ANY,'%8.3f'%(POData[5][odf]),style=wx.TE_PROCESS_ENTER)
             ODFIndx[ODFval.GetId()] = odf
@@ -673 +667 @@
             finally:
                 dlg.Destroy()
-            #wx.CallLater(100,UpdateDData,G2frame,DData,data)
             wx.CallLater(100,RepaintHistogramInfo)
             
@@ -687 +680 @@
         hkls = G2lat.GenPfHKLs(10,SGData,A)    
         shPenalty = wx.BoxSizer(wx.HORIZONTAL)
-        shPenalty.Add(wx.StaticText(DData,-1,' Negative MRD penalty list: '),0,WACV)
+        shPenalty.Add(wx.StaticText(DData,wx.ID_ANY,' Negative MRD penalty list: '),0,WACV)
         shPenalty.Add(wx.ComboBox(DData,value=POData[6][0],choices=POData[6],
             style=wx.CB_DROPDOWN),0,WACV)
@@ -693 +686 @@
         hklList.Bind(wx.EVT_BUTTON,OnHKLList)
         shPenalty.Add(hklList,0,WACV)
-        shPenalty.Add(wx.StaticText(DData,-1,' Zero MRD tolerance: '),0,WACV)
-        shToler = wx.TextCtrl(DData,-1,'%.2f'%(POData[7]),style=wx.TE_PROCESS_ENTER)
+        shPenalty.Add(wx.StaticText(DData,wx.ID_ANY,' Zero MRD tolerance: '),0,WACV)
+        shToler = wx.TextCtrl(DData,wx.ID_ANY,'%.2f'%(POData[7]),style=wx.TE_PROCESS_ENTER)
         shToler.Bind(wx.EVT_TEXT_ENTER,OnshToler)
         shToler.Bind(wx.EVT_KILL_FOCUS,OnshToler)
@@ -702 +695 @@
     def ExtSizer():            
         extSizer = wx.BoxSizer(wx.HORIZONTAL)
-        extRef = wx.CheckBox(DData,-1,label=' Extinction: ')
+        extRef = wx.CheckBox(DData,wx.ID_ANY,label=' Extinction: ')
         extRef.SetValue(UseList[DData.G2hist]['Extinction'][1])
         extRef.Bind(wx.EVT_CHECKBOX, OnExtRef)
@@ -716 +709 @@
         extSizer = wx.BoxSizer(wx.VERTICAL)
         typeSizer = wx.BoxSizer(wx.HORIZONTAL)            
-        typeSizer.Add(wx.StaticText(DData,-1,' Extinction type: '),0,WACV)
+        typeSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Extinction type: '),0,WACV)
         Choices = ['None','Primary','Secondary Type I','Secondary Type II',]    # remove 'Secondary Type I & II'
-        typeTxt = wx.ComboBox(DData,-1,choices=Choices,value=UseList[DData.G2hist]['Extinction'][1],
+        typeTxt = wx.ComboBox(DData,wx.ID_ANY,choices=Choices,value=UseList[DData.G2hist]['Extinction'][1],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         Indx[typeTxt.GetId()] = [DData.G2hist,1]
         typeTxt.Bind(wx.EVT_COMBOBOX,OnSCExtType)
         typeSizer.Add(typeTxt)
-        typeSizer.Add(wx.StaticText(DData,-1,' Approx: '),0,WACV)
+        typeSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Approx: '),0,WACV)
         Choices=['Lorentzian','Gaussian']
-        approxTxT = wx.ComboBox(DData,-1,choices=Choices,value=UseList[DData.G2hist]['Extinction'][0],
+        approxTxT = wx.ComboBox(DData,wx.ID_ANY,choices=Choices,value=UseList[DData.G2hist]['Extinction'][0],
             style=wx.CB_READONLY|wx.CB_DROPDOWN)
         Indx[approxTxT.GetId()] = [DData.G2hist,0]
@@ -736 +729 @@
             if 'Tbar' in UseList[DData.G2hist]['Extinction'][2]:       #skipped for TOF   
                 valSizer =wx.BoxSizer(wx.HORIZONTAL)
-                valSizer.Add(wx.StaticText(DData,-1,' Tbar(mm):'),0,WACV)
+                valSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Tbar(mm):'),0,WACV)
                 tbarVal = wx.TextCtrl(DData,wx.ID_ANY,
                     '%.3f'%(UseList[DData.G2hist]['Extinction'][2]['Tbar']),style=wx.TE_PROCESS_ENTER)
@@ -742 +735 @@
                 tbarVal.Bind(wx.EVT_KILL_FOCUS,OnTbarVal)
                 valSizer.Add(tbarVal,0,WACV)
-                valSizer.Add(wx.StaticText(DData,-1,' cos(2ThM):'),0,WACV)
+                valSizer.Add(wx.StaticText(DData,wx.ID_ANY,' cos(2ThM):'),0,WACV)
                 cos2tm = wx.TextCtrl(DData,wx.ID_ANY,
                     '%.3f'%(UseList[DData.G2hist]['Extinction'][2]['Cos2TM']),style=wx.TE_PROCESS_ENTER)
@@ -759 +752 @@
                 Ekey = ['Eg','Es']
             for ekey in Ekey:
-                Eref = wx.CheckBox(DData,-1,label=ekey+' : ')
+                Eref = wx.CheckBox(DData,wx.ID_ANY,label=ekey+' : ')
                 Eref.SetValue(UseList[DData.G2hist]['Extinction'][2][ekey][1])
                 Indx[Eref.GetId()] = [DData.G2hist,ekey]
@@ -777 +770 @@
         babSizer = wx.BoxSizer(wx.HORIZONTAL)
         for bab in ['A','U']:
-            babRef = wx.CheckBox(DData,-1,label=' Babinet '+bab+': ')
+            babRef = wx.CheckBox(DData,wx.ID_ANY,label=' Babinet '+bab+': ')
             babRef.SetValue(UseList[DData.G2hist]['Babinet']['Bab'+bab][1])
             Indx[babRef.GetId()] = [DData.G2hist,bab]
@@ -809 +802 @@
         G2frame.bottomSizer = ShowHistogramInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        #scrollbars initially set in G2phsGUI.SetPhaseWindow(G2frame.dataFrame,DData,mainSizer)
-        #phasePage.SetSize(Size)
-        #phasePage.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
-        #mainFrame.setSizePosLeft(Size)
         mainSizer.Layout()
-        #G2frame.dataFrame.Layout()
-        #G2frame.dataFrame.SendSizeEvent()
         G2frame.dataFrame.Refresh()
+        DData.SetVirtualSize(mainSizer.GetMinSize())
+        G2frame.dataFrame.SendSizeEvent()
         
     def ShowHistogramInfo():
@@ -831 +820 @@
         bottomSizer = wx.BoxSizer(wx.VERTICAL)
         showSizer = wx.BoxSizer(wx.HORIZONTAL)
-        useData = wx.CheckBox(DData,-1,label='Use Histogram: '+DData.G2hist+' ?')
+        useData = wx.CheckBox(DData,wx.ID_ANY,label='Use Histogram: '+DData.G2hist+' ?')
         showSizer.Add(useData,0,WACV|wx.TOP|wx.BOTTOM,5)
         useData.Bind(wx.EVT_CHECKBOX, OnUseData)
@@ -896 +885 @@
                 bottomSizer.Add(GenStrainDataSizer(),0,WACV|wx.BOTTOM,5)
             
-            bottomSizer.Add(wx.StaticText(DData,-1,' Hydrostatic/elastic strain:'))
+            bottomSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Hydrostatic/elastic strain:'))
             bottomSizer.Add(HstrainSizer())
                 
@@ -914 +903 @@
                 if POData[4]:       #SH order > 0
                     textJ = G2lat.textureIndex(POData[5])
-                    poSizer.Add(wx.StaticText(DData,-1,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ))
+                    poSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ))
                         ,0,WACV|wx.TOP|wx.BOTTOM,5)
                     poSizer.Add(SHDataSizer(POData),0,WACV|wx.TOP|wx.BOTTOM,5)
@@ -928 +917 @@
         return bottomSizer
                 
-    DData.DestroyChildren()
+    #DData.DestroyChildren() # bad, deletes scrollbars on Mac!
     if DData.GetSizer():
         DData.GetSizer().Clear(True)
-    if not UseList:
-        return 
     mainSizer = wx.BoxSizer(wx.VERTICAL)
-    mainSizer.Add(wx.StaticText(DData,-1,' Histogram data for '+PhaseName+':'),0,WACV)
+    mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,WACV)
     if DData.G2hist != '':
         topSizer = wx.FlexGridSizer(1,2,5,5)
@@ -954 +941 @@
         G2frame.bottomSizer = ShowHistogramInfo()
         mainSizer.Add(G2frame.bottomSizer)
+    elif not UseList:
+        mainSizer.Add(wx.StaticText(DData,wx.ID_ANY,'  (This phase has no associated data, use appropriate Edit/Add... menu item)'),
+                      0,WACV|wx.TOP,10)
+        
     G2phsGUI.SetPhaseWindow(G2frame.dataFrame,DData,mainSizer)

trunk/GSASIIphsGUI.py ¶

@@ -240 +240 @@
         """        
         # UpdateGeneral execution starts here
-        General.DestroyChildren()
+        #General.DestroyChildren() # bad, deletes scrollbars on Mac!
+        if General.GetSizer():
+            General.GetSizer().Clear(True)
         phaseTypes = ['nuclear','modulated','magnetic','macromolecular']
         SetupGeneral()
@@ -3613 +3615 @@
 
         # UpdateTexture executable starts here
-        Texture.DestroyChildren()
+        #Texture.DestroyChildren() # bad, deletes scrollbars on Mac!
+        if Texture.GetSizer():
+            Texture.GetSizer().Clear(True)
         G2frame.dataFrame.SetStatusText('')
         generalData = data['General']        
@@ -4273 +4277 @@
         # FillRigidBodyGrid executable code starts here
         if refresh:
-            RigidBodies.DestroyChildren()
+            #RigidBodies.DestroyChildren() # bad, deletes scrollbars on Mac!
+            if RigidBodies.GetSizer():
+                RigidBodies.GetSizer().Clear(True)
         general = data['General']
         cx,ct,cs,cia = general['AtomPtrs']
@@ -4527 +4533 @@
                 G2plt.PlotStructure(G2frame,data)
                     
-            RigidBodies.DestroyChildren()
+            #RigidBodies.DestroyChildren() # bad, deletes scrollbars on Mac!
+            if RigidBodies.GetSizer():
+                RigidBodies.GetSizer().Clear(True)
             mainSizer = wx.BoxSizer(wx.VERTICAL)
             mainSizer.Add((5,5),0)
@@ -5138 +5146 @@
         
         # UpdateMCSA executable code starts here
-        G2frame.MCSA.DestroyChildren()
+        #G2frame.MCSA.DestroyChildren() # bad, deletes scrollbars on Mac!
+        if G2frame.MCSA.GetSizer():
+            G2frame.MCSA.GetSizer().Clear(True)
         if not data['Drawing']:                 #if new drawing - no drawing data!
             SetupDrawingData()

trunk/GSASIIpwdGUI.py ¶

@@ -3414 +3414 @@
     wave = G2mth.getWave(Inst)
     if G2frame.dataDisplay:
-        G2frame.dataFrame.DestroyChildren()
+        G2frame.dataFrame.DestroyChildren()  # is this a ScrolledWindow? If so, bad!
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.SubstanceMenu)
     if not G2frame.dataFrame.GetStatusBar():
@@ -4090 +4090 @@
         Profile[5] = BackSample['Scale'][0]*G2frame.PatternTree.GetItemPyData(BackId)[1][1]
     if G2frame.dataDisplay:
-        G2frame.dataFrame.DestroyChildren()
+        G2frame.dataFrame.DestroyChildren()   # is this a ScrolledWindow? If so, bad!
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.ModelMenu)
     if not G2frame.dataFrame.GetStatusBar():