gltbx: fixes for pyopengl

- OpenGL.GLU imports may change previously loaded modules, so place first
- Deprecation updates to get wx_ellipsoids_test.py to work

cctbx/maptbx/__init__.py

@@ -2241,16 +2241,16 @@ def get_points(start, end, step=None, n_steps=None):
     # check end point
     end_ = points[-1]
     d = math.sqrt(
-      (end_[0] - start[0])**2 + 
-      (end_[1] - start[1])**2 + 
+      (end_[0] - start[0])**2 +
+      (end_[1] - start[1])**2 +
       (end_[2] - start[2])**2)
     if d<length: points.append(end)
     #
     return points
   #
   points = get_points(start=points_cart[0], end=points_cart[1], step=step,
     n_steps=n_steps)
-  
+
   dist = flex.double()
   vals = flex.double()
   mv_max = None
@@ -2267,11 +2267,11 @@ def get_points(start, end, step=None, n_steps=None):
       mv = map_data.eight_point_interpolation(pf)
     else:
       mv = map_data.tricubic_interpolation(pf)
-    if mv_max is None: 
+    if mv_max is None:
       mv_max = mv
       point_max = p[:]
     else:
-      if mv > mv_max: 
+      if mv > mv_max:
         mv_max = mv
         point_max = p[:]
     vals.append(mv)

crys3d/qttbx/xray_structure_viewer.py

@@ -3,9 +3,9 @@
 from PyQt4.QtCore import Qt
 from crys3d import qttbx
 import crys3d.qttbx.xray_structure_viewer_controls
-from gltbx import quadrics, gl_managed
 from gltbx.gl import *
 from gltbx.glu import *
+from gltbx import quadrics, gl_managed
 from cctbx import crystal
 from cctbx.array_family import flex
 from cctbx.eltbx import covalent_radii

crys3d/wx_model_viewer.py

@@ -7,11 +7,13 @@
 
 from crys3d import wx_tools
 from crys3d.model import model_data
+# pyopengl GLU imports may change location of gltbx imports (e.g. quadrics),
+# so place these first
+from gltbx.gl import *
+from gltbx.glu import *
 from gltbx.wx_viewer import wxGLWindow
 import gltbx.util
 from gltbx import viewer_utils, quadrics
-from gltbx.gl import *
-from gltbx.glu import *
 import gltbx
 import libtbx.phil
 from libtbx.introspection import method_debug_log

gltbx/images.py

@@ -1,5 +1,6 @@
 from __future__ import absolute_import, division, print_function
 import os.path
+from libtbx.utils import to_bytes
 from six.moves import range
 
 def encode(data):
@@ -50,9 +51,9 @@ def decode(self, edata):
   def as_wx_Bitmap(self):
     import wx
     w,h = self.get_size()
-    data = self.get_data()
+    data = to_bytes(self.get_data())
     mask = self.get_mask()
-    img = wx.EmptyImage(w, h)
+    img = wx.Image(w, h)
     img.SetData(data)
     if (mask >= 0):
       img.SetMaskColour(ord(data[mask]), ord(data[mask+1]), ord(data[mask+2]))
@@ -64,4 +65,3 @@ def as_wx_Bitmap(self):
   print('from gltbx.images import img_data\n')
   for arg in sys.argv[1:]:
     create_encoded(arg)
-

gltbx/wx_ellipsoids_test.py

@@ -1,11 +1,11 @@
 from __future__ import absolute_import, division, print_function
 import wx
 import gltbx.util
+from gltbx.gl import *
+from gltbx.glu import *
 from gltbx import wx_viewer
 from gltbx import quadrics
 import unicodedata
-from gltbx.gl import *
-from gltbx.glu import *
 from six.moves import zip
 
 class MyGLWindow(wx_viewer.wxGLWindow):

gltbx/wx_viewer.py

@@ -1021,7 +1021,7 @@ def OnInit(self):
       " Keyboard shortcut: a")
 
     self.toggle_spin_id = wx.NewId()
-    tb.AddCheckTool(self.toggle_spin_id,
+    tb.AddCheckTool(self.toggle_spin_id, 'label',
       images.spin_img.as_wx_Bitmap(),
       shortHelp="Spin on/off",
       longHelp="Turns auto-spin on/off. Keyboard shortcut: s")