rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linter fixes

Browse source
This commit is contained in:
Richard 2021-05-31 12:45:30 +01:00
parent a1313ae1c5
commit 9d088916a9
2 changed files with 19 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
openflexure_microscope/api/static/src/components/tabContentComponents/imjoyComponents/imjoyPluginCard.vue
View file

@ -18,11 +18,15 @@
</i> </i>
</div> </div>
<div class="uk-width-expand"> <div class="uk-width-expand">
<h3 class="uk-card-title uk-margin-remove-bottom">{{name}}</h3> <h3 class="uk-card-title uk-margin-remove-bottom">{{ name }}</h3>
<p class="uk-text-meta uk-margin-remove-top"><time datetime="2016-04-01T19:00">April 01, 2016</time></p> <p class="uk-text-meta uk-margin-remove-top">
<slot name="subtitle"></slot>
</p>
</div> </div>
<div class="uk-width-auto"> <div class="uk-width-auto">
<button class="uk-button" @click="$emit('click')"><slot name="buttonText">Launch</slot></button> <button class="uk-button" @click="$emit('click')">
<slot name="buttonText">Launch</slot>
</button>
</div> </div>
</div> </div>
<slot></slot> <slot></slot>

20
openflexure_microscope/api/static/src/components/tabContentComponents/imjoyContent.vue
View file

@ -8,7 +8,9 @@
max="100" max="100"
></progress> ></progress>
<div class="uk-flex uk-flex-column uk-margin uk-margin-left uk-margin-right"> <div
class="uk-flex uk-flex-column uk-margin uk-margin-left uk-margin-right"
>
<imjoy-plugin-card <imjoy-plugin-card
name="Load From URL" name="Load From URL"
icon-u-r-l="https://imjoy.io/static/img/imjoy-icon.svg" icon-u-r-l="https://imjoy.io/static/img/imjoy-icon.svg"
@ -207,7 +209,7 @@ export default {
"OpenFlexureTestMoveStage", "OpenFlexureTestMoveStage",
"ListServices" "ListServices"
]; ];
for(let fname of localPlugins){ for (let fname of localPlugins) {
await this.loadPlugin(`${origin}/${fname}.imjoy.html`); await this.loadPlugin(`${origin}/${fname}.imjoy.html`);
} }
this.setupPluginEngine(); this.setupPluginEngine();
@ -354,9 +356,9 @@ export default {
}, },
async getExposure() { async getExposure() {
const settings = await getInstrumentSettings(); const settings = await getInstrumentSettings();
if(settings.camera.picamera){ if (settings.camera.picamera) {
if(settings.camera.picamera.shutter_speed){ if (settings.camera.picamera.shutter_speed) {
return settings.camera.picamera.shutter_speed/1000; return settings.camera.picamera.shutter_speed / 1000;
} }
} }
return -1; return -1;
@ -370,12 +372,12 @@ export default {
} }
}); });
}, },
async fullFocus(){ async fullFocus() {
return runAutofocus(); return runAutofocus();
} }
}; };
const ref = await this.imjoy.pm.registerService( const ref = await this.imjoy.pm.registerService(
{type: "#microscope-control", name: "OpenFlexure"}, { type: "#microscope-control", name: "OpenFlexure" },
service service
); );
console.log("registered service"); console.log("registered service");
@ -592,7 +594,9 @@ export default {
return axios.post(this.moveActionUri, payload).then(pollAction); return axios.post(this.moveActionUri, payload).then(pollAction);
}, },
async getInstrumentSettings() { async getInstrumentSettings() {
return axios.get(`${this.baseUri}/api/v2/instrument/settings/`).then(r => r.data); return axios
.get(`${this.baseUri}/api/v2/instrument/settings/`)
.then(r => r.data);
}, },
async setInstrumentSettings(payload) { async setInstrumentSettings(payload) {
return axios.put(`${this.baseUri}/api/v2/instrument/settings/`, payload); return axios.put(`${this.baseUri}/api/v2/instrument/settings/`, payload);