Merge pull request #45 from astrofrog/small-fixes

Small fixes ahead of v0.3 release

CHANGES.rst

@@ -4,6 +4,9 @@
 - Added support for showing data on the surface of celestial bodies as well as
   in the 3D Solar System/Milky Way/Universe view. [#40, #42]
 
+- Added support for color-coding and changing point size based on attributes
+  (requires PyWWT 0.6 or later). [#44]
+
 0.2 (2018-12-29)
 ----------------
 

glue_wwt/viewer/layer_style_editor.ui

@@ -70,7 +70,7 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QComboBox" name="combotext_size_mode">
+           <widget class="QComboBox" name="combosel_size_mode">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -83,16 +83,6 @@
               <height>16777215</height>
              </size>
             </property>
-            <item>
-             <property name="text">
-              <string>Fixed</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Linear</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item>
@@ -238,23 +228,13 @@
            <number>0</number>
           </property>
           <item>
-           <widget class="QComboBox" name="combotext_color_mode">
+           <widget class="QComboBox" name="combosel_color_mode">
             <property name="maximumSize">
              <size>
               <width>80</width>
               <height>16777215</height>
              </size>
             </property>
-            <item>
-             <property name="text">
-              <string>Fixed</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Linear</string>
-             </property>
-            </item>
            </widget>
           </item>
           <item>

glue_wwt/viewer/state.py

@@ -1,5 +1,9 @@
 from __future__ import absolute_import, division, print_function
 
+from distutils.version import LooseVersion
+
+import pywwt
+
 from astropy import units as u
 
 from glue.config import colormaps
@@ -12,7 +16,7 @@ from glue.core.data_combo_helper import ComponentIDComboHelper
 from glue.core.state_objects import StateAttributeLimitsHelper
 from glue.viewers.common.state import ViewerState, LayerState
 
-from pywwt.layers import VALID_FRAMES
+PYWWT_LT_06 = LooseVersion(pywwt.__version__) < '0.6'
 
 MODES_BODIES = ['Sun', 'Mercury', 'Venus', 'Earth', 'Moon', 'Mars',
                 'Jupiter', 'Callisto', 'Europa', 'Ganymede', 'Io', 'Saturn',
@@ -116,14 +120,14 @@ class WWTLayerState(LayerState):
     size = CallbackProperty()
     alpha = CallbackProperty()
 
-    size_mode = CallbackProperty('Fixed')
+    size_mode = SelectionCallbackProperty(default_index=0)
     size = CallbackProperty()
     size_att = SelectionCallbackProperty()
     size_vmin = CallbackProperty()
     size_vmax = CallbackProperty()
     size_scaling = CallbackProperty(1)
 
-    color_mode = CallbackProperty('Fixed')
+    color_mode = SelectionCallbackProperty(default_index=0)
     cmap_att = SelectionCallbackProperty()
     cmap_vmin = CallbackProperty()
     cmap_vmax = CallbackProperty()
@@ -167,6 +171,16 @@ class WWTLayerState(LayerState):
 
         self.cmap = colormaps.members[0][1]
 
+        # Color and size encoding depending on attributes is only available
+        # in PyWWT 0.6 or later.
+        if PYWWT_LT_06:
+            modes = ['Fixed']
+        else:
+            modes = ['Fixed', 'Linear']
+
+        WWTLayerState.color_mode.set_choices(self, modes)
+        WWTLayerState.size_mode.set_choices(self, modes)
+
         self.update_from_dict(kwargs)
 
     def _on_layer_change(self, layer=None):

setup.cfg

@@ -18,7 +18,7 @@ install_require =
     glue-core>=0.14
     qtpy
     astropy
-    pywwt>=0.4
+    pywwt>=0.5.3
 
 [options.package_data]
 glue_wwt.viewer = *.ui, *.html, *.js, *.png