Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-27 02:01:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

[UI] Fix target tab under AprilTag (#478)

Browse Source 
* Start addressing things

* Fix target tab table

* Update TrackedTarget.java
This commit is contained in:
Matt
2022-09-29 12:28:11 -04:00
committed by GitHub
parent a764ace7f2
commit 4b4a0a1cd9
4 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
photon-client/src/components/pipeline/3D/MiniMap.vue
View File

@@ -81,8 +81,8 @@ export default {
let arrow = (new ArrowHelper(new Vector3(1, 0, 0).normalize(), new Vector3(0, 0, 0),
1, // length
0xff0000,
0.2,
0.2,
0.1,
0.1,
));
arrow.rotation.setFromQuaternion(quat)
arrow.rotateZ(-Math.PI / 2)
@@ -92,8 +92,8 @@ export default {
arrow = (new ArrowHelper(new Vector3(1, 0, 0).normalize(), new Vector3(0, 0, 0),
1, // length
0x00ff00,
0.2,
0.2,
0.1,
0.1,
));
arrow.rotation.setFromQuaternion(quat)
// arrow.rotateX(Math.PI / 2)
@@ -102,8 +102,8 @@ export default {
arrow = (new ArrowHelper(new Vector3(1, 0, 0).normalize(), new Vector3(0, 0, 0),
1, // length
0x0000ff,
0.2,
0.2,
0.1,
0.1,
));
arrow.setRotationFromQuaternion(quat)
arrow.rotateX(Math.PI / 2)

2
photon-client/src/views/PipelineViews/AprilTagTab.vue
View File

@@ -16,7 +16,7 @@
name="Decimate"
min="0"
max="3"
step=".01"
step=".5"
@input="handlePipelineData('decimate')"
/>
<CVslider

14
photon-client/src/views/PipelineViews/TargetsTab.vue
View File

@@ -35,18 +35,7 @@
Area, %
</th>
</template>
<template v-else-if="$store.getters.pipelineType === 4 && $store.getters.currentPipelineSettings.solvePNPEnabled">
<th class="text-center">
X,&nbsp;m
</th>
<th class="text-center">
Y,&nbsp;m
</th>
<th class="text-center">
Z Angle,&nbsp;&deg;
</th>
</template>
<template v-else-if="$store.getters.currentPipelineSettings.solvePNPEnabled">
<template v-else>
<th class="text-center">
X,&nbsp;m
</th>
@@ -75,7 +64,6 @@
<td>{{ parseFloat(value.area).toFixed(2) }}</td>
</template>
<template v-else-if="$store.getters.currentPipelineSettings.solvePNPEnabled && $store.getters.pipelineType === 4">
<td>{{ parseInt(value.fiducialId) }} </td>
<td>{{ parseFloat(value.pose.x).toFixed(2) }}&nbsp;m</td>
<td>{{ parseFloat(value.pose.y).toFixed(2) }}&nbsp;m</td>
<td>{{ (parseFloat(value.pose.angle_z) * 180 / Math.PI).toFixed(2) }}&deg;</td>

8
photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java
View File

@@ -196,8 +196,12 @@ public class TrackedTarget implements Releasable {
@Override
public void release() {
m_mainContour.release();
for (var sc : m_subContours) {
sc.release();
// TODO how can this check fail?
if (m_subContours != null) {
for (var sc : m_subContours) {
sc.release();
}
}
if (m_cameraRelativeTvec != null) m_cameraRelativeTvec.release();