rebase with point mode but dendrogram selection not get shown

Author: PennyQ

glue_vispy_viewers/common/toolbar.py

@@ -146,7 +146,7 @@ def __init__(self, vispy_widget=None, parent=None):
         self.point_action = a
 
         # TODO: show if there is dendrogram file or not shown
-        a = QtGui.QAction(QtGui.QIcon(DENDROGRAM_ICON), 'Dendrogram Selection', parent)
+        a = QtWidgets.QAction(QtGui.QIcon(DENDROGRAM_ICON), 'Dendrogram Selection', parent)
         a.triggered.connect(nonpartial(self.toggle_dendrogram))
         a.setCheckable(True)
         parent.addAction(a)

glue_vispy_viewers/volume/volume_toolbar.py

@@ -51,7 +51,9 @@ def on_mouse_press(self, event):
 
             # Get all data sets visible in current viewer
             self.visible_data, self.visual = self.get_visible_data()
-            self.current_visible_array = np.nan_to_num(self.visible_data[0]['PRIMARY'])
+            # self.current_visible_array = np.nan_to_num(self.visible_data[0]['PRIMARY'])
+            # dendrogram data object does not has PRIMARY att
+            self.current_visible_array = self.visible_data[0]['intensity']
             self.visual_tr = self._vispy_widget.limit_transforms[self.visual]
 
         if self.mode is 'point':