Make small cosmetic improvments across the user interface (#396)

This commit is contained in:
Declan
2022-01-16 08:25:37 -08:00
committed by GitHub
parent 4ddb9aa08f
commit 6c91feaf3f
12 changed files with 364 additions and 317 deletions

View File

@@ -13,7 +13,7 @@
export default {
name: "CvImage",
// eslint-disable-next-line vue/require-prop-types
props: ['address', 'scale', 'maxHeight', 'maxHeightMd', 'maxHeightXl', 'colorPicking', 'id', 'disconnected'],
props: ['address', 'scale', 'maxHeight', 'maxHeightMd', 'maxHeightLg', 'maxHeightXl', 'colorPicking', 'id', 'disconnected'],
data() {
return {
seed: 1.0,
@@ -37,7 +37,9 @@
if (this.$vuetify.breakpoint.xl) {
ret["max-height"] = this.maxHeightXl;
} else if (this.$vuetify.breakpoint.mdAndUp) {
} else if (this.$vuetify.breakpoint.lg) {
ret["max-height"] = this.maxHeightLg;
} else if (this.$vuetify.breakpoint.md) {
ret["max-height"] = this.maxHeightMd;
}

View File

@@ -1,28 +1,46 @@
<template>
<div>
<v-radio-group
v-model="localValue"
row
dark
:mandatory="true"
<v-row
dense
align="center"
>
<v-radio
v-for="(name,index) in list"
:key="index"
color="#ffd843"
:label="name"
:value="index"
:disabled="disabled"
/>
</v-radio-group>
<v-col :cols="12 - (inputCols || 8)">
<tooltipped-label
:tooltip="tooltip"
:text="name"
/>
</v-col>
<v-col :cols="inputCols || 8">
<v-radio-group
v-model="localValue"
row
dark
:mandatory="true"
>
<v-radio
v-for="(name,index) in list"
:key="index"
color="#ffd843"
:label="name"
:value="index"
:disabled="disabled"
/>
</v-radio-group>
</v-col>
</v-row>
</div>
</template>
<script>
import TooltippedLabel from "./cv-tooltipped-label";
export default {
name: 'Radio',
components: {
TooltippedLabel
},
// eslint-disable-next-line vue/require-prop-types
props: ['value', 'list', 'disabled'],
props: ['name', 'value', 'list', 'disabled', 'inputCols', 'tooltip'],
data() {
return {}
},

View File

@@ -3,7 +3,7 @@
<v-tooltip
:disabled="tooltip === undefined"
right
open-delay="600"
open-delay="300"
>
<template v-slot:activator="{ on, attrs }">
<span

View File

@@ -1,11 +1,15 @@
<template>
<div>
<v-row align="center">
<v-row
align="center"
class="pl-6"
>
<v-col
cols="10"
md="5"
lg="10"
class="pt-0 pb-0 pl-6"
no-gutters
class="pa-0"
>
<CVselect
v-if="isCameraNameEdit === false"
@@ -59,7 +63,8 @@
cols="10"
md="5"
lg="10"
class="pt-0 pb-0 pl-6"
no-gutters
class="pa-0"
>
<CVselect
v-model="currentPipelineIndex"
@@ -139,14 +144,16 @@
<v-col
v-if="currentPipelineType >= 0"
cols="10"
md="5"
md="11"
lg="10"
class="pt-0 pb-0 pl-6"
no-gutters
class="pa-0"
>
<CVselect
v-model="currentPipelineType"
name="Type"
:list="['Reflective', 'Shape']"
tooltip="Changes the pipeline type, which changes the type of processing that will happen on input frames"
:list="['Reflective Tape', 'Colored Shape']"
@input="e => showTypeDialog(e)"
/>
</v-col>
@@ -176,12 +183,6 @@
name="Name"
:error-message="checkPipelineName"
/>
<!-- <CVselect-->
<!-- v-model="currentPipelineType"-->
<!-- name="Pipeline Type"-->
<!-- :list="['Reflective', 'Shape']"-->
<!-- :disabled="true"-->
<!-- />-->
</v-card-text>
<v-divider />
<v-card-actions>
@@ -276,12 +277,12 @@ export default {
for (let cam in this.cameraList) {
if (this.cameraList.hasOwnProperty(cam)) {
if (this.newCameraName === this.cameraList[cam]) {
return "A camera by that name already Exists"
return "A camera by that name already exists"
}
}
}
} else {
return "A camera name can only contain letters, numbers and spaces"
return "A camera name can only contain letters, numbers, and spaces"
}
}
return "";