Changeset 2907 for branch

Timestamp:

Jul 4, 2017 6:19:31 PM (6 years ago)

Author:

toby

Message:

tabbed phase panel done. More to go...

Location:

branch/2frame

Files:

• GSASIIIO.py (modified) (2 diffs)
• GSASIIctrlGUI.py (modified) (1 diff)
• GSASIIdataGUI.py (modified) (16 diffs)
• GSASIIobj.py (modified) (9 diffs)
• GSASIIphsGUI.py (modified) (42 diffs)
• GSASIIplot.py (modified) (1 diff)

branch/2frame/GSASIIIO.py

@@ -1222 +1222 @@
 
     This class is subclassed in the various exports/G2export_*.py files. Those files
-    are imported in :meth:`GSASII.GSASII._init_Exports` which defines the
+    are imported in :meth:`GSASIIdataGUI.GSASII._init_Exports` which defines the
     appropriate menu items for each one and the .Exporter method is called
     directly from the menu item.
@@ -2124 +2124 @@
 
 if __name__ == '__main__':
-    import GSASII
-    application = GSASII.GSASIImain(0)
+    import GSASIIdataGUI
+    application = GSASIIdataGUI.GSASIImain(0)
     G2frame = application.main
     #app = wx.PySimpleApp()

branch/2frame/GSASIIctrlGUI.py

@@ -53 +53 @@
     they were retrieved from.
     '''
+    #def SelectItem(self,event):
+    #    print 'Select Item'
+    #    import GSASIIobj as G2obj
+    #    G2obj.HowDidIgetHere()
+    #    wx.TreeCtrl.SelectItem(self,event)
+        
     def __init__(self,parent=None,*args,**kwargs):
         super(self.__class__,self).__init__(parent=parent,*args,**kwargs)

branch/2frame/GSASIIdataGUI.py

@@ -334 +334 @@
         self.EndModal(wx.ID_CANCEL)
         
-# class GSASIIsplit(wx.SplitterWindow):
-#     def __init__(self,parent,ID):
-#         wx.SplitterWindow.__init__(self, parent, ID,style = wx.SP_BORDER|wx.SP_LIVE_UPDATE)
-#         self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.OnSashChanged)
-#         self.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGING, self.OnSashChanging)
-
-#     def OnSashChanged(self, evt):
-#         evt.Skip()
-# #        print "sash changed to %s\n" % str(evt.GetSashPosition())
-
-#     def OnSashChanging(self, evt):
-#         evt.Skip()
-# #        print "sash changing to %s\n" % str(evt.GetSashPosition())
-
 def GUIpatches():
     'Misc fixes that only needs to be done when running a GUI'
@@ -2950 +2936 @@
         self.FillMainMenu(self.GSASIIMenu)
         self.SetMenuBar(self.GSASIIMenu)
-        #self.Bind(wx.EVT_SIZE, self.OnSize)
         self.Status = self.CreateStatusBar()
-        #self.mainPanel = GSASIIsplit(self,-1)
-        self.mainPanel = wx.SplitterWindow(self, wx.ID_ANY, style=wx.SP_BORDER|wx.SP_LIVE_UPDATE)
+        # Bob: note different ways to display the SplitterWindow. I like the 3d effect on the Mac
+        # as it makes the splitter bar a bit easier to "grab" -- this might need to be platform selected.
+        #self.mainPanel = wx.SplitterWindow(self, wx.ID_ANY, style=wx.SP_BORDER|wx.SP_LIVE_UPDATE)
+        #self.mainPanel = wx.SplitterWindow(self, wx.ID_ANY, style=wx.SP_BORDER|wx.SP_LIVE_UPDATE|wx.SP_3DSASH)
+        self.mainPanel = wx.SplitterWindow(self, wx.ID_ANY, style=wx.SP_LIVE_UPDATE|wx.SP_3D)
         self.mainPanel.SetMinimumPaneSize(100)
         self.treePanel = wx.Panel(self.mainPanel, wx.ID_ANY,
             style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        #self.dataPanel = wx.Panel(self.mainPanel, wx.ID_ANY,
-        #    style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER)
-        #self.mainPanel.SplitVertically(self.treePanel, self.dataPanel, 200)
         
         self.dataWindow = G2DataWindow(self.mainPanel)
-        #self.dataWindow = wxscroll.ScrolledPanel(self.mainPanel,style=wx.BORDER_SUNKEN)
         dataSizer = wx.BoxSizer(wx.VERTICAL)
         self.dataWindow.SetSizer(dataSizer)
@@ -2998 +2982 @@
         #FillWindow(self.dataWindow)
         
-        #self.dataWindow = G2DataWindow(self.dataPanel)
-        #self.dataWindow.SetSize(self.dataPanel.GetClientSize())
-        #self.dataWindow.SetInitialSize()
         self.dataWindow.SetupScrolling()
         self.dataFrame = self.dataWindow        #kluge!!
-#        self.SetDataSize()
-        
         
         plotFrame = wx.Frame(None,-1,'GSASII Plots',size=wx.Size(700,600), \
@@ -3155 +3134 @@
     def OnGPXtreeItemExpanded(self, event):
         'Called when a tree item is expanded'
-        self.OnDataTreeSelChanged(event)
+        #self.OnDataTreeSelChanged(event)  # removed -- why select & show a tree item when expanding it? BHT
         event.Skip()
         
@@ -3910 +3889 @@
             import traceback
             print traceback.format_exc()
-        
+
     def StartProject(self):
         '''Opens a GSAS-II project file & selects the 1st available data set to 
@@ -5747 +5726 @@
         '''Initializes the contents of the dataWindow panel
         '''
-        self.SetBackgroundColour(wx.WHITE)
+        #self.SetBackgroundColour(wx.WHITE)  # BHT: I prefer a gray background. Makes TextCtrls stand out
+        self.SetBackgroundColour(wx.Colour(248,248,248))  # BHT: I prefer a gray background. Makes TextCtrls stand out, but
+        # a bit lighter than the splitter bar
+
         Sizer = self.GetSizer()
         if Sizer:
@@ -5754 +5736 @@
             print 'No sizer in dataWindow'
             if GSASIIpath.GetConfigValue('debug'): raise Exception
-        #self.SetSize(self.GetParent().GetSize())
-        #self.SetAutoLayout(True)
-        #self.SetupScrolling()
         
     def SetDataSize(self):
         '''Sizes the contents of the dataWindow panel
         '''
-        self.SetBackgroundColour(wx.WHITE)
         Sizer = self.GetSizer()
-        if Sizer:
-            Sizer.Fit(self)
-        else:
+        if GSASIIpath.GetConfigValue('debug') and not Sizer:
             print 'No sizer in dataWindow'
-            if GSASIIpath.GetConfigValue('debug'): raise Exception
+            raise Exception
         self.Layout()
         self.SendSizeEvent()
-        #self.SetSize(self.GetParent().GetSize())
-        #self.SetAutoLayout(True)
-        #self.SetupScrolling()
-        
         
 #TODO - remove         
@@ -5850 +5822 @@
                     
     G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Notebook')
-    G2frame.dataWindow.ClearData()
-    G2frame.dataWindow.SetupScrolling()
-    mainSizer = wx.BoxSizer()
-    text = wx.TextCtrl(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetSize(),
-        style=wx.TE_MULTILINE|wx.TE_PROCESS_ENTER | wx.TE_DONTWRAP)
+    text = wx.TextCtrl(G2frame.dataWindow,wx.ID_ANY,
+            style=wx.TE_MULTILINE|wx.TE_PROCESS_ENTER | wx.TE_DONTWRAP)
     text.Bind(wx.EVT_TEXT_ENTER,OnNoteBook)
     text.Bind(wx.EVT_KILL_FOCUS,OnNoteBook)
@@ -5860 +5829 @@
         text.AppendText(line+"\n")
     text.AppendText('Notebook entry @ '+time.ctime()+"\n")
-    mainSizer.Add(text,1,wx.EXPAND)
-    G2frame.dataWindow.SetAutoLayout(True)
-    G2frame.dataWindow.Layout()
-    G2frame.dataWindow.SetSizer(mainSizer)
-    
-#    G2frame.SetDataSize()
+    G2frame.dataWindow.GetSizer().Add(wx.StaticText(G2frame.dataWindow,-1,' Add notes on project here: '),0,WACV)
+    G2frame.dataWindow.GetSizer().Add(text,1,wx.ALL|wx.EXPAND)
             
 ################################################################################
@@ -5874 +5839 @@
 
     G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Comments')
-    G2frame.dataWindow.ClearData()
-#    G2frame.dataWindow.SetupScrolling()
-    text = wx.TextCtrl(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetSize(),
-        style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP)
+    lines = ""
     for line in data:
-        if '\n' not in line:
-            text.AppendText(line+'\n')
-        else:
-            text.AppendText(line)
-    mainSizer = wx.BoxSizer()
-    mainSizer.Add(text,1,wx.EXPAND)
-    G2frame.dataWindow.SetAutoLayout(True)
-    G2frame.dataWindow.Layout()
-    G2frame.dataWindow.SetSizer(mainSizer)
-#    G2frame.SetDataSize()
+        lines += line.rstrip()+'\n'
+    text = wx.StaticText(G2frame.dataWindow,wx.ID_ANY,lines)
+    G2frame.dataWindow.GetSizer().Add(text,1,wx.ALL|wx.EXPAND)
+
             
 ################################################################################
@@ -7588 +7544 @@
     
     G2frame.dataWindow.ClearData()
-    mainSizer = wx.BoxSizer(wx.VERTICAL)
+    mainSizer = G2frame.dataWindow.GetSizer()
     mainSizer.Add((5,5),)
     wtSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -7643 +7599 @@
                         (data[0][pfx+'Rf^2'],data[0][pfx+'Rf'],data[0][value])))
                     
-    mainSizer.Add((5,5),)
-    mainSizer.Layout()    
-    G2frame.dataWindow.SetSizer(mainSizer)
-    mainSizer.Fit(G2frame.dataWindow)
-    G2frame.SetDataSize()
-    
     G2frame.GPXtree.SetItemPyData(item,data)
     G2frame.PatternId = item
@@ -7722 +7672 @@
 
 def SelectDataTreeItem(G2frame,item,oldFocus=None):
-    '''Called from :meth:`GSASII.GSASII.OnDataTreeSelChanged` when a item is selected on the tree.
+    '''Called from :meth:`GSASIIdataGUI.GSASII.OnDataTreeSelChanged` when a item is selected on the tree.
     Also called from GSASII.OnGPXtreeEndDrag, OnAddPhase -- might be better to select item, triggering
     the the bind to SelectDataTreeItem
@@ -7771 +7721 @@
         G2frame.helpKey = "Data tree"
         G2frame.dataWindow.GetSizer().Add(
-            wx.TextCtrl(G2frame.dataWindow,size=G2frame.GetClientSize(),
-                    value='Select an item from the tree to see/edit parameters')
-                    )
+            wx.StaticText(G2frame.dataWindow, wx.ID_ANY,
+                    'Select an item from the tree to see/edit parameters'))
         G2frame.dataWindow.SetDataSize()
         return
     else:
-        # what does this code do? Is it still needed? 
-        try:    #don't know why here when opening new project  from inside phase data!
+        # Set up the help entry for the current selected tree item
+        try:    #don't know why we get here when opening new project
             parentID = G2frame.GPXtree.GetItemParent(item)
             # save name of calling tree item for help. N.B. may want to override this later
-            prfx = G2frame.GPXtree.GetItemText(item).split()[0]
+            prfx = G2frame.GPXtree.GetItemText(item).split()[0].upper()
             prfx1 = G2frame.GPXtree.GetItemText(parentID).split()[0]
-            if prfx in ('IMG','PKS','PWDR','SASD','HKLF','PDF','refd',):
+            if prfx in ('IMG','PKS','PWDR','SASD','HKLF','PDF','REFD',):
                 G2frame.dataWindow.helpKey = prfx
+            elif prfx1 == 'Phases':
+                G2frame.dataWindow.helpKey = 'Phases'
             elif prfx1 in ('IMG','PKS','PWDR','SASD','HKLF','PDF','REFD',):
                 suffix = G2frame.GPXtree.GetItemText(item)
@@ -7793 +7744 @@
                 G2frame.dataWindow.helpKey = G2frame.GPXtree.GetItemText(item) # save name of calling tree item for help
         except IndexError:
-            print 'bug: why here?'
-            return
+            G2frame.dataWindow.helpKey = ''
+            if GSASIIpath.GetConfigValue('debug'):
+                print 'bug: why here?'
+                G2obj.HowDidIgetHere()
+        
     # clear out the old panel contents
     G2frame.dataWindow.ClearData()
@@ -7822 +7776 @@
                 Nvars = len(data['varyList'])
                 Rvals = data['Rvals']
-                text = '\nFinal residuals: \nwR = %.3f%% \nchi**2 = %.1f \nGOF = %.2f ' \
-                    %(Rvals['Rwp'],Rvals['chisq'],Rvals['GOF'])
-                text += '\nNobs = %d \nNvals = %d \nSVD zeros = %d'%(Rvals['Nobs'],Nvars,Rvals.get('SVD0',0.))
+                text = ('Residuals after last refinement:\n'+
+                        '\twR = {:.3f}\n\tchi**2 = {:.1f}\n\tGOF = {:.2f}').format(
+                        Rvals['Rwp'],Rvals['chisq'],Rvals['GOF'])
+                text += '\n\tNobs = {}\n\tNvals = {}\n\tSVD zeros = {}'.format(
+                    Rvals['Nobs'],Nvars,Rvals.get('SVD0',0.))
                 if 'lamMax' in Rvals:
-                    text += '\nlog10 MaxLambda = %.1f'%(np.log10(Rvals['lamMax']))
-            G2frame.dataWindow.ClearData()
-            wx.TextCtrl(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetSize(),
-                value='See plot window for covariance display'+text,style=wx.TE_MULTILINE)
+                    text += '\n\tlog10 MaxLambda = {:.1f}'.format(np.log10(Rvals['lamMax']))
+                G2frame.dataWindow.GetSizer().Add(
+                    wx.StaticText(G2frame.dataWindow,wx.ID_ANY,text)
+                )
             G2plt.PlotCovariance(G2frame,data)
         elif G2frame.GPXtree.GetItemText(item) == 'Constraints':

branch/2frame/GSASIIobj.py

@@ -469 +469 @@
 diffraction data for that information are directly associated with
 that tree item and there are a series of children to that item. The
-routines :func:`GSASII.GSASII.GetUsedHistogramsAndPhasesfromTree`
+routines :func:`GSASIIdataGUI.GSASII.GetUsedHistogramsAndPhasesfromTree`
 and :func:`GSASIIstrIO.GetUsedHistogramsAndPhases` will
 load this information into a dictionary where the child tree name is
@@ -632 +632 @@
 diffraction data for that information are directly associated with
 that tree item and there are a series of children to that item. The
-routines :func:`GSASII.GSASII.GetUsedHistogramsAndPhasesfromTree`
+routines :func:`GSASIIdataGUI.GSASII.GetUsedHistogramsAndPhasesfromTree`
 and :func:`GSASIIstrIO.GetUsedHistogramsAndPhases` will
 load this information into a dictionary where the child tree name is
@@ -719 +719 @@
 with a top-level entry named beginning with the string "IMG ". The
 image data are directly associated with that tree item and there 
-are a series of children to that item. The routines :func:`GSASII.GSASII.GetUsedHistogramsAndPhasesfromTree`
+are a series of children to that item. The routines :func:`GSASIIdataGUI.GSASII.GetUsedHistogramsAndPhasesfromTree`
 and :func:`GSASIIstrIO.GetUsedHistogramsAndPhases` will
 load this information into a dictionary where the child tree name is
@@ -845 +845 @@
 The dictionary keys are the name of the parameter (<phase>:<hist>:<name>:<atom>). 
 It is prepared in two ways. When loaded from the tree
-(in :meth:`GSASII.GSASII.MakeLSParmDict` and
+(in :meth:`GSASIIdataGUI.GSASII.MakeLSParmDict` and
 :meth:`GSASIIIO.ExportBaseclass.loadParmDict`), 
 the values are lists with two elements: ``[value, refine flag]``
@@ -1093 +1093 @@
     This is called in three places (only): :func:`GSASIIstrIO.GetUsedHistogramsAndPhases`
     (which loads the histograms and phases from a GPX file),
-    :meth:`~GSASII.GSASII.GetUsedHistogramsAndPhasesfromTree`
+    :meth:`~GSASIIdataGUI.GSASII.GetUsedHistogramsAndPhasesfromTree`
     (which loads the histograms and phases from the data tree.) and
     :meth:`GSASIIconstrGUI.UpdateConstraints`
@@ -1887 +1887 @@
 
     Objects constructed that subclass this (in import/G2phase_*.py etc.) will be used
-    in :meth:`GSASII.GSASII.OnImportPhase`. 
+    in :meth:`GSASIIdataGUI.GSASII.OnImportPhase`. 
     See :ref:`Writing a Import Routine<Import_Routines>`
     for an explanation on how to use this class. 
@@ -1905 +1905 @@
     of structure factors.
 
-    Structure factors are read with a call to :meth:`GSASII.GSASII.OnImportSfact`
-    which in turn calls :meth:`GSASII.GSASII.OnImportGeneric`, which calls
+    Structure factors are read with a call to :meth:`GSASIIdataGUI.GSASII.OnImportSfact`
+    which in turn calls :meth:`GSASIIdataGUI.GSASII.OnImportGeneric`, which calls
     methods :meth:`ExtensionValidator`, :meth:`ContentsValidator` and
     :meth:`Reader`.
@@ -1965 +1965 @@
 
     Objects constructed that subclass this (in import/G2pwd_*.py etc.) will be used
-    in :meth:`GSASII.GSASII.OnImportPowder`. 
+    in :meth:`GSASIIdataGUI.GSASII.OnImportPowder`. 
     See :ref:`Writing a Import Routine<Import_Routines>`
     for an explanation on how to use this class. 
@@ -2106 +2106 @@
     
       * Initial reading is typically done from a menu item
-        with a call to :meth:`GSASII.GSASII.OnImportImage`
-        which in turn calls :meth:`GSASII.GSASII.OnImportGeneric`. That calls
+        with a call to :meth:`GSASIIdataGUI.GSASII.OnImportImage`
+        which in turn calls :meth:`GSASIIdataGUI.GSASII.OnImportGeneric`. That calls
         methods :meth:`ExtensionValidator`, :meth:`ContentsValidator` and
         :meth:`Reader`. This returns a list of reader objects for each read image. 

branch/2frame/GSASIIphsGUI.py

@@ -1066 +1066 @@
     in the main (data tree) window.
     Called only from :meth:`GSASIIdataGUI.SelectDataTreeItem`,
-    which in turn is called from :meth:`GSASII.GSASII.OnDataTreeSelChanged`
+    which in turn is called from :meth:`GSASIIdataGUI.GSASII.OnDataTreeSelChanged`
     when a Phase tree item is selected. This creates all tabs on the page and fills
     their contents. Routine OnPageChanged is called each time a tab is pressed
@@ -1302 +1302 @@
                     pages = [G2frame.phaseDisplay.GetPageText(PageNum) for PageNum in range(G2frame.phaseDisplay.GetPageCount())]
                     if generalData['Type'] == 'faulted':
-                        G2frame.dataFrame.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX)
-                        G2frame.dataFrame.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE)
-                        G2frame.dataFrame.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE)
-                        G2frame.dataFrame.Bind(wx.EVT_MENU, OnFitLayers, id=G2gd.wxID_LAYERSFIT)                        
+                        G2frame.dataWindow.Bind(wx.EVT_MENU, OnLoadDIFFaX, id=G2gd.wxID_LOADDIFFAX)
+                        G2frame.dataWindow.Bind(wx.EVT_MENU, OnSimulate, id=G2gd.wxID_LAYERSIMULATE)
+                        G2frame.dataWindow.Bind(wx.EVT_MENU, OnSeqSimulate, id=G2gd.wxID_SEQUENCESIMULATE)
+                        G2frame.dataWindow.Bind(wx.EVT_MENU, OnFitLayers, id=G2gd.wxID_LAYERSFIT)                        
                         if 'Wave Data' in pages:
                             pass
@@ -1899 +1899 @@
             def OnRefList(event):
                 if not refsList: 
-                    G2G.G2MessageBox(G2frame.dataFrame,'No reflections')
+                    G2G.G2MessageBox(G2frame,'No reflections')
                     return
                 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
@@ -2300 +2300 @@
 
         if generalData['Modulated']:
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_SINGLEMCSA,False)
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_MULTIMCSA,False)
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_4DCHARGEFLIP,True)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_SINGLEMCSA,False)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_MULTIMCSA,False)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_4DCHARGEFLIP,True)
             mainSizer.Add(ModulatedSizer(generalData['Type']))
             G2G.HorizontalLine(mainSizer,General)
         else:
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_SINGLEMCSA,True)
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_MULTIMCSA,True)
-            G2frame.dataFrame.GeneralCalc.Enable(G2gd.wxID_4DCHARGEFLIP,False)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_SINGLEMCSA,True)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_MULTIMCSA,True)
+            G2frame.dataWindow.GeneralCalc.Enable(G2gd.wxID_4DCHARGEFLIP,False)
 
         mainSizer.Add(PawleySizer())
@@ -2321 +2321 @@
             mainSizer.Add(MCSASizer())
         G2frame.GetStatusBar().SetStatusText('')
-        SetPhaseWindow(G2frame.dataFrame,General,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(G2frame.dataWindow,General,mainSizer,Scroll=Scroll)
         
     def OnTransform(event):
@@ -2758 +2758 @@
                             Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,Atoms,size=[700,300])
+            SetPhaseWindow(G2frame.dataWindow,Atoms,size=[700,300])
 
         # FillAtomsGrid executable code starts here
@@ -2785 +2785 @@
         if atomData:
             for item in Items:    
-                G2frame.dataFrame.AtomsMenu.Enable(item,True)
+                G2frame.dataWindow.AtomsMenu.Enable(item,True)
         else:
             for item in Items:
-                G2frame.dataFrame.AtomsMenu.Enable(item,False)
+                G2frame.dataWindow.AtomsMenu.Enable(item,False)
         Items = [G2gd.wxID_ATOMVIEWINSERT, G2gd.wxID_ATOMSVIEWADD,G2gd.wxID_ATOMMOVE]
         if 'showABC' in data['Drawing']:
             for item in Items:
-                G2frame.dataFrame.AtomsMenu.Enable(item,True)
+                G2frame.dataWindow.AtomsMenu.Enable(item,True)
         else:
             for item in Items:
-                G2frame.dataFrame.AtomsMenu.Enable(item,False)
+                G2frame.dataWindow.AtomsMenu.Enable(item,False)
         parmChoice = ': ,X,XU,U,F,FX,FXU,FU'
         if generalData['Type'] == 'magnetic':
@@ -2990 +2990 @@
             SetupGeneral()
             data['General']['HydIds'].update(HydIds)
-            G2frame.dataFrame.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,True)
+            G2frame.dataWindow.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,True)
             data['Drawing']['Atoms'] = []
             UpdateDrawAtoms()
@@ -3021 +3021 @@
             del HydIds[HId]
         if not len(HydIds):
-            G2frame.dataFrame.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
+            G2frame.dataWindow.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
         data['Drawing']['Atoms'] = []
         UpdateDrawAtoms()
@@ -3144 +3144 @@
         SetupGeneral()
         if not len(HydIds):
-            G2frame.dataFrame.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
+            G2frame.dataWindow.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
         event.StopPropagation()
 
@@ -3438 +3438 @@
         msg = 'Density of phase {:s} = {:.3f} g/cc'.format(data['General']['Name'],density)
         print(msg)
-        G2G.G2MessageBox(G2frame.dataFrame,msg,'Density')
+        G2G.G2MessageBox(G2frame,msg,'Density')
         
     def OnValidProtein(event):
@@ -3680 +3680 @@
         generalData = data['General']
         cx,ct,cs,cia = generalData['AtomPtrs']
-        reqrdr = G2frame.dataFrame.ReImportMenuId.get(event.GetId())
+        reqrdr = G2frame.dataWindow.ReImportMenuId.get(event.GetId())
         rdlist = G2frame.OnImportGeneric(reqrdr,
             G2frame.ImportPhaseReaderlist,'phase')
@@ -4374 +4374 @@
         bottomSizer.Add(StackSizer())
         mainSizer.Add(bottomSizer)
-        SetPhaseWindow(G2frame.dataFrame,G2frame.layerData,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(G2frame.dataWindow,G2frame.layerData,mainSizer,Scroll=Scroll)
         
     def OnCopyPhase(event):
@@ -4649 +4649 @@
             mainSizer.Add(G2frame.bottomSizer)
             mainSizer.Layout()
-            G2frame.dataFrame.Refresh()
+            G2frame.dataWindow.Refresh()
             waveData.SetVirtualSize(mainSizer.GetMinSize())
             waveData.Scroll(0,Scroll)
-            G2frame.dataFrame.SendSizeEvent()
+            G2frame.dataWindow.SendSizeEvent()
             
         def ShowAtomInfo():
@@ -4811 +4811 @@
         G2frame.bottomSizer = ShowAtomInfo()
         mainSizer.Add(G2frame.bottomSizer)
-        SetPhaseWindow(G2frame.dataFrame,G2frame.waveData,mainSizer,Scroll=Scroll)
+        SetPhaseWindow(G2frame.dataWindow,G2frame.waveData,mainSizer,Scroll=Scroll)
     
     def OnWaveVary(event):
@@ -5181 +5181 @@
            if colLabels[c] not in ['Style','Label','Color']:
                 drawAtoms.SetColAttr(c,attr)
-        SetPhaseWindow(G2frame.dataFrame,drawAtoms,size=[600,300])
+        SetPhaseWindow(G2frame.dataWindow,drawAtoms,size=[600,300])
 
         FindBondsDraw(data)
@@ -6092 +6092 @@
         mainSizer.Add((5,5),0)
         mainSizer.Add(PlaneSizer(),0,)
-        SetPhaseWindow(G2frame.dataFrame,drawOptions,mainSizer)
+        SetPhaseWindow(G2frame.dataWindow,drawOptions,mainSizer)
 
 ################################################################################
@@ -6473 +6473 @@
         mainSizer.Add(angSizer,0,WACV|wx.LEFT,5)
 #        mainSizer.Add(SHPenalty(textureData['Penalty']),0,WACV|wx.LEFT,5)  for future
-        SetPhaseWindow(G2frame.dataFrame,Texture,mainSizer)
+        SetPhaseWindow(G2frame.dataWindow,Texture,mainSizer)
 
 ################################################################################
@@ -6492 +6492 @@
             item, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)                        
             if not TextList: 
-                G2G.G2MessageBox(G2frame.dataFrame,'No reflections')
+                G2G.G2MessageBox(G2frame,'No reflections')
                 return
         dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
@@ -6549 +6549 @@
         hist = G2frame.hist
         if data['Histograms']:
-            dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame, 'Use histograms', 
-                'Use which histograms?',G2frame.dataFrame.HistsInPhase)
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Use histograms', 
+                'Use which histograms?',G2frame.dataWindow.HistsInPhase)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
                     sel = dlg.GetSelections()
-                    for id,item in enumerate(G2frame.dataFrame.HistsInPhase):
+                    for id,item in enumerate(G2frame.dataWindow.HistsInPhase):
                         if id in sel:
                             data['Histograms'][item]['Use'] = True
@@ -6597 +6597 @@
     def OnDataCopy(event):
         hist = G2frame.hist
-        keyList = G2frame.dataFrame.HistsInPhase[:]
+        keyList = G2frame.dataWindow.HistsInPhase[:]
         if hist in keyList: keyList.remove(hist)
         if not keyList:
-            G2G.G2MessageBox(G2frame.dataFrame,'No histograms to copy to')
+            G2G.G2MessageBox(G2frame,'No histograms to copy to')
             return
         sourceDict = data['Histograms'][hist]
@@ -6610 +6610 @@
         for name in copyNames: 
             copyDict[name] = copy.deepcopy(sourceDict[name])        #force copy
-        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,
+        dlg = G2G.G2MultiChoiceDialog(G2frame,
                 u'Copy phase/histogram parameters\nfrom '+hist[5:][:35],
                 'Copy phase/hist parameters', keyList)
@@ -6653 +6653 @@
                 for bab in babNames:
                     copyDict[name][bab] = sourceDict[name][bab][1]                       
-        keyList = G2frame.dataFrame.HistsInPhase[:]
+        keyList = G2frame.dataWindow.HistsInPhase[:]
         if hist in keyList: keyList.remove(hist)
         if not keyList:
-            G2G.G2MessageBox(G2frame.dataFrame,'No histograms to copy to')
+            G2G.G2MessageBox(G2frame,'No histograms to copy to')
             return
-        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,
+        dlg = G2G.G2MultiChoiceDialog(G2frame,
                 u'Copy phase/histogram flags\nfrom '+hist[5:][:35],
                 'Copy phase/hist flags', keyList)
@@ -6699 +6699 @@
         hist = G2frame.hist
         sourceDict = data['Histograms'][hist]
-        keyList = G2frame.dataFrame.HistsInPhase[:]
+        keyList = G2frame.dataWindow.HistsInPhase[:]
         if hist in keyList: keyList.remove(hist)
         if not keyList:
-            G2G.G2MessageBox(G2frame.dataFrame,'No histograms to copy to')
+            G2G.G2MessageBox(G2frame,'No histograms to copy to')
             return
         copyDict = {}
@@ -6709 +6709 @@
         else:  #PWDR  
             copyNames = ['Scale','Pref.Ori.','Size','Mustrain','HStrain','Extinction','Babinet','LeBail']
-        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select which parameters to copy',
+        dlg = G2G.G2MultiChoiceDialog(G2frame,'Select which parameters to copy',
             'Select phase data parameters', copyNames)
         selectedItems = []
@@ -6721 +6721 @@
         for parm in selectedItems:
             copyDict[parm] = copy.deepcopy(sourceDict[parm])
-        dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,
+        dlg = G2G.G2MultiChoiceDialog(G2frame,
                         u'Copy selected phase/histogram parameters\nfrom '+hist[5:][:35],
                         'Copy selected phase/hist parameters', keyList)
@@ -6747 +6747 @@
                 item, cookie = G2frame.GPXtree.GetNextChild(G2frame.root, cookie)
             if not TextList: 
-                G2G.G2MessageBox(G2frame.dataFrame,'No histograms')
+                G2G.G2MessageBox(G2frame,'No histograms')
                 return
             dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select powder histograms to use',
@@ -6774 +6774 @@
                 
     def OnDataDelete(event):
-        if G2frame.dataFrame.HistsInPhase:
+        if G2frame.dataWindow.HistsInPhase:
             DelList = []
-            dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame, 'Delete histogram', 
-                'Which histogram to delete from this phase?',G2frame.dataFrame.HistsInPhase)
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Delete histogram', 
+                'Which histogram to delete from this phase?',G2frame.dataWindow.HistsInPhase)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
-                    DelList = [G2frame.dataFrame.HistsInPhase[i] for i in dlg.GetSelections()]
+                    DelList = [G2frame.dataWindow.HistsInPhase[i] for i in dlg.GetSelections()]
                     for i in DelList:
                         del data['Histograms'][i]
@@ -7087 +7087 @@
             mainSizer.Add(G2frame.bottomSizer)
             mainSizer.Layout()
-            G2frame.dataFrame.Refresh()
+            G2frame.dataWindow.Refresh()
             RigidBodies.SetVirtualSize(mainSizer.GetMinSize())
             RigidBodies.Scroll(0,Scroll)
-            G2frame.dataFrame.SendSizeEvent()
+            G2frame.dataWindow.SendSizeEvent()
             G2plt.PlotStructure(G2frame,data)
             wx.CallAfter(oldFocus.SetFocus)
@@ -7145 +7145 @@
                 mainSizer.Add(VecrbSizer(RBObj))
 
-        SetPhaseWindow(G2frame.dataFrame,RigidBodies,mainSizer)
+        SetPhaseWindow(G2frame.dataWindow,RigidBodies,mainSizer)
 
     def OnRBCopyParms(event):
@@ -7475 +7475 @@
             btnSizer.Add((20,20),1)
             mainSizer.Add(btnSizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP, 10)
-            SetPhaseWindow(G2frame.dataFrame,RigidBodies,mainSizer)
+            SetPhaseWindow(G2frame.dataWindow,RigidBodies,mainSizer)
         wx.CallAfter(Draw)
         
@@ -8042 +8042 @@
             mainSizer.Add(ResultsSizer(Results))
             
-        SetPhaseWindow(G2frame.dataFrame,G2frame.MCSA,mainSizer)
+        SetPhaseWindow(G2frame.dataWindow,G2frame.MCSA,mainSizer)
         
     def SetSolution(result,Models):
@@ -8176 +8176 @@
             print '**** ERROR - no rigid bodies defined ****'
             return
-        dlg = wx.SingleChoiceDialog(G2frame.dataFrame,'Select','Rigid body',rbNames.keys())
+        dlg = wx.SingleChoiceDialog(G2frame,'Select','Rigid body',rbNames.keys())
         if dlg.ShowModal() == wx.ID_OK:
             sel = dlg.GetSelection()
@@ -8275 +8275 @@
             G2frame.PawleyRefl.SetMargins(0,0)
             G2frame.PawleyRefl.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,G2frame.PawleyRefl,size=[450,300])
+            SetPhaseWindow(G2frame.dataWindow,G2frame.PawleyRefl,size=[450,300])
                     
     def OnPawleySet(event):
@@ -8287 +8287 @@
         generalData = data['General']
         startDmin = generalData['Pawley dmin']
-        General = wx.Dialog(G2frame.dataFrame,wx.ID_ANY,'Set Pawley Parameters',
+        genDlg = wx.Dialog(G2frame,wx.ID_ANY,'Set Pawley Parameters',
                         style=wx.DEFAULT_DIALOG_STYLE)
         mainSizer = wx.BoxSizer(wx.VERTICAL)
-        mainSizer.Add(wx.StaticText(General,wx.ID_ANY,
+        mainSizer.Add(wx.StaticText(genDlg,wx.ID_ANY,
                                     'Set Pawley Extraction Parameters for phase '+
                                     generalData.get('Name','?')))
         mainSizer.Add([5,10])
         pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
-        pawleySizer.Add(wx.StaticText(General,label=' Do Pawley refinement?: '),0,WACV)
-        pawlRef = G2G.G2CheckBox(General,'',generalData,'doPawley',
+        pawleySizer.Add(wx.StaticText(genDlg,label=' Do Pawley refinement?: '),0,WACV)
+        pawlRef = G2G.G2CheckBox(genDlg,'',generalData,'doPawley',
                              DisablePawleyOpts)
         pawleySizer.Add(pawlRef,0,WACV)
         mainSizer.Add(pawleySizer)
         pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
-        pawleySizer.Add(wx.StaticText(General,label=' Pawley dmin: '),0,WACV)
+        pawleySizer.Add(wx.StaticText(genDlg,label=' Pawley dmin: '),0,WACV)
         def d2Q(*a,**kw):
             temp['Qmax'] = 2 * math.pi / generalData['Pawley dmin']
             pawlQVal.SetValue(temp['Qmax'])
-        pawlVal = G2G.ValidatedTxtCtrl(General,generalData,'Pawley dmin',
+        pawlVal = G2G.ValidatedTxtCtrl(genDlg,generalData,'Pawley dmin',
                min=0.25,max=20.,nDig=(10,5),typeHint=float,OnLeave=d2Q)
         pawleySizer.Add(pawlVal,0,WACV)
-        pawleySizer.Add(wx.StaticText(General,label='   Qmax: '),0,WACV)
+        pawleySizer.Add(wx.StaticText(genDlg,label='   Qmax: '),0,WACV)
         temp = {'Qmax':2 * math.pi / generalData['Pawley dmin']}
         def Q2D(*args,**kw):
             generalData['Pawley dmin'] = 2 * math.pi / temp['Qmax']
             pawlVal.SetValue(generalData['Pawley dmin'])        
-        pawlQVal = G2G.ValidatedTxtCtrl(General,temp,'Qmax',
+        pawlQVal = G2G.ValidatedTxtCtrl(genDlg,temp,'Qmax',
                min=0.314,max=25.,nDig=(10,5),typeHint=float,OnLeave=Q2D)
         pawleySizer.Add(pawlQVal,0,WACV)
         mainSizer.Add(pawleySizer)
         pawleySizer = wx.BoxSizer(wx.HORIZONTAL)
-        pawleySizer.Add(wx.StaticText(General,label=' Pawley neg. wt.: '),0,WACV)
-        pawlNegWt = G2G.ValidatedTxtCtrl(General,generalData,'Pawley neg wt',
+        pawleySizer.Add(wx.StaticText(genDlg,label=' Pawley neg. wt.: '),0,WACV)
+        pawlNegWt = G2G.ValidatedTxtCtrl(genDlg,generalData,'Pawley neg wt',
                     min=0.,max=1.,nDig=(10,4),typeHint=float)
         pawleySizer.Add(pawlNegWt,0,WACV)
@@ -8325 +8325 @@
 
         # make OK button
-        def OnOK(event): General.EndModal(wx.ID_OK)
+        def OnOK(event): genDlg.EndModal(wx.ID_OK)
         mainSizer.Add([5,5])
         btnsizer = wx.StdDialogButtonSizer()
-        btn = wx.Button(General, wx.ID_OK)
+        btn = wx.Button(genDlg, wx.ID_OK)
         btn.Bind(wx.EVT_BUTTON, OnOK)
         btn.SetDefault()
         btnsizer.AddButton(btn)
-        btn = wx.Button(General, wx.ID_CANCEL) 
+        btn = wx.Button(genDlg, wx.ID_CANCEL) 
         btnsizer.AddButton(btn)
         btnsizer.Realize()
         mainSizer.Add(btnsizer, 0, wx.ALIGN_CENTER|wx.ALL, 5)
 
-        General.SetSizer(mainSizer)
-        mainSizer.Fit(General)
-        General.CenterOnParent()
-        res = General.ShowModal()
-        General.Destroy()
+        genDlg.SetSizer(mainSizer)
+        mainSizer.Fit(genDlg)
+        genDlg.CenterOnParent()
+        res = genDlg.ShowModal()
+        genDlg.Destroy()
 
         if generalData['doPawley'] and res == wx.ID_OK and startDmin != generalData['Pawley dmin']:
@@ -8576 +8576 @@
             MapPeaks.SetMargins(0,0)
             MapPeaks.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,MapPeaks,size=[440,300])
+            SetPhaseWindow(G2frame.dataWindow,MapPeaks,size=[440,300])
                     
     def OnPeaksMove(event):
@@ -8625 +8625 @@
         if generalData['Map'].get('Show bonds',False):
             generalData['Map']['Show bonds'] = False
-            G2frame.dataFrame.MapPeaksEdit.SetLabel(G2gd.wxID_SHOWBONDS,'Show bonds')
+            G2frame.dataWindow.MapPeaksEdit.SetLabel(G2gd.wxID_SHOWBONDS,'Show bonds')
         else:
             generalData['Map']['Show bonds'] = True
-            G2frame.dataFrame.MapPeaksEdit.SetLabel(G2gd.wxID_SHOWBONDS,'Hide bonds')
+            G2frame.dataWindow.MapPeaksEdit.SetLabel(G2gd.wxID_SHOWBONDS,'Hide bonds')
         FillMapPeaksGrid()
         G2plt.PlotStructure(G2frame,data)
@@ -8965 +8965 @@
         text = G2frame.phaseDisplay.GetPageText(page)
         G2frame.phaseDisplayPhaseText = text
-        G2frame.dataFrame.helpKey = text # use name of Phase tab for help lookup
+        G2frame.dataWindow.helpKey = text # use name of Phase tab for help lookup
         if text == 'General':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DataGeneral)
@@ -9058 +9058 @@
         G2frame.Bind(wx.EVT_MENU, OnIsoDistortCalc, id=G2gd.wxID_ISODISP)
         if 'HydIds' in data['General']:
-            G2frame.dataFrame.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,True)
+            G2frame.dataWindow.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,True)
         else:
-            G2frame.dataFrame.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
-        for id in G2frame.dataFrame.ReImportMenuId:     #loop over submenu items
+            G2frame.dataWindow.AtomEdit.Enable(G2gd.wxID_UPDATEHATOM,False)
+        for id in G2frame.dataWindow.ReImportMenuId:     #loop over submenu items
             G2frame.Bind(wx.EVT_MENU, OnReImport, id=id)
         # Wave Data
@@ -9159 +9159 @@
     G2gd.SetDataMenuBar(G2frame)
     G2frame.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Phase Data for '+PhaseName)
-    G2frame.dataWindow.ClearData()
-    if GSASIIpath.GetConfigValue('debug'):
-        G2frame.phaseDisplay = G2G.GSNoteBook(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize(),
-            style=wx.aui.AUI_NB_TOP | wx.aui.AUI_NB_TAB_SPLIT | wx.aui.AUI_NB_TAB_MOVE)
-    else:
-        G2frame.phaseDisplay = G2G.GSNoteBook(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize())
+    # Bob: why do this differently in debug mode? Is this code to test if tabs can be moved around?
+#    if GSASIIpath.GetConfigValue('debug'):
+#        G2frame.phaseDisplay = G2G.GSNoteBook(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize(),
+#            style=wx.aui.AUI_NB_TOP | wx.aui.AUI_NB_TAB_SPLIT | wx.aui.AUI_NB_TAB_MOVE)
+#    else:
+#        G2frame.phaseDisplay = G2G.GSNoteBook(parent=G2frame.dataWindow,size=G2frame.dataWindow.GetClientSize())
+    G2frame.phaseDisplay = G2G.GSNoteBook(parent=G2frame.dataWindow)
+    G2frame.dataWindow.GetSizer().Add(G2frame.phaseDisplay,1,wx.ALL|wx.EXPAND,1)
     G2frame.phaseDisplay.gridList = [] # list of all grids in notebook
     Pages = []    
@@ -9212 +9214 @@
     G2frame.phaseDisplay.AddPage(G2frame.PawleyRefl,'Pawley reflections')
     Pages.append('Pawley reflections')
-    G2frame.dataFrame.AtomCompute.Enable(G2gd.wxID_ISODISP,'ISODISTORT' in data)
-    G2frame.dataFrame.AtomCompute.Enable(G2gd.wxID_VALIDPROTEIN,'macro' in data['General']['Type'])
+    G2frame.dataWindow.AtomCompute.Enable(G2gd.wxID_ISODISP,'ISODISTORT' in data)
+    G2frame.dataWindow.AtomCompute.Enable(G2gd.wxID_VALIDPROTEIN,'macro' in data['General']['Type'])
     G2frame.phaseDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)
     FillMenus()
     if oldPage is None or oldPage == 0:
         ChangePage(0)
-        wx.CallAfter(G2frame.phaseDisplay.SendSizeEvent)
+        #wx.CallAfter(G2frame.phaseDisplay.SendSizeEvent)
     elif oldPage:
         SetupGeneral()    # not sure why one might need this when moving from phase to phase; but does not hurt

branch/2frame/GSASIIplot.py

@@ -212 +212 @@
     def RaiseLastPage(self,lastRaisedPlotTab,treeItemPlot):
         '''Raises either the Last tab clicked on or what is drawn by the selected tree item
-        This is called after a refinement is completed by :meth:`GSASII.GSASII.ResetPlots`
+        This is called after a refinement is completed by :meth:`GSASIIdataGUI.GSASII.ResetPlots`
         '''
         plotNum = None