Merge branch 'lut_view' of https://github.com/Tom-TBT/omero-web into …

…lut_view

omeroweb/webgateway/urls.py

@@ -506,9 +506,7 @@
 E.g. list of {path: "/luts/", size: 800, id: 37, name: "cool.lut"},
 """
 
-luts_png = re_path(
- r"^luts_png/$", views.luts_png, name="webgateway_luts_png"
-)
+luts_png = re_path(r"^luts_png/$", views.luts_png, name="webgateway_luts_png")
 """
 returning a png of all LUTs on server sorted by name
 """

omeroweb/webgateway/views.py

@@ -2120,10 +2120,10 @@ def luts_png(request, conn=None, **kwargs):
 
  cached_image = cache.get(cache_key)
  if cached_image:
- return HttpResponse(cached_image, content_type='image/png')
+ return HttpResponse(cached_image, content_type="image/png")
 
  # Generate the LUT, fourth png channel set to 255
- new_img = numpy.zeros((10*(len(luts)+1), 256, 4), dtype="uint8") + 255
+ new_img = numpy.zeros((10 * (len(luts) + 1), 256, 4), dtype="uint8") + 255
  for i, lut in enumerate(luts):
  orig_file = conn.getObject("OriginalFile", lut.getId()._val)
  lut_data = bytearray()
@@ -2133,7 +2133,7 @@ def luts_png(request, conn=None, **kwargs):
 
  if len(lut_data) in [768, 800]:
  lut_arr = numpy.array(lut_data, dtype="uint8")[-768:]
- new_img[i*10:(i+1)*10, :, :3] = lut_arr.reshape(3, 256).T
+ new_img[i * 10 : (i + 1) * 10, :, :3] = lut_arr.reshape(3, 256).T
  else:
  lut_data = lut_data.decode()
  r, g, b = [], [], []
@@ -2149,9 +2149,9 @@ def luts_png(request, conn=None, **kwargs):
  r.append(int(val[-3]))
  g.append(int(val[-2]))
  b.append(int(val[-1]))
- new_img[i*10:(i+1)*10, :, 0] = numpy.array(r)
- new_img[i*10:(i+1)*10, :, 1] = numpy.array(g)
- new_img[i*10:(i+1)*10, :, 2] = numpy.array(b)
+ new_img[i * 10 : (i + 1) * 10, :, 0] = numpy.array(r)
+ new_img[i * 10 : (i + 1) * 10, :, 1] = numpy.array(g)
+ new_img[i * 10 : (i + 1) * 10, :, 2] = numpy.array(b)
 
  # Set the last row for the channel sliders transparent gradient
  new_img[-10:] = 0
@@ -2167,7 +2167,7 @@ def luts_png(request, conn=None, **kwargs):
  # Cache timeout shouldn't be too low, lut png generation takes time
  cache.set(cache_key, buffer.getvalue(), 3600)
 
- return HttpResponse(buffer.getvalue(), content_type='image/png')
+ return HttpResponse(buffer.getvalue(), content_type="image/png")
 
 
 @login_required()