From fb3658c933787e588f422284e7f6fe66dddfd543 Mon Sep 17 00:00:00 2001 From: jaknapper Date: Thu, 16 Oct 2025 11:43:24 +0100 Subject: [PATCH 1/5] Colour sliders in seadragon viewer --- .../openSeadragonViewer.vue | 31 +++-- .../tabContentComponents/scanListContent.vue | 112 ++++++++++++++++-- 2 files changed, 119 insertions(+), 24 deletions(-) diff --git a/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue b/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue index 6f0be39c..b007e4a1 100644 --- a/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue +++ b/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue @@ -7,10 +7,8 @@ + + diff --git a/webapp/src/components/tabContentComponents/scanListContent.vue b/webapp/src/components/tabContentComponents/scanListContent.vue index 2e83e624..400ca229 100644 --- a/webapp/src/components/tabContentComponents/scanListContent.vue +++ b/webapp/src/components/tabContentComponents/scanListContent.vue @@ -50,97 +50,12 @@ - -
-
-

- {{ selectedScan.name }} - - -

+ - -
- -
- - -
- -
- - - -
- - - -
-
-
import axios from "axios"; -import UIkit from "uikit"; import actionButton from "../labThingsComponents/actionButton.vue"; import scanCard from "./scanListComponents/scanCard.vue"; -import OpenSeadragonViewer from "./scanListComponents/openSeadragonViewer.vue"; +import ScanViewerModal from "./scanListComponents/scanViewer.vue"; // Export main app export default { name: "ScanListContent", - components: { actionButton, OpenSeadragonViewer, scanCard }, + components: { actionButton, scanCard, ScanViewerModal }, data: function() { return { @@ -263,24 +177,6 @@ export default { this.updateScans(); } }, - updateViewerFilter() { - const viewer = this.$refs.openseadragon; - if (viewer) { - viewer.brightness = this.brightness; - viewer.contrast = this.contrast; - viewer.saturation = this.saturation; - viewer.updateFilter(); - } - }, - resetFilters() { - this.brightness = 1; - this.contrast = 1; - this.saturation = 1; - this.updateViewerFilter(); - }, - goFullscreen() { - this.$refs.openseadragon.openFullscreen(); - }, async updateScans() { try { let scans_information = await this.readThingProperty("smart_scan", "scans"); @@ -320,16 +216,15 @@ export default { } }, showScan(scan) { - if (scan.dzi){ + if (scan.dzi) { this.selectedScan = scan; - UIkit.modal(this.$refs.scanModal).show(); + this.$refs.scanViewer.show(); + } else { + this.modalError("Scan not stitched for viewing in webapp, please download or stitch"); } - else { - this.modalError(`Scan not stitched for viewing in webapp, please download or stitch`) - } - } + }, } -}; +} \ No newline at end of file From 4c1dcdb8d1bb2d996e32b694d51b618cfd127320 Mon Sep 17 00:00:00 2001 From: Julian Stirling Date: Tue, 21 Oct 2025 16:05:53 +0100 Subject: [PATCH 5/5] Tidy up HTML spacing and styling --- .../scanListComponents/scanViewer.vue | 29 +++++++++++--- .../tabContentComponents/scanListContent.vue | 38 ++++++++++--------- 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue b/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue index 8b1a0b57..f4788a3e 100644 --- a/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue +++ b/webapp/src/components/tabContentComponents/scanListComponents/scanViewer.vue @@ -1,11 +1,11 @@