Skip to content

Commit

Permalink
Minor fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
astrofrog committed Jun 24, 2017
1 parent d24a810 commit e9b2b11
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
9 changes: 1 addition & 8 deletions glue/viewers/image/composite_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

import numpy as np

from matplotlib.transforms import TransformedBbox
from matplotlib.colors import ColorConverter, Colormap
from astropy.visualization import (LinearStretch, SqrtStretch, AsinhStretch,
LogStretch, ManualInterval, ContrastBiasStretch)
Expand All @@ -23,9 +22,7 @@

class CompositeArray(object):

def __init__(self, ax, **kwargs):

self.axes = ax
def __init__(self, **kwargs):

# We keep a dictionary of layers. The key should be the UUID of the
# layer artist, and the values should be dictionaries that contain
Expand All @@ -34,10 +31,6 @@ def __init__(self, ax, **kwargs):

self._first = True

# ax.set_ylim((df[y].min(), df[y].max()))
# ax.set_xlim((df[x].min(), df[x].max()))
# self.set_array([[1, 1], [1, 1]])

def allocate(self, uuid):
self.layers[uuid] = {'zorder': 0,
'visible': True,
Expand Down
2 changes: 1 addition & 1 deletion glue/viewers/image/qt/data_viewer.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def __init__(self, session, parent=None):
self.state.add_callback('y_att', self._set_wcs)
self.state.add_callback('slices', self._set_wcs)
self.state.add_callback('reference_data', self._set_wcs)
self.axes._composite = CompositeArray(self.axes)
self.axes._composite = CompositeArray()
self.axes._composite_image = imshow(self.axes, self.axes._composite,
origin='lower', interpolation='nearest')

Expand Down
4 changes: 2 additions & 2 deletions glue/viewers/image/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ class ImageLayerState(MatplotlibLayerState):
'layer before rendering')
cmap = DDCProperty(docstring='The colormap used to render the layer')
stretch = DDCProperty('linear', docstring='The stretch used to render the layer, '
'whcih should be one of ``linear``',
'whcih should be one of ``linear``'
'``sqrt``, ``log``, or ``arcsinh``')
global_sync = DDCProperty(True, docstring='Whether the color and transparency ',
global_sync = DDCProperty(True, docstring='Whether the color and transparency '
'should be synced with the global '
'color and transparency for the data')

Expand Down

0 comments on commit e9b2b11

Please sign in to comment.