Skip to content

Commit 54fe7ee

Browse files
committed
Set default cuts and auto-scale image
1 parent 6afe400 commit 54fe7ee

File tree

1 file changed

+15
-10
lines changed

1 file changed

+15
-10
lines changed

astrowidgets/bqplot.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def __init__(self, image_data=None,
5959
axis_x = Axis(scale=scale_x, visible=False)
6060
axis_y = Axis(scale=scale_y, orientation='vertical', visible=False)
6161
scales_image = {'x': scale_x, 'y': scale_y,
62-
'image': ColorScale(max=1.114, min=2902,
62+
'image': ColorScale(max=1, min=0,
6363
scheme='Greys')}
6464

6565
self._scatter_marks = {}
@@ -385,9 +385,9 @@ def _interval_and_stretch(self):
385385

386386
return stretched
387387

388-
def _send_data(self):
388+
def _send_data(self, reset_view=True):
389389
self._astro_im.set_data(self._interval_and_stretch(),
390-
reset_view=False)
390+
reset_view=reset_view)
391391

392392
def _get_interval(self):
393393
if self._interval is None:
@@ -452,6 +452,8 @@ def _observe_cuts(self, change):
452452
self._interval = apviz.ManualInterval(*cuts)
453453
else:
454454
self._interval = cuts
455+
if self._data is not None:
456+
self._send_data()
455457

456458
@trait.observe('zoom_level')
457459
def _update_zoom_level(self, change):
@@ -481,11 +483,10 @@ def _update_viewer_zoom_scroll(self, change):
481483
raise NotImplementedError('😭 sorry, cannot do that yet')
482484
self._astro_im.set_scroll_zoom(change['new'])
483485

484-
485486
# The methods, grouped loosely by purpose
486487

487488
# Methods for loading data
488-
def load_fits(self, file_name_or_HDU):
489+
def load_fits(self, file_name_or_HDU, reset_view=True):
489490
if isinstance(file_name_or_HDU, str):
490491
ccd = CCDData.read(file_name_or_HDU)
491492
elif isinstance(file_name_or_HDU,
@@ -504,16 +505,20 @@ def load_fits(self, file_name_or_HDU):
504505
self._ccd = ccd
505506
self._data = ccd.data
506507
self._wcs = ccd.wcs
507-
self._send_data()
508+
self._send_data(reset_view=reset_view)
508509

509-
def load_array(self, array):
510+
def load_array(self, array, reset_view=True):
510511
self._data = array
511-
self._send_data()
512+
self._send_data(reset_view=reset_view)
512513

513-
def load_nddata(self, data):
514+
def load_nddata(self, data, reset_view=True):
514515
self._ccd = data
515516
self._data = self._ccd.data
516-
self._send_data()
517+
self._wcs = data.wcs
518+
if self._wcs is None:
519+
self._wcs = WCS(self._ccd.meta)
520+
521+
self._send_data(reset_view=reset_view)
517522

518523
# Saving contents of the view and accessing the view
519524
def save(self, filename):

0 commit comments

Comments
 (0)