Merge branch 'master' into 'stable'

v1.1.1

See merge request openflexure/openflexure-microscope-jsclient!35

.gitlab-ci.yml

@@ -22,6 +22,20 @@ build:
   only:
     - stable
     - tags
+
+build-nightly:
+  stage: build
+  image: electronuserland/builder:wine
+  script:
+    - npm install
+    - npm run build:web
+  artifacts:
+    expire_in: 1 week
+    name: "build"
+    paths:
+      - dist/
+  only:
+    - schedules
     - web
 
 # Electron app build
@@ -50,6 +64,24 @@ package:
   only:
     - stable
     - tags
+
+package-nightly:
+  stage: build
+  image: electronuserland/builder:wine
+  script:
+    - npm install
+    - npm run build:app
+    - npm run release
+    - mv ./release-builds/*.AppImage .
+    - mv ./release-builds/*.exe .
+  artifacts:
+    expire_in: 1 week
+    name: "dist"
+    paths:
+      - "*.AppImage"
+      - "*.exe"
+  only:
+    - schedules
     - web
 
 # Create a nupkg file for Choco package manager

app/make-nupkg.sh

@@ -69,7 +69,7 @@ cat > "$outpath/openflexure-ev.nuspec" <<- EOL
     <tags>openflexure microscope ev</tags>
     <licenseUrl>https://gitlab.com/openflexure/openflexure-microscope-jsclient/raw/master/LICENSE</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <iconUrl>https://build.openflexure.org/openflexure_ev/512x512.png</iconUrl>
+    <iconUrl>https://glcdn.githack.com/openflexure/openflexure-microscope-jsclient/raw/v1.1.0/app/icons/png/512x512.png</iconUrl>
   </metadata>
   <files>
     <file src="tools/**" target="tools" />

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openflexure-ev",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "description": "An electron-based user client for the OpenFlexure Microscope Server",
   "author": "OpenFlexure <contact@openflexure.org> (https://www.openflexure.org)",

src/components/controlComponents/paneCapture.vue

@@ -59,7 +59,9 @@
     <hr>
 
     <ul uk-accordion="multiple: true">
-      <li>
+
+      <!--Show stack and scan if default plugin is enabled-->
+      <li v-if="this.$store.state.apiState.plugin.includes('default_scan')">
         <a class="uk-accordion-title" href="#">Stack and Scan</a>
         <div v-if="isScanning" class="uk-accordion-content">
           <div class="uk-text-center uk-container" >

src/components/controlComponents/paneConnect.vue

@@ -69,6 +69,7 @@
 </template>
 
 <script>
+import { version } from 'punycode';
 
 export default {
   name: 'paneConnect',
@@ -148,7 +149,18 @@ export default {
         console.log(serverVersionMajor)
 
         if ((serverVersion == undefined) || (serverVersionMajor != clientVersionMajor)) {
-          this.modalDialog("Version mismatch", "Client and microscope versions do not match. Consider updating your microscope software. Some functionality may currently be broken.", status='warning')
+          var versionWarning = `Client and microscope versions do not match.\
+            Consider updating your microscope software.\
+            Some functionality may currently be broken.<br><br> \
+            <b>Client version:</b> ${clientVersion}<br> \
+            <b>Server version:</b> ${serverVersion}<br><br>`
+          if (serverVersion < 1.1) {
+            versionWarning = versionWarning + "You may need to install a never server version on a clean SD card."
+          }
+          else {
+            versionWarning = versionWarning + "Try running 'ofm upgrade' on your microscope."
+          }
+          this.modalDialog("Version mismatch", versionWarning, status='warning')
         }
       })
       .catch(error => {

src/components/controlComponents/paneNavigate.vue

@@ -62,7 +62,8 @@
       </div>
     </li>
 
-    <li class="uk-open">
+    <!--Show autofocus if default plugin is enabled-->
+    <li v-if="this.$store.state.apiState.plugin.includes('default_autofocus')" class="uk-open">
       <a class="uk-accordion-title" href="#">Autofocus</a>
       <div class="uk-accordion-content">
 

src/components/controlComponents/settingsComponents/cameraSettings.vue

@@ -4,35 +4,37 @@
       <div>
         <label class="uk-form-label" for="form-stacked-text">Exposure time</label>
         <div class="uk-form-controls">
-          <input v-model="displayShutterSpeed" class="uk-input uk-form-small" type="number">
+          <input v-bind:value="displayShutterSpeed" v-on:input="shutterSpeed = $event.target.value" class="uk-input uk-form-small" type="number">
         </div>
       </div>
 
       <div>
         <label class="uk-form-label" for="form-stacked-text">Analogue gain</label>
         <div class="uk-form-controls">
-          <input v-model="displayAnalogGain" class="uk-input uk-form-small" type="number" step="0.01">
+          <input v-bind:value="displayAnalogGain" v-on:input="analogGain = $event.target.value" class="uk-input uk-form-small" type="number" step="0.1">
         </div>
       </div>
 
       <div>
         <label class="uk-form-label" for="form-stacked-text">Digital gain</label>
         <div class="uk-form-controls">
-          <input v-model="displayDigitalGain" class="uk-input uk-form-small" type="number" step="0.01">
+          <input v-bind:value="displayDigitalGain" v-on:input="digitalGain = $event.target.value" class="uk-input uk-form-small" type="number" step="0.1">
         </div>
       </div>
 
     <button type="submit" class="uk-button uk-button-primary uk-form-small uk-float-right uk-margin-small uk-width-1-1">Apply Settings</button>
     
-    <div v-if="isCalibrating">
+    <!--Show auto calibrate if default plugin is enabled-->
-      <progressBar/>
+    <div v-if="this.$store.state.apiState.plugin.includes('default_camera_calibration')">
-    </div>
+      <div v-if="isCalibrating">
+        <progressBar/>
+      </div>
 
-    <div v-bind:hidden="isCalibrating">
+      <div v-bind:hidden="isCalibrating">
-      <button type="button" v-on:click="recalibrateConfirm()" class="uk-button uk-button-default uk-form-small uk-float-right uk-margin-small uk-width-1-1">Auto-Calibrate</button>
+        <button type="button" v-on:click="recalibrateConfirm()" class="uk-button uk-button-default uk-form-small uk-float-right uk-margin-small uk-width-1-1">Auto-Calibrate</button>
+      </div>
     </div>
 
-
   </form>
 
 </div>
@@ -70,7 +72,9 @@ export default {
     applyConfigRequest: function() {
       console.log("Applying config to the microscope")
       var payload = {
-        picamera_settings: {}
+        camera_settings: {
+          picamera_settings: {}
+        }
       }
 
       //if (this.shutterSpeed != this.$store.state.apiConfig.picamera_settings.shutter_speed) {
@@ -86,7 +90,7 @@ export default {
           return this.$store.dispatch('updateConfig');
         })
         .then(this.updateInputValues)
-        .then(r=>{console.log("Updated Config: ", payload.picamera_settings)})
+        .then(r=>{console.log("Updated Config: ", payload)})
         .catch(error => {
           this.modalError(error) // Let mixin handle error
         })
@@ -134,7 +138,7 @@ export default {
       return Number(this.analogGain).toFixed(2)
     },
     displayShutterSpeed: function () {
-      return (this.shutterSpeed != 0) ? this.shutterSpeed : "auto"
+      return (this.shutterSpeed != "0") ? this.shutterSpeed : "auto"
     },
     recalibrateApiUri: function () {
       return this.$store.getters.uri + "/plugin/default/camera_calibration/recalibrate"