Commit 9610b91c authored by Joel Collins's avatar Joel Collins
Browse files

Removed 'connected' state in favour of 'ready' state

parent 9acf4d87

src/components/paneConnectComponents/hostDisplay.vue

+1 −1
Original line number Diff line number Diff line 
<template>

	<div class="host-display">

		<h2>Debug</h2>

		<div v-if="$store.state.connected">

		<div v-if="$store.getters.ready">

			<p><b>Host:</b> {{ $store.state.host }}</p>

			<p><b>Base URI:</b> {{ $store.getters.uri }}</p>

			<p v-if="$store.state.apiConfig.name"><b>Device name:</b> {{ $store.state.apiConfig.name }}</p>

src/components/paneConnectComponents/hostInput.vue

+3 −5
Original line number Diff line number Diff line
@@ -36,10 +36,8 @@ export default { 
        this.hostname, 

        this.port

      ]);

      // Try to get config JSON from the newly submitted host

      this.$store.dispatch('updateConfig');

      // Update the microscope state while we're at it

      this.$store.dispatch('updateState');

      // Try to get config and state JSON from the newly submitted host

      this.$store.dispatch('firstConnect')

    }

  },
@@ -55,7 +53,7 @@ export default { 
    IpFormClasses: function () {

      return {

        'uk-form-danger': !this.$store.state.available,

        'uk-form-success': this.$store.state.connected

        'uk-form-success': this.$store.getters.ready

      }

    }

  }

src/components/paneDisplayComponents/streamDisplay.vue

+1 −1
Original line number Diff line number Diff line 
<template>

	<div class="streamDisplay scrollTarget">



		<img v-on:dblclick="clickmonitor" v-if="$store.state.connected" v-bind:src="streamImgUri" alt="Stream">

		<img v-on:dblclick="clickmonitor" v-if="$store.getters.ready" v-bind:src="streamImgUri" alt="Stream">



		<div v-else-if="$store.state.waiting" class="uk-position-center">

			<div uk-spinner="ratio: 4.5" ></div>

src/components/paneNavigate.vue

+10 −5
Original line number Diff line number Diff line 
<template>

<div v-if="$store.state.connected" id="paneNavigate">

<div id="paneNavigate">



  <ul uk-accordion>

    <li>
@@ -35,21 +35,21 @@ 
            <div>

              <label class="uk-form-label" for="form-stacked-text">x</label>

              <div class="uk-form-controls">

                <input v-model="$store.state.apiState.stage.position.x" class="uk-input uk-form-small" type="number" name="inputPositionX">

                <input v-model="setPosition.x" class="uk-input uk-form-small" type="number" name="inputPositionX">

              </div>

            </div>



            <div>

              <label class="uk-form-label" for="form-stacked-text">y</label>

              <div class="uk-form-controls">

                <input v-model="$store.state.apiState.stage.position.y" class="uk-input uk-form-small" type="number" name="inputPositionY">

                <input v-model="setPosition.y" class="uk-input uk-form-small" type="number" name="inputPositionY">

              </div>

            </div>



            <div>

              <label class="uk-form-label" for="form-stacked-text">z</label>

              <div class="uk-form-controls">

                <input v-model="$store.state.apiState.stage.position.z" class="uk-input uk-form-small" type="number" name="inputPositionZx">

                <input v-model="setPosition.z" class="uk-input uk-form-small" type="number" name="inputPositionZx">

              </div>

            </div>

          </div>
@@ -82,7 +82,12 @@ export default { 
  data: function () {

    return {

      stepXy: 50,

      stepZz: 20

      stepZz: 20,

      setPosition: {

        x: this.$store.state.apiState.stage.position.x,

        y: this.$store.state.apiState.stage.position.y,

        z: this.$store.state.apiState.stage.position.z

      }

    }

  },

src/components/panelLeft.vue

+2 −2
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    </ul>

    <ul class="uk-switcher uk-padding-small uk-flex uk-flex-1 panel-content">

      <li class="uk-width-expand"><paneConnect/></li>

      <li class="uk-width-expand"><paneNavigate/></li>

      <li v-if="$store.getters.ready" class="uk-width-expand"><paneNavigate/></li>

    </ul>

  </div>

</template>
@@ -34,7 +34,7 @@ export default { 
  computed: {

    disableIfDisconnected: function () {

      return {

        'uk-disabled': !this.$store.state.connected

        'uk-disabled': !this.$store.getters.ready

      }

    }

  }