Changeset 2036


Ignore:
Timestamp:
Oct 29, 2015 4:35:34 PM (6 years ago)
Author:
toby
Message:

roll back 2033

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIctrls.py

    r2033 r2036  
    1919import os
    2020import sys
     21import wx
     22import wx.grid as wg
     23# import wx.wizard as wz
     24import wx.aui
     25import wx.lib.scrolledpanel as wxscroll
    2126import time
    2227import copy
     28# import cPickle
     29# import numpy as np
     30# import numpy.ma as ma
     31# import scipy.optimize as so
     32import wx.html        # could postpone this for quicker startup
    2333import webbrowser     # could postpone this for quicker startup
    24 if not os.environ.get('READTHEDOCS', False):
    25     import wx
    26     import wx.grid as wg
    27     import wx.aui
    28     import wx.lib.scrolledpanel as wxscroll
    29     import wx.html        # could postpone this for quicker startup
    3034
    3135import GSASIIpath
    3236GSASIIpath.SetVersionNumber("$Revision: 1614 $")
     37# import GSASIImath as G2mth
     38# import GSASIIIO as G2IO
     39# import GSASIIstrIO as G2stIO
     40# import GSASIIlattice as G2lat
     41# import GSASIIplot as G2plt
    3342import GSASIIpwdGUI as G2pdG
     43# import GSASIIimgGUI as G2imG
     44# import GSASIIphsGUI as G2phG
     45# import GSASIIspc as G2spc
     46# import GSASIImapvars as G2mv
     47# import GSASIIconstrGUI as G2cnstG
     48# import GSASIIrestrGUI as G2restG
    3449import GSASIIpy3 as G2py3
     50# import GSASIIobj as G2obj
     51# import GSASIIexprGUI as G2exG
    3552import GSASIIlog as log
    3653
  • trunk/GSASIIgrid.py

    r2033 r2036  
    1313
    1414'''
     15import wx
     16import wx.grid as wg
     17#import wx.wizard as wz
     18#import wx.aui
     19import wx.lib.scrolledpanel as wxscroll
    1520import time
    1621import copy
     
    1823import sys
    1924import os
    20 if not os.environ.get('READTHEDOCS', False):
    21     import wx
    22     import wx.grid as wg
    23     import wx.lib.scrolledpanel as wxscroll
    24     import numpy as np
    25     import numpy.ma as ma
    26     import scipy.optimize as so
     25import numpy as np
     26import numpy.ma as ma
     27import scipy.optimize as so
    2728import GSASIIpath
    2829GSASIIpath.SetVersionNumber("$Revision$")
  • trunk/GSASIIphsGUI.py

    r2033 r2036  
    2222'''
    2323import os.path
     24import wx
     25import wx.grid as wg
     26import wx.lib.gridmovers as wgmove
     27import wx.wizard as wz
     28import wx.lib.scrolledpanel as wxscroll
     29import matplotlib as mpl
    2430import copy
    2531import time
     
    2733import random as ran
    2834import cPickle
    29 if not os.environ.get('READTHEDOCS', False):
    30     import wx
    31     import wx.grid as wg
    32     import wx.lib.gridmovers as wgmove
    33     import wx.wizard as wz
    34     import wx.lib.scrolledpanel as wxscroll
    35     import matplotlib as mpl
    36     import numpy as np
    37     import numpy.linalg as nl
    38     import numpy.ma as ma
    39     import GSASIIpath
     35import GSASIIpath
    4036GSASIIpath.SetVersionNumber("$Revision$")
    4137import GSASIIlattice as G2lat
     
    5349import GSASIIobj as G2obj
    5450import GSASIIctrls as G2G
     51import numpy as np
     52import numpy.linalg as nl
     53import numpy.ma as ma
    5554
    5655VERY_LIGHT_GREY = wx.Colour(235,235,235)
Note: See TracChangeset for help on using the changeset viewer.