work on cimar tuhmbnails

This commit is contained in:
Ross
2025-03-10 10:23:36 +00:00
parent b3076d6dda
commit c5ba153865
4 changed files with 62 additions and 1 deletions
@@ -0,0 +1,21 @@
# Generated by Django 5.1.4 on 2025-03-10 09:54
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('generic', '0024_cimarcase_series_data_cimarcase_study_schema'),
]
operations = [
migrations.CreateModel(
name='CimarSeriesThumbnail',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('series_id', models.CharField(max_length=255)),
('image', models.ImageField(upload_to='cimar_series_thumbnails')),
],
),
]
+20
View File
@@ -54,6 +54,8 @@ from pygments.formatters import HtmlFormatter
from django.contrib import admin
from django.utils.safestring import mark_safe
from django.template.loader import render_to_string
import requests
from django.core.files.base import ContentFile
def get_pretty_json(data):
@@ -1893,6 +1895,15 @@ class CimarCase(models.Model):
series_data = []
for series in self.study_schema["series"]:
# Cache the thumbnail
#thumbnail_url = f"{self.get_series_image_thumbnail_link(series)}?{api.sid}"
#response = requests.get(thumbnail_url)
#thumbnail = CimarSeriesThumbnail(series_id=series["id"])
#thumbnail.image.save(f"{series['id']}.jpg", ContentFile(response.content))
#thumbnail.save()
series_data.append({
"series_id" : series["id"],
"series_description" : series["description"],
@@ -1902,6 +1913,7 @@ class CimarCase(models.Model):
}
)
self.series_data = {}
self.series_data["series"] = series_data
@@ -1944,3 +1956,11 @@ class CimarCase(models.Model):
image = series["images"][middle_point]
return STORAGE_API_URL + f"/study/{self.study_details["storage_namespace"]}/{self.study_details["study_uid"]}/image/{image["id"]}/version/{image["version"]}/frame/0/thumbnail"
class CimarSeriesThumbnail(models.Model):
series_id = models.CharField(max_length=255)
image = models.ImageField(upload_to="cimar_series_thumbnails")
def __str__(self):
return f"{self.series_id}"
+1
View File
@@ -11,6 +11,7 @@
PENRA Courses
{% endblock %}
</title>
<meta name="htmx-config" content='{"selfRequestsOnly": false}' />
{% comment %} <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" /> {% endcomment %}
<link href="{% static 'css/bootstrap.min.css' %}" rel="stylesheet">
+20 -1
View File
@@ -1,3 +1,4 @@
<h3>Series</h3>
<div class="pre-whitespace multi-image-block"><b>Series:</b>
{% for series in series_data %}
@@ -6,10 +7,28 @@
<span class="series-block-series-number">Series {{ forloop.counter }}:</span><br>
<span>
<span class='series-block-examination'>{{series|get_item:"series_description"}}</span><br/>
<span class='series-block-thumbnail'><img src='{{series|get_item:"thumbnail"}}?{{cimar_sid}}' /></span><br/>
<span class='series-block-thumbnail'>
<img
hx-request='{"noHeaders": true}'
hx-get='{{series|get_item:"thumbnail"}}?sid={{cimar_sid}}'
hx-on::after-request= 'event.detail.elt.src = event.detail.xhr.responseURL;'
hx-trigger='load'
hx-swap='none'
src="" />
</span><br/>
<span class='series-block-image-number'>Images: <span class='series-block-image-number-count'>{{series|get_item:"image_count"}}</span></span>
</span>
</span>
</span>
{% comment %} <button
id='load-series-image'
hx-request='{"noHeaders": true}'
hx-get='{{series|get_item:"thumbnail"}}?sid={{cimar_sid}}'
hx-on::after-request= 'console.log(event.detail.xhr); document.querySelector(".series-block-thumbnail img").src = event.detail.xhr.responseURL;'
hx-trigger='load'
hx-swap='none'>
Load Series
</button> {% endcomment %}
{% endfor %}
</div>