Skip to content

Commit e16b40c

Browse files
committed
Changed registration to show default z Frame for z Stacks.
1 parent 2fbc008 commit e16b40c

File tree

2 files changed

+17
-2
lines changed

2 files changed

+17
-2
lines changed

exact/exact/images/templates/images/register_manually.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ <h2>Registration seems fine </h2>
195195
</div>
196196
<!-- style="width: 25vw;" -->
197197
<div style="height: 85vh; position: relative; width: 100%;">
198+
<div id="frameSlider1" style="width: 60vw;"></div>
198199
<div id="openseadragon1" style="position: absolute; height: 100%; width: 100%;"></div>
199200

200201
<!-- Crosshair overlay -->
@@ -225,6 +226,7 @@ <h2>Registration seems fine </h2>
225226
<!-- style="width: 25vw;" -->
226227
<div style="height: 85vh; position: relative; width: 100%;">
227228
<div id="openseadragon2" style="position: absolute; height: 100%; width: 100%;"></div>
229+
<div id="frameSlider2" style="width: 60vw;"></div>
228230

229231
<!-- Crosshair overlay -->
230232
<div id="crosshair" style="
@@ -286,9 +288,9 @@ <h2>Registration seems fine </h2>
286288
let server_url = window.location.origin + window.location.pathname.split("/images")[0];
287289
let imageId = {{ source }};
288290
let options = { };
289-
options.tileSources = [server_url + `/images/image/${imageId}/1/1/tile/`];
291+
options.tileSources = [server_url + `/images/image/${imageId}/1/{{zpos1}}/tile/`];
290292

291-
let tilesource_target = [server_url + `/images/image/{{target}}/1/1/tile/`];
293+
let tilesource_target = [server_url + `/images/image/{{target}}/1/{{zpos2}}/tile/`];
292294
let dragon1 = OpenSeadragon({
293295
id: "openseadragon2",
294296
prefixUrl: "{% static '' %}/images/",
@@ -321,6 +323,7 @@ <h2>Registration seems fine </h2>
321323
document.getElementById('input_target_x').value = imageCenter2.x;
322324
document.getElementById('input_target_y').value = imageCenter2.y;
323325

326+
324327
// Submit the form normally
325328
document.getElementById('submit-form').submit();
326329
}

exact/exact/images/views.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1502,6 +1502,16 @@ def manual_registration(request, image_source, image_target):
15021502
})
15031503
step=step+1
15041504

1505+
zpos1 = 1
1506+
zpos2 = 1
1507+
if (image_source_obj.frames>0):
1508+
zpos1=image_source_obj.defaultFrame+1
1509+
if (image_target_obj.frames>0):
1510+
zpos2=image_target_obj.defaultFrame+1
1511+
1512+
print('Zpos:',zpos1,zpos2)
1513+
1514+
15051515
print('points:',registration_points)
15061516
return render(request, 'images/register_manually.html', {
15071517
'source': image_source,
@@ -1512,6 +1522,8 @@ def manual_registration(request, image_source, image_target):
15121522
'step3':step>2,
15131523
'step4':step>3,
15141524
'step5':step>4,
1525+
'zpos1':zpos1,
1526+
'zpos2':zpos2,
15151527
'warn_existing':warn_existing,
15161528
'offset':offset,
15171529
'error':error,

0 commit comments

Comments
 (0)