Skip to content

Commit

Permalink
Formatting fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
srimanachanta committed Jul 11, 2023
1 parent 3555489 commit 2816875
Show file tree
Hide file tree
Showing 33 changed files with 117 additions and 116 deletions.
3 changes: 2 additions & 1 deletion photon-client/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"quotes": ["error", "double"],
"comma-dangle": ["error", "never"],
"semi": ["error", "always"],
"eol-last": "error"
"eol-last": "error",
"object-curly-spacing": ["error", "always"]
}
}
10 changes: 5 additions & 5 deletions photon-client/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import {useStateStore} from "@/stores/StateStore";
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {AutoReconnectingWebsocket} from "@/lib/AutoReconnectingWebsocket";
import {inject, onMounted} from "vue";
import { useStateStore } from "@/stores/StateStore";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { AutoReconnectingWebsocket } from "@/lib/AutoReconnectingWebsocket";
import { inject, onMounted } from "vue";
import PhotonSidebar from "@/components/app/photon-sidebar.vue";
import PhotonLogView from "@/components/app/photon-log-view.vue";
import PhotonErrorSnackbar from "@/components/app/photon-error-snackbar.vue";
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/app/photon-camera-stream.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import {computed, inject} from "vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {useStateStore} from "@/stores/StateStore";
import { computed, inject } from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { useStateStore } from "@/stores/StateStore";
import loadingImage from "@/assets/images/loading.svg";
import type {StyleValue} from "vue/types/jsx";
import type { StyleValue } from "vue/types/jsx";
const props = defineProps<{
streamType: "Raw" | "Processed"
Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/components/app/photon-error-snackbar.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {useStateStore} from "@/stores/StateStore";
import { useStateStore } from "@/stores/StateStore";
</script>

<template>
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/app/photon-log-view.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script setup lang="ts">
import {computed, ref, inject} from "vue";
import {LogLevel, type LogMessage} from "@/types/SettingTypes";
import {useStateStore} from "@/stores/StateStore";
import { computed, ref, inject } from "vue";
import { LogLevel, type LogMessage } from "@/types/SettingTypes";
import { useStateStore } from "@/stores/StateStore";
const selectedLogLevels = ref<LogLevel[]>([LogLevel.ERROR, LogLevel.WARN, LogLevel.INFO]);
const logs = computed<LogMessage[]>(() => useStateStore().logMessages.filter(message => selectedLogLevels.value.includes(message.level)));
const showLogModal = computed<boolean>({
get: () => useStateStore().showLogModal,
set: v => useStateStore().$patch({showLogModal: v})
set: v => useStateStore().$patch({ showLogModal: v })
});
const backendAddress = inject<string>("backendAddress");
Expand Down
6 changes: 3 additions & 3 deletions photon-client/src/components/app/photon-sidebar.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import {computed, getCurrentInstance, ref} from "vue";
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import {useStateStore} from "@/stores/StateStore";
import { computed, getCurrentInstance, ref } from "vue";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
import { useStateStore } from "@/stores/StateStore";
const getSidebarFoldedFromLocalStorage = () => {
const localValue = localStorage.getItem("sidebarFolded");
Expand Down
14 changes: 7 additions & 7 deletions photon-client/src/components/cameras/CalibrationCard.vue
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<script setup lang="ts">
import {computed, ref} from "vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {CalibrationBoardTypes} from "@/types/SettingTypes";
import { computed, ref } from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { CalibrationBoardTypes } from "@/types/SettingTypes";
import JsPDF from "jspdf";
import {font as PromptRegular} from "@/assets/fonts/PromptRegular";
import { font as PromptRegular } from "@/assets/fonts/PromptRegular";
import MonoLogo from "@/assets/images/logoMono.png";
import CvSlider from "@/components/common/cv-slider.vue";
import {useStateStore} from "@/stores/StateStore";
import { useStateStore } from "@/stores/StateStore";
import CvSwitch from "@/components/common/cv-switch.vue";
import CvSelect from "@/components/common/cv-select.vue";
import CvNumberInput from "@/components/common/cv-number-input.vue";
Expand All @@ -27,7 +27,7 @@ const boardType = ref<CalibrationBoardTypes>(CalibrationBoardTypes.Chessboard);
const importCalibrationFromCalibDB = ref();
const downloadCalibBoard = () => {
const doc = new JsPDF({unit: "in", format: "letter"});
const doc = new JsPDF({ unit: "in", format: "letter" });
doc.addFileToVFS("Prompt-Regular.tff", PromptRegular);
doc.addFont("Prompt-Regular.tff", "Prompt-Regular", "normal");
Expand Down Expand Up @@ -106,7 +106,7 @@ const openCalibUploadPrompt = () => {
};
const readImportedCalibration = (event) => {
event.target.files[0].text().then(text => {
useCameraSettingsStore().importCalibDB({payload: text, filename: event.target.files[0].name})
useCameraSettingsStore().importCalibDB({ payload: text, filename: event.target.files[0].name })
.then((response) => {
useStateStore().showSnackbarMessage({
message: response.data.text || response.data,
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/cameras/CameraSettingsCard.vue
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<script setup lang="ts">
import CvSelect from "@/components/common/cv-select.vue";
import CvNumberInput from "@/components/common/cv-number-input.vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {useStateStore} from "@/stores/StateStore";
import {ref} from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { useStateStore } from "@/stores/StateStore";
import { ref } from "vue";
const currentFov = ref(useCameraSettingsStore().currentCameraSettings.fov.value);
const saveCameraSettings = () => {
useCameraSettingsStore().updateCameraSettings({fov: currentFov.value}, true)
useCameraSettingsStore().updateCameraSettings({ fov: currentFov.value }, true)
.then((response) => {
useStateStore().showSnackbarMessage({
color: "success",
Expand Down
4 changes: 2 additions & 2 deletions photon-client/src/components/common/cv-input.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {computed} from "vue";
import { computed } from "vue";
import TooltippedLabel from "@/components/common/cv-tooltipped-label.vue";
const props = withDefaults(defineProps<{
Expand Down Expand Up @@ -30,7 +30,7 @@ const localValue = computed({
});
const handleKeydown = ({key}) => {
const handleKeydown = ({ key }) => {
switch (key) {
case "Enter":
if(!(props.rules || []).some(v => v(localValue.value) === false || typeof v(localValue.value) === "string")) {
Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/components/common/cv-radio.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {computed} from "vue";
import { computed } from "vue";
import TooltippedLabel from "@/components/common/cv-tooltipped-label.vue";
const props = withDefaults(defineProps<{
Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/components/common/cv-range-slider.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {computed} from "vue";
import { computed } from "vue";
import TooltippedLabel from "@/components/common/cv-tooltipped-label.vue";
const props = withDefaults(defineProps<{
Expand Down
4 changes: 2 additions & 2 deletions photon-client/src/components/common/cv-select.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {computed} from "vue";
import { computed } from "vue";
import TooltippedLabel from "@/components/common/cv-tooltipped-label.vue";
interface SelectItem {
Expand Down Expand Up @@ -36,7 +36,7 @@ const items = computed<SelectItem[]>(() => {
if((props.items[0] as SelectItem).name) {
return props.items as SelectItem[];
}
return props.items.map((v, i) => ({name: v, value: i}));
return props.items.map((v, i) => ({ name: v, value: i }));
});
</script>

Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/components/common/cv-slider.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import {computed} from "vue";
import { computed } from "vue";
import TooltippedLabel from "@/components/common/cv-tooltipped-label.vue";
const props = withDefaults(defineProps<{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import CvSelect from "@/components/common/cv-select.vue";
import {useStateStore} from "@/stores/StateStore";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {WebsocketPipelineType} from "@/types/WebsocketDataTypes";
import {computed, ref} from "vue";
import { useStateStore } from "@/stores/StateStore";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { WebsocketPipelineType } from "@/types/WebsocketDataTypes";
import { computed, ref } from "vue";
import CvIcon from "@/components/common/cv-icon.vue";
import CvInput from "@/components/common/cv-input.vue";
Expand Down Expand Up @@ -54,13 +54,13 @@ const cancelCameraNameEdit = () => {
};
const pipelineNamesWrapper = computed<{name: string, value: number}[]>(() => {
const pipelineNames = useCameraSettingsStore().pipelineNames.map((name, index) => ({name: name, value: index}));
const pipelineNames = useCameraSettingsStore().pipelineNames.map((name, index) => ({ name: name, value: index }));
if(useCameraSettingsStore().isDriverMode) {
pipelineNames.push({name: "Driver Mode", value: WebsocketPipelineType.DriverMode});
pipelineNames.push({ name: "Driver Mode", value: WebsocketPipelineType.DriverMode });
}
if(useCameraSettingsStore().isCalibrationMode) {
pipelineNames.push({name: "3D Calibration Mode", value: WebsocketPipelineType.Calib3d});
pipelineNames.push({ name: "3D Calibration Mode", value: WebsocketPipelineType.Calib3d });
}
return pipelineNames;
Expand Down
10 changes: 5 additions & 5 deletions photon-client/src/components/dashboard/CamerasCard.vue
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script setup lang="ts">
import {computed} from "vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import {useStateStore} from "@/stores/StateStore";
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import {PipelineType} from "@/types/PipelineTypes";
import { computed } from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import { useStateStore } from "@/stores/StateStore";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
import { PipelineType } from "@/types/PipelineTypes";
import PhotonCameraStream from "@/components/app/photon-camera-stream.vue";
defineProps<{
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/dashboard/PipelineConfigCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import type {Component} from "vue";
import {computed, ref} from "vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import type { Component } from "vue";
import { computed, ref } from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import InputTab from "@/components/dashboard/PipelineConfigTabs/InputTab.vue";
import ThresholdTab from "@/components/dashboard/PipelineConfigTabs/ThresholdTab.vue";
Expand All @@ -12,7 +12,7 @@ import OutputTab from "@/components/dashboard/PipelineConfigTabs/OutputTab.vue";
import TargetsTab from "@/components/dashboard/PipelineConfigTabs/TargetsTab.vue";
import PnPTab from "@/components/dashboard/PipelineConfigTabs/PnPTab.vue";
import Map3DTab from "@/components/dashboard/PipelineConfigTabs/Map3DTab.vue";
import {WebsocketPipelineType} from "@/types/WebsocketDataTypes";
import { WebsocketPipelineType } from "@/types/WebsocketDataTypes";
interface ConfigOption {
tabName: string,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<script setup lang="ts">
import CvSlider from "@/components/common/cv-slider.vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
import CvSwitch from "@/components/common/cv-switch.vue";
import CvSelect from "@/components/common/cv-select.vue";
import {computed} from "vue";
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import { computed } from "vue";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
// Due to something with libcamera or something else IDK much about, the 90° rotations need to be disabled if the libcamera drivers are being used.
const cameraRotations = computed(() => ["Normal","90° CW","180°","90° CCW"].map((v, i) => ({name: v, value: i, disabled: useSettingsStore().gpuAccelerationEnabled ? [1, 3].includes(i) : false})));
const cameraRotations = computed(() => ["Normal","90° CW","180°","90° CCW"].map((v, i) => ({ name: v, value: i, disabled: useSettingsStore().gpuAccelerationEnabled ? [1, 3].includes(i) : false })));
const streamDivisors = [1, 2, 4, 6];
const getFilteredStreamDivisors = (): number[] => {
Expand All @@ -22,13 +22,13 @@ const getNumberOfSkippedDivisors = () => streamDivisors.length - getFilteredStre
const cameraResolutions = computed(() => useCameraSettingsStore().currentCameraSettings.validVideoFormats.map(f => `${f.resolution.width} X ${f.resolution.height} at ${f.fps} FPS, ${f.pixelFormat}`));
const handleResolutionChange = (value: number) => {
useCameraSettingsStore().changeCurrentPipelineSetting({cameraVideoModeIndex: value}, false);
useCameraSettingsStore().changeCurrentPipelineSetting({ cameraVideoModeIndex: value }, false);
useCameraSettingsStore().changeCurrentPipelineSetting({streamingFrameDivisor: getNumberOfSkippedDivisors()}, false);
useCameraSettingsStore().changeCurrentPipelineSetting({ streamingFrameDivisor: getNumberOfSkippedDivisors() }, false);
useCameraSettingsStore().currentPipelineSettings.streamingFrameDivisor = 0;
if(!useCameraSettingsStore().isCurrentVideoFormatCalibrated) {
useCameraSettingsStore().changeCurrentPipelineSetting({solvePNPEnabled: false}, true);
useCameraSettingsStore().changeCurrentPipelineSetting({ solvePNPEnabled: false }, true);
}
};
Expand All @@ -39,7 +39,7 @@ const streamResolutions = computed(() => {
.map(x => `${Math.floor(currentResolution.width / x)} X ${Math.floor(currentResolution.height / x)}`);
});
const handleStreamResolutionChange = (value: number) => {
useCameraSettingsStore().changeCurrentPipelineSetting({streamingFrameDivisor: value + getNumberOfSkippedDivisors()}, false);
useCameraSettingsStore().changeCurrentPipelineSetting({ streamingFrameDivisor: value + getNumberOfSkippedDivisors() }, false);
};
</script>

Expand Down
6 changes: 3 additions & 3 deletions photon-client/src/components/dashboard/StreamConfigCard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import {computed} from "vue";
import {useCameraSettingsStore} from "@/stores/settings/CameraSettingsStore";
import { computed } from "vue";
import { useCameraSettingsStore } from "@/stores/settings/CameraSettingsStore";
const props = defineProps<{
// TODO fully update v-model usage in custom components on Vue3 update
Expand All @@ -21,7 +21,7 @@ const processingMode = computed<number>({
get: () => useCameraSettingsStore().currentPipelineSettings.solvePNPEnabled ? 1: 0,
set: v => {
if(useCameraSettingsStore().isCurrentVideoFormatCalibrated) {
useCameraSettingsStore().changeCurrentPipelineSetting({solvePNPEnabled: v === 1}, true);
useCameraSettingsStore().changeCurrentPipelineSetting({ solvePNPEnabled: v === 1 }, true);
}
}
});
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/settings/DeviceControlCard.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import {inject, ref} from "vue";
import {useStateStore} from "@/stores/StateStore";
import { inject, ref } from "vue";
import { useStateStore } from "@/stores/StateStore";
import CvSelect from "@/components/common/cv-select.vue";
import axios from "axios";
Expand Down Expand Up @@ -62,14 +62,14 @@ const openOfflineUpdatePrompt = () => {
offlineUpdate.value.click();
};
const handleOfflineUpdate = (event) => {
useStateStore().showSnackbarMessage({message: "New Software Upload in Progress...", color: "secondary", timeout: -1});
useStateStore().showSnackbarMessage({ message: "New Software Upload in Progress...", color: "secondary", timeout: -1 });
const formData = new FormData();
formData.append("jarData", event.target.files[0]);
axios.post("/utils/offlineUpdate", formData, {
headers: { "Content-Type": "multipart/form-data" },
onUploadProgress: function({progress}) {
onUploadProgress: function({ progress }) {
const uploadPercentage = ((progress || 0) * 100.0);
if (uploadPercentage < 99.5) {
useStateStore().showSnackbarMessage({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import CvSlider from "@/components/common/cv-slider.vue";
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
</script>

<template>
Expand Down
4 changes: 2 additions & 2 deletions photon-client/src/components/settings/MetricsCard.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
import { onMounted } from "vue";
import {useStateStore} from "@/stores/StateStore";
import { useStateStore } from "@/stores/StateStore";
onMounted(() => {
// TODO should this be silent?
Expand Down
8 changes: 4 additions & 4 deletions photon-client/src/components/settings/NetworkingCard.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<script setup lang="ts">
import {useSettingsStore} from "@/stores/settings/GeneralSettingsStore";
import {ref} from "vue";
import { useSettingsStore } from "@/stores/settings/GeneralSettingsStore";
import { ref } from "vue";
import CvInput from "@/components/common/cv-input.vue";
import CvRadio from "@/components/common/cv-radio.vue";
import CvSwitch from "@/components/common/cv-switch.vue";
import {NetworkConnectionType} from "@/types/SettingTypes";
import {useStateStore} from "@/stores/StateStore";
import { NetworkConnectionType } from "@/types/SettingTypes";
import { useStateStore } from "@/stores/StateStore";
const settingsValid = ref(true);
const isValidNetworkTablesIP = (v: string | undefined): boolean => {
Expand Down
4 changes: 2 additions & 2 deletions photon-client/src/lib/AutoReconnectingWebsocket.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {decode, encode} from "@msgpack/msgpack";
import type {IncomingWebsocketData} from "@/types/WebsocketDataTypes";
import { decode, encode } from "@msgpack/msgpack";
import type { IncomingWebsocketData } from "@/types/WebsocketDataTypes";

/**
* {@link WebSocket} wrapper class that automatically reconnects to the provided host address if the connection was closed by the remote host or a connection failure.
Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/plugins/vuetify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Vue from "vue";
import Vuetify from "vuetify";
import "vuetify/dist/vuetify.min.css";
import "@mdi/font/css/materialdesignicons.css";
import type {VuetifyThemeVariant} from "vuetify/types/services/theme";
import type { VuetifyThemeVariant } from "vuetify/types/services/theme";

Vue.use(Vuetify);

Expand Down
Loading

0 comments on commit 2816875

Please sign in to comment.