Skip to content

Don't disable the histogram for big images #643

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

Open
will-moore wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Don't disable the histogram for big images #643

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
8e3d41f
Don't disable the histogram for big images
will-moore Nov 28, 2025
cc72d41
Handle histogram_json ApiUsageException. Show message to user
will-moore Dec 16, 2025
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
6 changes: 3 additions & 3 deletions omeroweb/webclient/templates/webclient/annotations/metadata_preview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,14 +473,14 @@
<input id="showactive" type="checkbox" />
Active
</label>
<div style="float:right {% if tiledImage %}; color:#bbb{%endif%}"
{% if tiledImage or share %}
<div style="float:right {% if share %}; color:#bbb{%endif%}"
{% if share %}
title="Histogram not supported for tiled images or in share"
{%else%}
title="Show histogram of pixel intensities for selected channel"
{% endif %} >
<!-- histogram (not supported for Big images) -->
<input id="showhistogram" type="checkbox" {% if tiledImage or share %}disabled{% endif %}/>
<input id="showhistogram" type="checkbox" {% if share %}disabled{% endif %}/>
<label for="showhistogram">Show Histogram</label>
</div>
<div id="histogram" style="display:none; width: 100%; height: 125px; background:white; border: solid #ccc 1px; margin-bottom: 6px"></div>
Expand Down
4 changes: 4 additions & 0 deletions omeroweb/webgateway/static/webgateway/js/ome.histogram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,10 @@ window.OME.Histogram = function(element, webgatewayUrl, graphWidth, graphHeight)
url += "&p=" + proj;
}
$.getJSON(url, function(data){
if (data.error) {
alert("Error loading histogram: " + data.error);
return;
}
plotJson(data.data, color);
this.plotStartEnd(window, color);
}.bind(this));
Expand Down
4 changes: 1 addition & 3 deletions omeroweb/webgateway/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2908,9 +2908,7 @@ def histogram_json(request, iid, theC, conn=None, **kwargs):
except omero.ApiUsageException as ex:
logger.warn(ex)
resObj = {"error": ex.message}
return HttpResponseBadRequest(
json.dumps(resObj), content_type="application/json"
)
return JsonResponse(resObj, content_type="application/json")
return JsonResponse({"data": histogram})


Expand Down
Loading