Changeset 995

Timestamp:

Jul 17, 2013 12:54:44 PM (9 years ago)

Author:

vondreele

Message:

remove extra imports, etc. from GSASIIddataGUI.py
Select page --> Select tab
fix doubling up for draw atoms

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (4 diffs)
• GSASIIgrid.py (modified) (10 diffs)
• GSASIIphsGUI.py (modified) (5 diffs)

trunk/GSASIIddataGUI.py

@@ -18 +18 @@
 '''
 import wx
-import wx.grid as wg
-import wx.lib.gridmovers as wgmove
-import matplotlib as mpl
 import math
 import copy
 import time
 import sys
-import random as ran
-import cPickle
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision: 844 $")
@@ -40 +35 @@
 import GSASIIphsGUI as G2phsGUI
 import numpy as np
-import numpy.linalg as nl
-import numpy.ma as ma
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)
@@ -48 +41 @@
 mapDefault = {'MapType':'','RefList':'','Resolution':0.5,'Show bonds':True,
                 'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False}
-# trig functions in degrees
-sind = lambda x: np.sin(x*np.pi/180.)
-tand = lambda x: np.tan(x*np.pi/180.)
-cosd = lambda x: np.cos(x*np.pi/180.)
-asind = lambda x: 180.*np.arcsin(x)/np.pi
-acosd = lambda x: 180.*np.arccos(x)/np.pi
 
 ################################################################################
@@ -411 +398 @@
             for i in range(nTerm):
                 UseList[item]['Mustrain'][4][i] = 0.01
+        G2plt.PlotSizeStrainPO(G2frame,data)
         wx.CallAfter(UpdateDData,G2frame,DData,data)
-        G2plt.PlotSizeStrainPO(G2frame,data)
             
     def OnHstrainRef(event):

trunk/GSASIIgrid.py

@@ -1853 +1853 @@
         self.DataGeneral = wx.MenuBar()
         self.PrefillDataMenu(self.DataGeneral,helpType='General', helpLbl='Phase/General')
-        self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select page')
+        self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select tab')
         self.GeneralCalc = wx.Menu(title='')
         self.DataGeneral.Append(menu=self.GeneralCalc,title='Compute')
@@ -1873 +1873 @@
         self.DataMenu = wx.MenuBar()
         self.PrefillDataMenu(self.DataMenu,helpType='Data', helpLbl='Phase/Data')
-        self.DataMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.DataMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.DataEdit = wx.Menu(title='')
         self.DataMenu.Append(menu=self.DataEdit, title='Edit')
@@ -1887 +1887 @@
         self.AtomsMenu = wx.MenuBar()
         self.PrefillDataMenu(self.AtomsMenu,helpType='Atoms')
-        self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.AtomEdit = wx.Menu(title='')
         self.AtomCompute = wx.Menu(title='')
@@ -1936 +1936 @@
         self.DataDrawOptions = wx.MenuBar()
         self.PrefillDataMenu(self.DataDrawOptions,helpType='Draw Options', helpLbl='Phase/Draw Options',empty=True)
-        self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select page')
+        self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select tab')
         self.PostfillDataMenu(empty=True)
         
@@ -1942 +1942 @@
         self.DrawAtomsMenu = wx.MenuBar()
         self.PrefillDataMenu(self.DrawAtomsMenu,helpType='Draw Atoms')
-        self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.DrawAtomEdit = wx.Menu(title='')
         self.DrawAtomCompute = wx.Menu(title='')
@@ -1992 +1992 @@
         self.MCSAMenu = wx.MenuBar()
         self.PrefillDataMenu(self.MCSAMenu,helpType='MC/SA')
-        self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.MCSAEdit = wx.Menu(title='')
         self.MCSAMenu.Append(menu=self.MCSAEdit, title='MC/SA')
@@ -2010 +2010 @@
         self.TextureMenu = wx.MenuBar()
         self.PrefillDataMenu(self.TextureMenu,helpType='Texture')
-        self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.TextureEdit = wx.Menu(title='')
         self.TextureMenu.Append(menu=self.TextureEdit, title='Texture')
@@ -2022 +2022 @@
         self.PawleyMenu = wx.MenuBar()
         self.PrefillDataMenu(self.PawleyMenu,helpType='Pawley')
-        self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.PawleyEdit = wx.Menu(title='')
         self.PawleyMenu.Append(menu=self.PawleyEdit,title='Operations')
@@ -2038 +2038 @@
         self.MapPeaksMenu = wx.MenuBar()
         self.PrefillDataMenu(self.MapPeaksMenu,helpType='Map peaks')
-        self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.MapPeaksEdit = wx.Menu(title='')
         self.MapPeaksMenu.Append(menu=self.MapPeaksEdit, title='Map peaks')
@@ -2064 +2064 @@
         self.RigidBodiesMenu = wx.MenuBar()
         self.PrefillDataMenu(self.RigidBodiesMenu,helpType='Rigid bodies')
-        self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select page')
+        self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select tab')
         self.RigidBodiesEdit = wx.Menu(title='')
         self.RigidBodiesMenu.Append(menu=self.RigidBodiesEdit, title='Edit')

trunk/GSASIIphsGUI.py

@@ -1948 +1948 @@
         FindBondsDraw()
         drawAtoms.ClearSelection()
-        G2plt.PlotStructure(G2frame,data)
+#        G2plt.PlotStructure(G2frame,data)
 
     def DrawAtomStyle(event):
@@ -4906 +4906 @@
 
     def FillSelectPageMenu(menuBar):
-        mid = menuBar.FindMenu('Select page')
+        mid = menuBar.FindMenu('Select tab')
         for ipage,page in enumerate(Pages):
             menu = menuBar.GetMenu(mid)
@@ -4927 +4927 @@
         wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
         page = event.GetSelection()
-        print 'Tab',page
         ChangePage(page)
         
     def ChangePage(page):
         text = G2frame.dataDisplay.GetPageText(page)
-        print page,text
+        print 'Select',page,text
         if text == 'General':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral)
@@ -4993 +4992 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB)
             UpdateDrawAtoms()
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
         elif text == 'RB Models':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodiesMenu)
@@ -5085 +5085 @@
     SetupGeneral()    
     GeneralData = data['General']
-    print 'oldPage',oldPage    
     if oldPage is None:
         UpdateGeneral()