Changeset 2036

Timestamp:

Oct 29, 2015 4:35:34 PM (10 years ago)

Author:

toby

Message:

roll back 2033

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIctrls.py ¶

@@ -19 +19 @@
 import os
 import sys
+import wx
+import wx.grid as wg
+# import wx.wizard as wz
+import wx.aui
+import wx.lib.scrolledpanel as wxscroll
 import time
 import copy
+# import cPickle
+# import numpy as np
+# import numpy.ma as ma
+# import scipy.optimize as so
+import wx.html        # could postpone this for quicker startup
 import webbrowser     # could postpone this for quicker startup
-if not os.environ.get('READTHEDOCS', False):
-    import wx
-    import wx.grid as wg
-    import wx.aui
-    import wx.lib.scrolledpanel as wxscroll
-    import wx.html        # could postpone this for quicker startup
 
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision: 1614 $")
+# import GSASIImath as G2mth
+# import GSASIIIO as G2IO
+# import GSASIIstrIO as G2stIO
+# import GSASIIlattice as G2lat
+# import GSASIIplot as G2plt
 import GSASIIpwdGUI as G2pdG
+# import GSASIIimgGUI as G2imG
+# import GSASIIphsGUI as G2phG
+# import GSASIIspc as G2spc
+# import GSASIImapvars as G2mv
+# import GSASIIconstrGUI as G2cnstG
+# import GSASIIrestrGUI as G2restG
 import GSASIIpy3 as G2py3
+# import GSASIIobj as G2obj
+# import GSASIIexprGUI as G2exG
 import GSASIIlog as log
 

trunk/GSASIIgrid.py ¶

@@ -13 +13 @@
 
 '''
+import wx
+import wx.grid as wg
+#import wx.wizard as wz
+#import wx.aui
+import wx.lib.scrolledpanel as wxscroll
 import time
 import copy
@@ -18 +23 @@
 import sys
 import os
-if not os.environ.get('READTHEDOCS', False):
-    import wx
-    import wx.grid as wg
-    import wx.lib.scrolledpanel as wxscroll
-    import numpy as np
-    import numpy.ma as ma
-    import scipy.optimize as so
+import numpy as np
+import numpy.ma as ma
+import scipy.optimize as so
 import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision$")

trunk/GSASIIphsGUI.py ¶

@@ -22 +22 @@
 '''
 import os.path
+import wx
+import wx.grid as wg
+import wx.lib.gridmovers as wgmove
+import wx.wizard as wz
+import wx.lib.scrolledpanel as wxscroll
+import matplotlib as mpl
 import copy
 import time
@@ -27 +33 @@
 import random as ran
 import cPickle
-if not os.environ.get('READTHEDOCS', False):
-    import wx
-    import wx.grid as wg
-    import wx.lib.gridmovers as wgmove
-    import wx.wizard as wz
-    import wx.lib.scrolledpanel as wxscroll
-    import matplotlib as mpl
-    import numpy as np
-    import numpy.linalg as nl
-    import numpy.ma as ma
-    import GSASIIpath
+import GSASIIpath
 GSASIIpath.SetVersionNumber("$Revision$")
 import GSASIIlattice as G2lat
@@ -53 +49 @@
 import GSASIIobj as G2obj
 import GSASIIctrls as G2G
+import numpy as np
+import numpy.linalg as nl
+import numpy.ma as ma
 
 VERY_LIGHT_GREY = wx.Colour(235,235,235)