Changeset 2036 for trunk/GSASIIphsGUI.py


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

roll back 2033

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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.