consolidate stretch histogram code #2538
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -266,7 +266,7 @@ | |
| stretch_hist_nbins = IntHandleEmpty(25).tag(sync=True) | ||
| stretch_histogram_widget = Unicode().tag(sync=True) | ||
|
|
||
| stretch_curve_visible = Bool(True).tag(sync=True) | ||
|
|
||
| subset_visible_value = Bool().tag(sync=True) | ||
| subset_visible_sync = Dict().tag(sync=True) | ||
|
|
@@ -477,6 +477,19 @@ | |
|
|
||
| self.stretch_histogram.add_line('vmin', x=[0, 0], y=[0, 1], ynorm=True, color='#c75d2c') | ||
| self.stretch_histogram.add_line('vmax', x=[0, 0], y=[0, 1], ynorm='vmin', color='#c75d2c') | ||
| self.stretch_histogram.add_line( | ||
| label='stretch_curve', | ||
| x=[], y=[], | ||
| ynorm='vmin', | ||
| color="#007BA1", # "inactive" blue | ||
| opacities=[0.5], | ||
| ) | ||
| self.stretch_histogram.add_scatter( | ||
| label='stretch_knots', | ||
| x=[], y=[], | ||
| ynorm='vmin', | ||
| color="#007BA1", # "inactive" blue | ||
| ) | ||
| self.stretch_histogram.add_scatter('colorbar', x=[], y=[], ynorm='vmin', marker='square', stroke_width=33) # noqa: E501 | ||
| with self.stretch_histogram.figure.hold_sync(): | ||
| self.stretch_histogram.figure.axes[0].label = 'pixel value' | ||
|
|
@@ -726,23 +739,24 @@ | |
|
|
||
| # update the n_bins since this may be a new layer | ||
| self._histogram_nbins_changed() | ||
| # update the curve/colorbar | ||
| self._update_stretch_curve(msg) | ||
|
|
||
| @observe('image_color_mode_value', 'image_color_value', 'image_colormap_value', | ||
| 'image_contrast_value', 'image_bias_value', | ||
| 'stretch_hist_nbins', | ||
| 'stretch_curve_visible', | ||
| 'stretch_function_value', 'stretch_vmin_value', 'stretch_vmax_value', | ||
|
There was a problem hiding this comment. Are you sure we don't need There was a problem hiding this comment.
|
||
| ) | ||
| @skip_if_no_updates_since_last_active() | ||
| def _update_stretch_curve(self, msg=None): | ||
| if not self._viewer_is_image_viewer() or not hasattr(self, 'stretch_histogram'): | ||
| # don't update histogram if selected viewer is not an image viewer, | ||
| # or the stretch histogram hasn't been initialized: | ||
| return | ||
|
|
||
| if self.multiselect: | ||
| self.stretch_histogram.clear_marks('stretch_curve', 'stretch_knots', 'colorbar') | ||
| return | ||
|
|
||
| if len(self.layer.selected_obj): | ||
|
|
@@ -753,135 +767,81 @@ | |
|
|
||
| if isinstance(layer.layer, GroupedSubset): | ||
| # don't update histogram for subsets: | ||
| self.stretch_histogram.clear_marks('stretch_curve', 'stretch_knots', 'colorbar') | ||
| return | ||
|
|
||
| # create the new/updated stretch curve following the colormapping | ||
| # procedure in glue's CompositeArray: | ||
| interval = ManualInterval(self.stretch_vmin_value, self.stretch_vmax_value) | ||
| contrast_bias = ContrastBiasStretch(self.image_contrast_value, self.image_bias_value) | ||
| stretch = stretches.members[self.stretch_function_value] | ||
| layer_cmap = layer.state.cmap | ||
|
|
||
| # show the colorbar | ||
| color_mode = self.image_color_mode_value | ||
|
|
||
| # NOTE: Index 0 in marks is assumed to be the bin centers. | ||
| x = self.stretch_histogram.figure.marks[0].x | ||
| y = np.ones_like(x) | ||
|
|
||
| # Copied from the __call__ internals of glue/viewers/image/composite_array.py | ||
| data = interval(x) | ||
| data = contrast_bias(data, out=data) | ||
| data = stretch(data, out=data) | ||
|
Comment on lines
+783
to
+790
There was a problem hiding this comment. I wonder if we can consolidate this with the similar logic for the stretch curve... the stretch curve uses a linspace between vmin/vmax whereas this uses the histogram bins and needs to extend beyond vmin/vmax. (@pllim @bmorris3 - what if we did a linspace between the lower and upper bin and use the same sampling for both? There was a problem hiding this comment. colorbar needs to render beyond the vertical lines, it needs to span the whole visible histogram. I think the lines can move around, but not the histogram bars. Or am I not understanding how all these stuff is supposed to work together? There was a problem hiding this comment. ok, let's merge for now since @haticekaratay and @javerbukh both need to build on top of this and we can discuss and do this as follow-up if we think it can be simplified. Thanks! |
||
|
|
||
| if color_mode == 'Colormaps': | ||
| cmap = colormaps[self.image_colormap.text] | ||
| if hasattr(cmap, "get_bad"): | ||
| bad_color = cmap.get_bad().tolist()[:3] | ||
| layer_cmap = cmap.with_extremes(bad=bad_color + [self.image_opacity_value]) | ||
| else: | ||
| layer_cmap = cmap | ||
|
|
||
| # Compute colormapped image | ||
| plane = layer_cmap(data) | ||
|
|
||
| else: # Monochromatic | ||
| # Get color | ||
| color = COLOR_CONVERTER.to_rgba_array(self.image_color_value)[0] | ||
| plane = data[:, np.newaxis] * color | ||
| plane[:, 3] = 1 | ||
|
|
||
| plane = np.clip(plane, 0, 1, out=plane) | ||
| ipycolors = [matplotlib.colors.rgb2hex(p, keep_alpha=False) for p in plane] | ||
|
|
||
| colorbar_mark = self.stretch_histogram.marks['colorbar'] | ||
| colorbar_mark.x = x | ||
| colorbar_mark.y = y | ||
| colorbar_mark.colors = ipycolors | ||
|
|
||
| # show "knot" locations if the stretch_function is a spline | ||
| if isinstance(stretch, SplineStretch) and self.stretch_curve_visible: | ||
| knot_mark = self.stretch_histogram.marks['stretch_knots'] | ||
| knot_mark.x = (self.stretch_vmin_value + | ||
| stretch.x * (self.stretch_vmax_value - self.stretch_vmin_value)) | ||
| # scale to 0.9 so always falls below colorbar (same as for stretch_curve) | ||
| # (may need to revisit this when supporting dragging) | ||
| knot_mark.y = 0.9 * stretch.y | ||
| else: | ||
| self.stretch_histogram.clear_marks('stretch_knots') | ||
|
|
||
| if self.stretch_curve_visible: | ||
| # create a photoshop style "curve" for the stretch function | ||
| curve_x = np.linspace(self.stretch_vmin.value, self.stretch_vmax.value, 50) | ||
| curve_y = interval(curve_x, clip=False) | ||
| curve_y = contrast_bias(curve_y, out=curve_y, clip=False) | ||
| curve_y = stretch(curve_y, out=curve_y, clip=False) | ||
| curve_y = layer_cmap(curve_y)[:, 0] | ||
|
|
||
| curve_mark = self.stretch_histogram.marks['stretch_curve'] | ||
| curve_mark.x = curve_x | ||
| # scale to 0.9 so always falls below colorbar (same as for stretch_knots) | ||
| # (may need to revisit this when supporting dragging) | ||
| curve_mark.y = 0.9 * curve_y | ||
| else: | ||
| self.stretch_histogram.clear_marks('stretch_curve') | ||
|
|
||
| self.stretch_histogram._refresh_marks() | ||
|
|
||
| @observe('stretch_vmin_value') | ||
| def _stretch_vmin_changed(self, msg=None): | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think colorbar and stretch curve listen to exactly the same events? For example, colorbar needs to match the bins on histogram but not necessarily the curve?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know, we can skip sections based on the event if performance is an issue/concern, but I think this is cleaner than having duplicated code and multiple callbacks (in unpredictable order) for the ones that are shared.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If there are blocks you think we should skip under certain scenarios, please suggest any changes (
msg.get('name')should give the name of the traitlet causing the method to be triggered)!