Skip to content

Don't change labels when using log x axis in histogram viewer #2325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2022
Merged

Don't change labels when using log x axis in histogram viewer #2325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76acac6
Don't add 'Log' to histogram axis label when using a log scale. Updat…
Carifio24 Oct 1, 2022
ed095cf
Add changelog entry.
Carifio24 Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ Full changelog
v1.6.0 (unreleased)
-------------------

* Modify histogram viewer to not prepend x-axis label with 'Log' when using a log scale x-axis. [#2325]

* Modify scatter viewer to not prepend axis labels with 'Log' when using log scale axes. [#2323]

* Fixed a bug where minor tick marks were not respecting the settings colors. [#2305]
Expand Down
2 changes: 1 addition & 1 deletion glue/viewers/histogram/qt/tests/test_data_viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ def test_axes_labels(self):

viewer_state.x_log = True

assert self.viewer.axes.get_xlabel() == 'Log x'
assert self.viewer.axes.get_xlabel() == 'x'
assert self.viewer.axes.get_ylabel() == 'Number'

viewer_state.x_att = self.data.id['y']
Expand Down
5 changes: 1 addition & 4 deletions glue/viewers/histogram/viewer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@ def _update_axes(self, *args):
# Update ticks, which sets the labels to categories if components are categorical
update_ticks(self.axes, 'x', self.state.x_kinds, self.state.x_log, self.state.x_categories)

if self.state.x_log:
self.state.x_axislabel = 'Log ' + self.state.x_att.label
else:
self.state.x_axislabel = self.state.x_att.label
self.state.x_axislabel = self.state.x_att.label

if self.state.normalize:
self.state.y_axislabel = 'Normalized number'
Expand Down