Merge branch 'position-without-form' into 'v3'
Remove form tags from around position controls as it can lead to unwanted refresh See merge request openflexure/openflexure-microscope-server!662
This commit is contained in:
commit
59f8f01202
1 changed files with 25 additions and 27 deletions
|
|
@ -11,33 +11,31 @@ and zero position buttons. It also includes the d-pad.
|
||||||
<li class="uk-closed">
|
<li class="uk-closed">
|
||||||
<a class="uk-accordion-title" href="#">Position</a>
|
<a class="uk-accordion-title" href="#">Position</a>
|
||||||
<div class="uk-accordion-content">
|
<div class="uk-accordion-content">
|
||||||
<form>
|
<!-- Text boxes to set and view position -->
|
||||||
<!-- Text boxes to set and view position -->
|
<div class="input-and-buttons-container">
|
||||||
<div class="input-and-buttons-container">
|
<input
|
||||||
<input
|
v-for="(_v, key) in setPosition"
|
||||||
v-for="(_v, key) in setPosition"
|
:key="`setPosition_${key}`"
|
||||||
:key="`setPosition_${key}`"
|
v-model="setPosition[key]"
|
||||||
v-model="setPosition[key]"
|
class="uk-form-small numeric-setting-line-input"
|
||||||
class="uk-form-small numeric-setting-line-input"
|
type="number"
|
||||||
type="number"
|
@keyup.enter="startMoveTask"
|
||||||
@keyup.enter="startMoveTask"
|
/>
|
||||||
/>
|
<icon-button icon="sync_alt" @click="updatePosition" />
|
||||||
<icon-button icon="sync_alt" @click="updatePosition" />
|
</div>
|
||||||
</div>
|
<p>
|
||||||
<p>
|
<action-button
|
||||||
<action-button
|
ref="moveButton"
|
||||||
ref="moveButton"
|
thing="stage"
|
||||||
thing="stage"
|
action="move_absolute"
|
||||||
action="move_absolute"
|
:submit-data="setPosition"
|
||||||
:submit-data="setPosition"
|
:submit-label="'Move'"
|
||||||
:submit-label="'Move'"
|
:can-terminate="true"
|
||||||
:can-terminate="true"
|
:poll-interval="0.05"
|
||||||
:poll-interval="0.05"
|
@finished="moveComplete"
|
||||||
@finished="moveComplete"
|
@error="modalError"
|
||||||
@error="modalError"
|
/>
|
||||||
/>
|
</p>
|
||||||
</p>
|
|
||||||
</form>
|
|
||||||
<action-button
|
<action-button
|
||||||
thing="stage"
|
thing="stage"
|
||||||
action="set_zero_position"
|
action="set_zero_position"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue