+
Start scan (4/4)
@@ -62,38 +79,44 @@
@@ -124,14 +147,60 @@ export default {
};
},
+ computed: {
+ pluginsUri: function() {
+ return `${this.$store.getters.baseUri}/api/v2/extensions`;
+ },
+ currentTimeForm: {
+ get() {
+ // Chop the timezone information from the end
+ return this.currentTime.substr(0, 19);
+ },
+ set(val) {
+ console.log(val);
+ // Get timezone
+ var dt = new Date();
+ var tzo = -dt.getTimezoneOffset(),
+ dif = tzo >= 0 ? "+" : "-",
+ pad = function(num) {
+ var norm = Math.floor(Math.abs(num));
+ return (norm < 10 ? "0" : "") + norm;
+ };
+ // Stick to the end of the new timestring from the form
+ this.currentTime = val + dif + pad(tzo / 60) + ":" + pad(tzo % 60);
+ }
+ },
+
+ payload: {
+ get() {
+ return {
+ filename: `${this.patientID}_${this.sampleType}`,
+ temporary: false,
+ bayer: false,
+ grid: [10, 10, 9],
+ stride_size: [800, 600, 10],
+ fast_autofocus: true,
+ autofocus_dz: 2000,
+ use_video_port: false,
+ annotations: {
+ patientID: this.patientID,
+ username: this.username,
+ clientDatetime: this.currentTime
+ },
+ tags: ["medscan"]
+ };
+ }
+ }
+ },
+
watch: {
- baseURL: function (val) {
+ baseURL: function(val) {
if (this.baseURL) {
this.updateScanUri();
} else {
this.message = "No baseURL given";
}
- },
+ }
},
mounted: function() {
@@ -147,7 +216,6 @@ export default {
axios
.get(this.pluginsUri) // Get a list of plugins
.then(response => {
- console.log(response);
var plugins = response.data;
var foundExtension = plugins.find(
e => e.title === "org.openflexure.scan"
@@ -159,7 +227,7 @@ export default {
}
})
.catch(error => {
- console.log(error); // Let mixin handle error
+ this.modalError(error); // Let mixin handle error
});
},
@@ -223,53 +291,6 @@ export default {
pad(tzo % 60)
);
}
- },
-
- computed: {
- pluginsUri: function() {
- return `${this.baseURL}/extensions`;
- },
-
- currentTimeForm: {
- get() {
- // Chop the timezone information from the end
- return this.currentTime.substr(0, 19);
- },
- set(val) {
- console.log(val);
- // Get timezone
- var dt = new Date();
- var tzo = -dt.getTimezoneOffset(),
- dif = tzo >= 0 ? "+" : "-",
- pad = function(num) {
- var norm = Math.floor(Math.abs(num));
- return (norm < 10 ? "0" : "") + norm;
- };
- // Stick to the end of the new timestring from the form
- this.currentTime = val + dif + pad(tzo / 60) + ":" + pad(tzo % 60);
- }
- },
-
- payload: {
- get() {
- return {
- filename: `${this.patientID}_${this.sampleType}`,
- temporary: false,
- bayer: false,
- grid: [10, 10, 9],
- stride_size: [800, 600, 10],
- fast_autofocus: true,
- autofocus_dz: 2000,
- use_video_port: false,
- annotations: {
- patientID: this.patientID,
- username: this.username,
- clientDatetime: this.currentTime
- },
- tags: ["medscan"]
- };
- }
- }
}
};
@@ -281,23 +302,6 @@ export default {
text-align: left;
}
-input[type="text"],
-input[type="datetime-local"] {
- display: block;
- margin: 0 10px 0 0;
- width: 100%;
- height: 25px;
-}
-
-button {
- display: inline-block;
- box-sizing: border-box;
- margin: 0 10px 0 0;
- width: 100%;
- height: 25px;
- min-width: 100px;
-}
-
.grid-container {
display: grid;
grid-template-columns: auto auto;
@@ -309,4 +313,4 @@ button {
font-weight: bold;
text-align: center;
}
-
\ No newline at end of file
+
diff --git a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue b/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue
index cf17e76d..c04a6ce7 100644
--- a/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue
+++ b/openflexure_microscope/api/static/src/components/tabContentComponents/slideScanContent.vue
@@ -15,7 +15,7 @@ import paneSlideScan from "../controlComponents/paneSlideScan";
import streamDisplay from "../viewComponents/streamDisplay.vue";
export default {
- name: "NavigateContent",
+ name: "SlideScanContent",
components: {
paneSlideScan,
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/featuresSettings.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/featuresSettings.vue
new file mode 100644
index 00000000..97e033e7
--- /dev/null
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsComponents/featuresSettings.vue
@@ -0,0 +1,55 @@
+
+
+
Additional features
+
+
+
+
+ Enabling IHI Slide Scan will add a new tab designed to simplify
+ acquiring blood smear tile scans.
+ While this may be useful for other applications, it is primarily designed
+ for use in clinics acquiring blood smear samples using a 100x oil-immersion
+ objective, with a Raspberry Pi Camera v2.
+
+
+
+
+
+
+
diff --git a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
index 9d3266dd..60cd1e0a 100644
--- a/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
+++ b/openflexure_microscope/api/static/src/components/viewComponents/settingsDisplay.vue
@@ -17,6 +17,19 @@
Display
+
+
+ Features
+
+
+
+
+
+
+
+