Changeset 1831 for trunk/GSASIIpwdGUI.py

Timestamp:

May 1, 2015 6:38:23 PM (7 years ago)

Author:

toby

Message:

move remaining generic controls to G2ctrls

File:

• trunk/GSASIIpwdGUI.py (modified) (16 diffs)

trunk/GSASIIpwdGUI.py

@@ -704 +704 @@
     data['peaks'] = X
     G2frame.PatternTree.SetItemPyData(G2frame.PickId,data)
-    G2frame.PeakTable = G2gd.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
+    G2frame.PeakTable = G2G.Table(data['peaks'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
     G2frame.dataFrame.SetLabel('Peak List')
-    G2frame.dataDisplay = G2gd.GSGrid(parent=G2frame.dataFrame)
+    G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)
     G2frame.dataDisplay.SetTable(G2frame.PeakTable, True)
     setBackgroundColors()                         
@@ -914 +914 @@
             wg.GRID_VALUE_FLOAT+':10,3',wg.GRID_VALUE_BOOL,
             wg.GRID_VALUE_FLOAT+':10,5',wg.GRID_VALUE_BOOL]
-            debyeTable = G2gd.Table(data[1]['debyeTerms'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
-            debyeGrid = G2gd.GSGrid(parent=G2frame.dataDisplay)
+            debyeTable = G2G.Table(data[1]['debyeTerms'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
+            debyeGrid = G2G.GSGrid(parent=G2frame.dataDisplay)
             debyeGrid.SetTable(debyeTable, True)
             debyeGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
@@ -974 +974 @@
             wg.GRID_VALUE_FLOAT+':10,3',wg.GRID_VALUE_BOOL,
             wg.GRID_VALUE_FLOAT+':10,5',wg.GRID_VALUE_BOOL]
-            peaksTable = G2gd.Table(data[1]['peaksList'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
-            peaksGrid = G2gd.GSGrid(parent=G2frame.dataDisplay)
+            peaksTable = G2G.Table(data[1]['peaksList'],rowLabels=rowLabels,colLabels=colLabels,types=Types)
+            peaksGrid = G2G.GSGrid(parent=G2frame.dataDisplay)
             peaksGrid.SetTable(peaksTable, True)
             peaksGrid.Bind(wx.EVT_KEY_DOWN, KeyEditPeakGrid)
@@ -1071 +1071 @@
         rowLabels.append('exclude')
     Types = 2*[wg.GRID_VALUE_FLOAT+':12,5',]
-    G2frame.LimitsTable = G2gd.Table(data,rowLabels=rowLabels,colLabels=colLabels,types=Types)
+    G2frame.LimitsTable = G2G.Table(data,rowLabels=rowLabels,colLabels=colLabels,types=Types)
     G2frame.dataFrame.SetLabel('Limits')
     G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.LimitMenu)
@@ -1078 +1078 @@
     G2frame.Bind(wx.EVT_MENU,OnLimitCopy,id=G2gd.wxID_LIMITCOPY)
     G2frame.Bind(wx.EVT_MENU,OnAddExcl,id=G2gd.wxID_ADDEXCLREGION)    
-    G2frame.dataDisplay = G2gd.GSGrid(parent=G2frame.dataFrame)
+    G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)
     G2frame.dataDisplay.SetTable(G2frame.LimitsTable, True)    
     G2frame.dataDisplay.SetCellStyle(0,0,VERY_LIGHT_GREY,True)
@@ -1717 +1717 @@
             freeNames[Controls[name]] = name
             Names.append(Controls[name])
-        dlg = G2gd.G2ColumnIDDialog( G2frame,' Choose multihistogram metadata columns:',
+        dlg = G2G.G2ColumnIDDialog( G2frame,' Choose multihistogram metadata columns:',
             'Select columns',Comments,Names,np.array(newItems).T)
         try:
@@ -2023 +2023 @@
         else:
             choices = ['Debye-Scherrer','Bragg-Brentano',]
-        histoType = G2gd.G2ChoiceButton(G2frame.dataDisplay,choices,
+        histoType = G2G.G2ChoiceButton(G2frame.dataDisplay,choices,
                     strLoc=data,strKey='Type',
                     onChoice=OnHistoChange)
@@ -2216 +2216 @@
             4*[wg.GRID_VALUE_LONG,]+2*[wg.GRID_VALUE_FLOAT+':10,5',]
     G2frame.PatternTree.SetItemPyData(IndexId,data)
-    G2frame.IndexPeaksTable = G2gd.Table(data[0],rowLabels=rowLabels,colLabels=colLabels,types=Types)
+    G2frame.IndexPeaksTable = G2G.Table(data[0],rowLabels=rowLabels,colLabels=colLabels,types=Types)
     G2frame.dataFrame.SetLabel('Index Peak List')
-    G2frame.dataDisplay = G2gd.GSGrid(parent=G2frame.dataFrame)                
+    G2frame.dataDisplay = G2G.GSGrid(parent=G2frame.dataFrame)                
     G2frame.dataDisplay.SetTable(G2frame.IndexPeaksTable, True)
     XY = []
@@ -2906 +2906 @@
                     hkl.insert(4,G2lat.Dsp2pos(Inst,hkl[3])+controls[1])
             table.append(row)
-        UnitCellsTable = G2gd.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
-        gridDisplay = G2gd.GSGrid(G2frame.dataDisplay)
+        UnitCellsTable = G2G.Table(table,rowLabels=rowLabels,colLabels=colLabels,types=Types)
+        gridDisplay = G2G.GSGrid(G2frame.dataDisplay)
         gridDisplay.SetTable(UnitCellsTable, True)
         G2frame.dataFrame.CopyCell.Enable(True)
@@ -2983 +2983 @@
         
     def MakeReflectionTable(phaseName):
-        '''Returns a wx.grid table (G2gd.Table) containing a list of all reflections
+        '''Returns a wx.grid table (G2G.Table) containing a list of all reflections
         for a phase.        
         '''
@@ -3037 +3037 @@
             if Super:
                 colLabels.insert(3,'M')
-        return G2gd.Table(refs,rowLabels=rowLabels,colLabels=colLabels,types=Types)
+        return G2G.Table(refs,rowLabels=rowLabels,colLabels=colLabels,types=Types)
 
     def ShowReflTable(phaseName):
@@ -3143 +3143 @@
         G2frame.dataFrame.SelectPhase.Enable(False)
             
-    G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
+    G2frame.dataDisplay = G2G.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize())
     G2frame.refTable = {}
     for tabnum,phase in enumerate(phases):
-        G2frame.refTable[phase] = G2gd.GSGrid(parent=G2frame.dataDisplay)
+        G2frame.refTable[phase] = G2G.GSGrid(parent=G2frame.dataDisplay)
         G2frame.dataDisplay.AddPage(G2frame.refTable[phase],phase)
     if phaseName not in G2frame.refTable:
@@ -3365 +3365 @@
             0,WACV)
         for name in data['Substances']:
-            G2gd.HorizontalLine(substSizer,G2frame.dataDisplay)    
+            G2G.HorizontalLine(substSizer,G2frame.dataDisplay)    
             substSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Data for '+name+':'),
                 0,WACV)
@@ -4030 +4030 @@
         partSizer.Add(topSizer,0,)
         for ilev,level in enumerate(data['Particle']['Levels']):
-            G2gd.HorizontalLine(partSizer,G2frame.dataDisplay)
+            G2G.HorizontalLine(partSizer,G2frame.dataDisplay)
             topLevel = wx.BoxSizer(wx.HORIZONTAL)
             topLevel.Add(wx.StaticText(G2frame.dataDisplay,label=' Model component %d: '%(ilev)),0,WACV)
@@ -4117 +4117 @@
     topSizer.Add(esdScale,0,WACV)
     mainSizer.Add(topSizer)
-    G2gd.HorizontalLine(mainSizer,G2frame.dataDisplay)
+    G2G.HorizontalLine(mainSizer,G2frame.dataDisplay)
     if 'Size' in data['Current']:
         if 'MaxEnt' in data['Size']['Method']:
@@ -4126 +4126 @@
     elif 'Particle' in data['Current']:
         mainSizer.Add(PartSizer(),1,wx.ALIGN_LEFT|wx.EXPAND)
-    G2gd.HorizontalLine(mainSizer,G2frame.dataDisplay)    
+    G2G.HorizontalLine(mainSizer,G2frame.dataDisplay)    
     backSizer = wx.BoxSizer(wx.HORIZONTAL)
     backSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Background:'),0,WACV)