Changeset 995


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIddataGUI.py

    r991 r995  
    1818'''
    1919import wx
    20 import wx.grid as wg
    21 import wx.lib.gridmovers as wgmove
    22 import matplotlib as mpl
    2320import math
    2421import copy
    2522import time
    2623import sys
    27 import random as ran
    28 import cPickle
    2924import GSASIIpath
    3025GSASIIpath.SetVersionNumber("$Revision: 844 $")
     
    4035import GSASIIphsGUI as G2phsGUI
    4136import numpy as np
    42 import numpy.linalg as nl
    43 import numpy.ma as ma
    4437
    4538VERY_LIGHT_GREY = wx.Colour(235,235,235)
     
    4841mapDefault = {'MapType':'','RefList':'','Resolution':0.5,'Show bonds':True,
    4942                'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False}
    50 # trig functions in degrees
    51 sind = lambda x: np.sin(x*np.pi/180.)
    52 tand = lambda x: np.tan(x*np.pi/180.)
    53 cosd = lambda x: np.cos(x*np.pi/180.)
    54 asind = lambda x: 180.*np.arcsin(x)/np.pi
    55 acosd = lambda x: 180.*np.arccos(x)/np.pi
    5643
    5744################################################################################
     
    411398            for i in range(nTerm):
    412399                UseList[item]['Mustrain'][4][i] = 0.01
     400        G2plt.PlotSizeStrainPO(G2frame,data)
    413401        wx.CallAfter(UpdateDData,G2frame,DData,data)
    414         G2plt.PlotSizeStrainPO(G2frame,data)
    415402           
    416403    def OnHstrainRef(event):
  • trunk/GSASIIgrid.py

    r994 r995  
    18531853        self.DataGeneral = wx.MenuBar()
    18541854        self.PrefillDataMenu(self.DataGeneral,helpType='General', helpLbl='Phase/General')
    1855         self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select page')
     1855        self.DataGeneral.Append(menu=wx.Menu(title=''),title='Select tab')
    18561856        self.GeneralCalc = wx.Menu(title='')
    18571857        self.DataGeneral.Append(menu=self.GeneralCalc,title='Compute')
     
    18731873        self.DataMenu = wx.MenuBar()
    18741874        self.PrefillDataMenu(self.DataMenu,helpType='Data', helpLbl='Phase/Data')
    1875         self.DataMenu.Append(menu=wx.Menu(title=''),title='Select page')
     1875        self.DataMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    18761876        self.DataEdit = wx.Menu(title='')
    18771877        self.DataMenu.Append(menu=self.DataEdit, title='Edit')
     
    18871887        self.AtomsMenu = wx.MenuBar()
    18881888        self.PrefillDataMenu(self.AtomsMenu,helpType='Atoms')
    1889         self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')
     1889        self.AtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    18901890        self.AtomEdit = wx.Menu(title='')
    18911891        self.AtomCompute = wx.Menu(title='')
     
    19361936        self.DataDrawOptions = wx.MenuBar()
    19371937        self.PrefillDataMenu(self.DataDrawOptions,helpType='Draw Options', helpLbl='Phase/Draw Options',empty=True)
    1938         self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select page')
     1938        self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select tab')
    19391939        self.PostfillDataMenu(empty=True)
    19401940       
     
    19421942        self.DrawAtomsMenu = wx.MenuBar()
    19431943        self.PrefillDataMenu(self.DrawAtomsMenu,helpType='Draw Atoms')
    1944         self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select page')
     1944        self.DrawAtomsMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    19451945        self.DrawAtomEdit = wx.Menu(title='')
    19461946        self.DrawAtomCompute = wx.Menu(title='')
     
    19921992        self.MCSAMenu = wx.MenuBar()
    19931993        self.PrefillDataMenu(self.MCSAMenu,helpType='MC/SA')
    1994         self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select page')
     1994        self.MCSAMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    19951995        self.MCSAEdit = wx.Menu(title='')
    19961996        self.MCSAMenu.Append(menu=self.MCSAEdit, title='MC/SA')
     
    20102010        self.TextureMenu = wx.MenuBar()
    20112011        self.PrefillDataMenu(self.TextureMenu,helpType='Texture')
    2012         self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select page')
     2012        self.TextureMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    20132013        self.TextureEdit = wx.Menu(title='')
    20142014        self.TextureMenu.Append(menu=self.TextureEdit, title='Texture')
     
    20222022        self.PawleyMenu = wx.MenuBar()
    20232023        self.PrefillDataMenu(self.PawleyMenu,helpType='Pawley')
    2024         self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select page')
     2024        self.PawleyMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    20252025        self.PawleyEdit = wx.Menu(title='')
    20262026        self.PawleyMenu.Append(menu=self.PawleyEdit,title='Operations')
     
    20382038        self.MapPeaksMenu = wx.MenuBar()
    20392039        self.PrefillDataMenu(self.MapPeaksMenu,helpType='Map peaks')
    2040         self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select page')
     2040        self.MapPeaksMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    20412041        self.MapPeaksEdit = wx.Menu(title='')
    20422042        self.MapPeaksMenu.Append(menu=self.MapPeaksEdit, title='Map peaks')
     
    20642064        self.RigidBodiesMenu = wx.MenuBar()
    20652065        self.PrefillDataMenu(self.RigidBodiesMenu,helpType='Rigid bodies')
    2066         self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select page')
     2066        self.RigidBodiesMenu.Append(menu=wx.Menu(title=''),title='Select tab')
    20672067        self.RigidBodiesEdit = wx.Menu(title='')
    20682068        self.RigidBodiesMenu.Append(menu=self.RigidBodiesEdit, title='Edit')
  • trunk/GSASIIphsGUI.py

    r994 r995  
    19481948        FindBondsDraw()
    19491949        drawAtoms.ClearSelection()
    1950         G2plt.PlotStructure(G2frame,data)
     1950#        G2plt.PlotStructure(G2frame,data)
    19511951
    19521952    def DrawAtomStyle(event):
     
    49064906
    49074907    def FillSelectPageMenu(menuBar):
    4908         mid = menuBar.FindMenu('Select page')
     4908        mid = menuBar.FindMenu('Select tab')
    49094909        for ipage,page in enumerate(Pages):
    49104910            menu = menuBar.GetMenu(mid)
     
    49274927        wx.Frame.Unbind(G2frame.dataFrame,wx.EVT_SIZE) # ignore size events during this routine
    49284928        page = event.GetSelection()
    4929         print 'Tab',page
    49304929        ChangePage(page)
    49314930       
    49324931    def ChangePage(page):
    49334932        text = G2frame.dataDisplay.GetPageText(page)
    4934         print page,text
     4933        print 'Select',page,text
    49354934        if text == 'General':
    49364935            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataGeneral)
     
    49934992            G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB)
    49944993            UpdateDrawAtoms()
     4994            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
    49954995        elif text == 'RB Models':
    49964996            G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodiesMenu)
     
    50855085    SetupGeneral()   
    50865086    GeneralData = data['General']
    5087     print 'oldPage',oldPage   
    50885087    if oldPage is None:
    50895088        UpdateGeneral()
Note: See TracChangeset for help on using the changeset viewer.