Changeset 539

Timestamp:

Apr 13, 2012 2:08:57 PM (11 years ago)

Author:

toby

Message:

install OpenGL if not installed

File:

• trunk/GSASII.py (modified) (3 diffs)

trunk/GSASII.py

@@ -26 +26 @@
 import wx.lib.inspection as wxeye
 
+try:
+    import OpenGL as ogl
+except ImportError:
+    from setuptools.command import easy_install
+    print("OpenGL wwas not found. Will attempt to load the package.")
+    def install_with_easyinstall(package):
+        easy_install.main(["-U", package])
+    install_with_easyinstall('PyOpenGl')
+    print("OpenGL has been installed. Please restart GSAS-II again")
+    sys.exit()
+
 # load the GSAS routines
 import GSASIIpath
@@ -36 +47 @@
 import GSASIImapvars as G2mv
 import GSASIIsolve as G2sol
-import OpenGL as ogl
 
 #wx inspector - use as needed
@@ -205 +215 @@
             finally:
                 if fp: fp.close()
-#        item = parent.Append(wx.ID_ANY, help='Import phase data',
-#                      kind=wx.ITEM_NORMAL,text='Import Phase (generic)...')
-#        self.Bind(wx.EVT_MENU, self.OnImportPhaseGeneric, id=item.GetId())
         submenu = wx.Menu()
         item = parent.AppendMenu(wx.ID_ANY, 'Import Phase menu',
             submenu, help='Import phase data')
         self.PhaseImportMenuId = {}
+        item = submenu.Append(wx.ID_ANY,
+                              help='Import phase data based selected by extension',
+                              kind=wx.ITEM_NORMAL,text='Import Phase by extension')
+        self.Bind(wx.EVT_MENU, self.OnImportPhaseGeneric, id=item.GetId())
         for reader in self.ImportPhaseReaderlist:
             item = submenu.Append(wx.ID_ANY,