Changeset 2914 for branch/2frame/GSASIIplot.py

Timestamp:

Jul 7, 2017 12:32:09 PM (5 years ago)

Author:

vondreele

Message:

fix G2constrGUI; dataDisplay --> rbBook & fix a parent issue
similarly in G2restrGUI dataDisplay --> restrBook
G2ctrlGUI; missing G2obj import & fix a parent issue on a couple of dialogs
put the wxID definitions into _initMenus - need to be sorted into each section
remove the tree title - redundant info
tree root text changed
G2plot; change dataDisplay to restrBook for torsion & Ramachandran plots
some dataDisplay --> phaseDisplay in various places

File:

• branch/2frame/GSASIIplot.py (modified) (7 diffs)

branch/2frame/GSASIIplot.py

@@ -4064 +4064 @@
         except:
             return
-        if G2frame.dataDisplay.GetPageText(page) == 'Torsion restraints':
-            torGrid = G2frame.dataDisplay.GetPage(page).Torsions
+        if G2frame.restrBook.GetPageText(page) == 'Torsion restraints':
+            torGrid = G2frame.restrBook.GetPage(page).Torsions
             torGrid.ClearSelection()
             for row in range(torGrid.GetNumberRows()):
@@ -4129 +4129 @@
             dlg.Destroy()
         PlotRama(G2frame,phaseName,Rama,RamaName,Names,PhiPsi,Coeff)
+        
     def OnPick(event):
         ind = event.ind[0]
@@ -4134 +4135 @@
         Page.canvas.SetToolTipString(msg)
         try:
-            page = G2frame.dataDisplay.GetSelection()
+            page = G2frame.restrBook.GetSelection()
         except:
             return
-        if G2frame.dataDisplay.GetPageText(page) == 'Ramachandran restraints':
-            ramaGrid = G2frame.dataDisplay.GetPage(page).Ramas
+        if G2frame.restrBook.GetPageText(page) == 'Ramachandran restraints':
+            ramaGrid = G2frame.restrBook.GetPage(page).Ramas
             ramaGrid.ClearSelection()
             for row in range(ramaGrid.GetNumberRows()):
@@ -5810 +5811 @@
         if page:
             if G2frame.phaseDisplay.GetPageText(page) == 'Draw Options':
-                G2frame.dataDisplay.viewDir.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
+                G2frame.phaseDisplay.viewDir.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
                 
     def SetMapPeaksText(mapPeaks):
@@ -5818 +5819 @@
             if G2frame.phaseDisplay.GetPageText(page) == 'Map peaks':
                 G2frame.MapPeaksTable.SetData(data['Map Peaks'])
-                panel = G2frame.dataDisplay.GetPage(page).GetChildren()
+                panel = G2frame.phaseDisplay.GetPage(page).GetChildren()
                 names = [child.GetName() for child in panel]
                 try:
@@ -5833 +5834 @@
                     table[i][2:5] = atom[2:5]
                 G2frame.atomTable.SetData(table)
-                panel = G2frame.dataDisplay.GetPage(page).GetChildren()
+                panel = G2frame.phaseDisplay.GetPage(page).GetChildren()
                 names = [child.GetName() for child in panel]
                 try:
@@ -6636 +6637 @@
 #        page = getSelection()
 #        if page:
-#            if G2frame.dataDisplay.GetPageText(page) == 'Rigid bodies':
+#            if G2frame.GetPageText(page) == 'Rigid bodies':
 #                G2frame.MapPeaksTable.SetData(mapPeaks)
-#                panel = G2frame.dataDisplay.GetPage(page).GetChildren()
+#                panel = G2frame.GetPage(page).GetChildren()
 #                names = [child.GetName() for child in panel]
 #                panel[names.index('grid window')].Refresh()