Merge pull request #52 from astrofrog/misc-fixes

Miscellaneous fixes

CHANGES.rst

@@ -1,7 +1,13 @@
 0.4 (unreleased)
 ----------------
 
-- No changes yet.
+- Fixed issues with layer visibility. [#52]
+
+- Fixed issue with viewer options not being set correctly when loading from a session. [#52]
+
+- Fixed compatibility with the latest developer version of glue. [#52]
+
+- Fixed issue with automatic installation of dependencies. [#52]
 
 0.3 (2019-02-27)
 ----------------

glue_wwt/viewer/data_viewer.py

@@ -30,7 +30,7 @@ class WWTDataViewer(DataViewer):
 
     def __init__(self, session, parent=None, state=None):
 
-        super(WWTDataViewer, self).__init__(session, parent=parent)
+        super(WWTDataViewer, self).__init__(session, parent=parent, state=state)
 
         from pywwt.qt import WWTQtClient
         self._wwt_client = WWTQtClient()

glue_wwt/viewer/layer_artist.py

@@ -59,9 +59,10 @@ class WWTLayer(LayerArtist):
 
         logger.debug("updating WWT for %s" % self.layer.label)
 
-        if self.visible is False and self.wwt_layer is not None:
-            self.wwt_layer.remove()
-            self.wwt_layer = None
+        if self.visible is False:
+            if self.wwt_layer is not None:
+                self.wwt_layer.remove()
+                self.wwt_layer = None
             return
 
         if force or 'mode' in kwargs or self.wwt_layer is None:

glue_wwt/viewer/tools.py

@@ -1,7 +1,12 @@
 from __future__ import absolute_import, division, print_function
 
 from qtpy import compat
-from glue.viewers.common.qt.tool import Tool
+
+try:
+    from glue.viewers.common.tool import Tool
+except ImportError:  # glue < 0.15
+    from glue.viewers.common.qt.tool import Tool
+
 from glue.config import viewer_tool
 
 

setup.cfg

@@ -13,7 +13,7 @@ long_description = file: README.rst
 zip_safe = False
 python_requires = >=2.7
 packages = find:
-install_require =
+install_requires =
     numpy
     glue-core>=0.14
     qtpy