Skip to content

Commit

Permalink
Merge pull request #1793 from girder/multi-histo-queries
Browse files Browse the repository at this point in the history
Fix multiple histogram queries in Girder frame selector
  • Loading branch information
manthey authored Jan 29, 2025
2 parents 87f929a + fcda1e6 commit ed013a2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
### Features

- Add utility functions for converting between frame and axes ([#1778](../../pull/1778))
- Jupyter frame selector ([#1738](../../pull/1738), [#1792](../../pull/1792))
- Jupyter frame selector ([#1738](../../pull/1738), [#1792](../../pull/1792), [#1793](../../pull/1793))

### Improvements

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ var ImageViewerSelectWidget = View.extend({
_createVue(imageMetadata, frameUpdate) {
const el = this.$('#vue-container').get(0);
const getFrameHistogram = (params) => {
params = Object.assign({}, params);
restRequest({
type: 'GET',
url: 'item/' + this.itemId + '/tiles/histogram',
Expand Down
13 changes: 7 additions & 6 deletions large_image/widgets/CompositeLayers.vue
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,6 @@ module.exports = {
border-bottom: 3px solid !important;
}
.table-row {
height: 50px;
vertical-align: top;
border-bottom: 1px solid !important;
position: relative;
Expand All @@ -501,13 +500,11 @@ module.exports = {
width: 30px;
}
.name-col {
padding: 0 5px;
width: 50%;
word-break: break-all;
font-size: inherit;
}
.color-col {
padding: 0 5px;
width: 25%;
}
.auto-range-col {
Expand Down Expand Up @@ -577,8 +574,6 @@ module.exports = {
position: absolute;
right: 10px;
top: 5px;
font-size: 20px;
font-weight: 900 !important;
}
.advanced-section {
position: absolute;
Expand Down Expand Up @@ -606,13 +601,19 @@ module.exports = {
}
.percentage-input {
position: relative;
margin-top: 5px;
width: 80px;
}
.jupyter-widgets .percentage-input {
margin-top: 5px;
}
.percentage-input::after {
position: absolute;
content: '%';
left: 45px;
top: 3px;
}
.jupyter-widgets .expand-btn {
font-size: 20px;
font-weight: 900 !important;
}
</style>
1 change: 0 additions & 1 deletion large_image/widgets/HistogramEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,6 @@ module.exports = {
left: 90px;
width: calc(100% - 180px);
max-height: 100%;
padding: 0px 5px;
}
.handles-svg {
position: absolute;
Expand Down

0 comments on commit ed013a2

Please sign in to comment.