Skip to content

Commit 8215caf

Browse files
authored
Fix camera calibration card contents completely vanishing during calibration (#1998)
## Description Per #1972 (comment), camera calibration got broken because I accidently hid the entire contents of the camera calibration card in #1972. Now, v-show is only applied to the calibration table so that only the calibration table is hidden during calibration. ## Meta Merge checklist: - [x] Pull Request title is [short, imperative summary](https://cbea.ms/git-commit/) of proposed changes - [x] The description documents the _what_ and _why_ - [ ] If this PR changes behavior or adds a feature, user documentation is updated - [ ] If this PR touches photon-serde, all messages have been regenerated and hashes have not changed unexpectedly - [ ] If this PR touches configuration, this is backwards compatible with settings back to v2024.3.1 - [ ] If this PR touches pipeline settings or anything related to data exchange, the frontend typing is updated - [ ] If this PR addresses a bug, a regression test for it is added
1 parent ed58f69 commit 8215caf

File tree

1 file changed

+35
-33
lines changed

1 file changed

+35
-33
lines changed

photon-client/src/components/cameras/CameraCalibrationCard.vue

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -218,39 +218,41 @@ const setSelectedVideoFormat = (format: VideoFormat) => {
218218
<div>
219219
<v-card class="mb-3" color="primary" dark>
220220
<v-card-title>Camera Calibration</v-card-title>
221-
<v-card-text v-show="!isCalibrating">
222-
<v-card-subtitle class="pt-0 pl-0 pr-0 text-white">Current Calibration</v-card-subtitle>
223-
<v-table fixed-header height="100%" density="compact">
224-
<thead>
225-
<tr>
226-
<th>Resolution</th>
227-
<th>Mean Error</th>
228-
<th>Horizontal FOV</th>
229-
<th>Vertical FOV</th>
230-
<th>Diagonal FOV</th>
231-
<th>Info</th>
232-
</tr>
233-
</thead>
234-
<tbody style="cursor: pointer">
235-
<tr v-for="(value, index) in getUniqueVideoFormatsByResolution()" :key="index">
236-
<td>{{ getResolutionString(value.resolution) }}</td>
237-
<td>
238-
{{ value.mean !== undefined ? (isNaN(value.mean) ? "Unknown" : value.mean.toFixed(2) + "px") : "-" }}
239-
</td>
240-
<td>{{ value.horizontalFOV !== undefined ? value.horizontalFOV.toFixed(2) + "°" : "-" }}</td>
241-
<td>{{ value.verticalFOV !== undefined ? value.verticalFOV.toFixed(2) + "°" : "-" }}</td>
242-
<td>{{ value.diagonalFOV !== undefined ? value.diagonalFOV.toFixed(2) + "°" : "-" }}</td>
243-
<v-tooltip location="bottom">
244-
<template #activator="{ props }">
245-
<td v-bind="props" @click="setSelectedVideoFormat(value)">
246-
<v-icon size="small">mdi-information</v-icon>
247-
</td>
248-
</template>
249-
<span>Click for more info on this calibration.</span>
250-
</v-tooltip>
251-
</tr>
252-
</tbody>
253-
</v-table>
221+
<v-card-text>
222+
<div v-show="!isCalibrating">
223+
<v-card-subtitle class="pt-0 pl-0 pr-0 text-white">Current Calibration</v-card-subtitle>
224+
<v-table fixed-header height="100%" density="compact">
225+
<thead>
226+
<tr>
227+
<th>Resolution</th>
228+
<th>Mean Error</th>
229+
<th>Horizontal FOV</th>
230+
<th>Vertical FOV</th>
231+
<th>Diagonal FOV</th>
232+
<th>Info</th>
233+
</tr>
234+
</thead>
235+
<tbody style="cursor: pointer">
236+
<tr v-for="(value, index) in getUniqueVideoFormatsByResolution()" :key="index">
237+
<td>{{ getResolutionString(value.resolution) }}</td>
238+
<td>
239+
{{ value.mean !== undefined ? (isNaN(value.mean) ? "Unknown" : value.mean.toFixed(2) + "px") : "-" }}
240+
</td>
241+
<td>{{ value.horizontalFOV !== undefined ? value.horizontalFOV.toFixed(2) + "°" : "-" }}</td>
242+
<td>{{ value.verticalFOV !== undefined ? value.verticalFOV.toFixed(2) + "°" : "-" }}</td>
243+
<td>{{ value.diagonalFOV !== undefined ? value.diagonalFOV.toFixed(2) + "°" : "-" }}</td>
244+
<v-tooltip location="bottom">
245+
<template #activator="{ props }">
246+
<td v-bind="props" @click="setSelectedVideoFormat(value)">
247+
<v-icon size="small">mdi-information</v-icon>
248+
</td>
249+
</template>
250+
<span>Click for more info on this calibration.</span>
251+
</v-tooltip>
252+
</tr>
253+
</tbody>
254+
</v-table>
255+
</div>
254256
<div v-if="useCameraSettingsStore().isConnected" class="d-flex flex-column">
255257
<v-card-subtitle v-show="!isCalibrating" class="pl-0 pb-3 pt-3 text-white"
256258
>Configure New Calibration</v-card-subtitle

0 commit comments

Comments
 (0)