Skip to content

[UI] Fix target tab under AprilTag #478

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 29, 2022
Merged

[UI] Fix target tab under AprilTag #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
70001b1
Start addressing things
mcm001 Sep 29, 2022
fa7c26b
Fix target tab table
mcm001 Sep 29, 2022
0b694fe
Update TrackedTarget.java
mcm001 Sep 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions photon-client/src/components/pipeline/3D/MiniMap.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/views/PipelineViews/AprilTagTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
name="Decimate"
min="0"
max="3"
step=".01"
step=".5"
@input="handlePipelineData('decimate')"
/>
<CVslider
Expand Down
14 changes: 1 addition & 13 deletions photon-client/src/views/PipelineViews/TargetsTab.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
8 changes: 6 additions & 2 deletions photon-core/src/main/java/org/photonvision/vision/target/TrackedTarget.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,8 +196,12 @@ public void calculateValues(TargetCalculationParameters params) {
@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();
Expand Down