diff --git a/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue b/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue index 6f0be39c..8f0a0a66 100644 --- a/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue +++ b/webapp/src/components/tabContentComponents/scanListComponents/openSeadragonViewer.vue @@ -7,15 +7,26 @@ + + diff --git a/webapp/src/components/tabContentComponents/scanListContent.vue b/webapp/src/components/tabContentComponents/scanListContent.vue index 7cf1d4dc..05a98d2a 100644 --- a/webapp/src/components/tabContentComponents/scanListContent.vue +++ b/webapp/src/components/tabContentComponents/scanListContent.vue @@ -10,26 +10,25 @@
-
+
+ class="uk-width-1-1" + thing="smart_scan" + action="stitch_all_scans" + submit-label="Stitch All Remaining" + :can-terminate="true" + :button-primary="false" + :modal-progress="true" + :requires-confirmation="true" + :confirmation-message=" + '

Stitch all unstitched scans?


Depending on the number and size of scans, this may be slow, and your microscope should not be used during the stitching.' + " + @error="modalError" + />
- -
-
-

- {{ 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 { @@ -188,9 +172,6 @@ export default { this.updateScans(); } }, - goFullscreen() { - this.$refs.openseadragon.openFullscreen(); - }, async updateScans() { try { let scans_information = await this.readThingProperty("smart_scan", "scans"); @@ -230,16 +211,15 @@ export default { } }, showScan(scan) { - if (scan.dzi){ + if (scan.dzi) { this.selectedScan = scan; - UIkit.modal(this.$refs.scanModal).show(); - } - else { - this.modalError(`Scan not stitched for viewing in webapp, please download or stitch`) + this.$refs.scanViewer.show(); + } else { + this.modalError("Scan not stitched for viewing in webapp, please download or stitch"); } } } -}; +} \ No newline at end of file