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

Fix apriltag detection draw bug (#1467)

Browse Source 
We accidentally copied more settings then we wanted. This adds an
annotation that we can mark variables with that will prevent them from
being copied when we switch pipeline types.
This commit is contained in:
Cameron (3539)
2024-10-14 20:30:27 -04:00
committed by GitHub
parent 189da52a77
commit c961f1e22e
4 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
photon-core/src/main/java/org/photonvision/vision/pipeline/AdvancedPipelineSettings.java
View File

@@ -80,7 +80,7 @@ public class AdvancedPipelineSettings extends CVPipelineSettings {
// 3d settings
public boolean solvePNPEnabled = false;
public TargetModel targetModel = TargetModel.k2020HighGoalOuter;
@SuppressSettingCopy public TargetModel targetModel = TargetModel.k2020HighGoalOuter;
// Corner detection settings
public CornerDetectionPipe.DetectionStrategy cornerDetectionStrategy =

2
photon-core/src/main/java/org/photonvision/vision/pipeline/CVPipelineSettings.java
View File

@@ -37,7 +37,7 @@ import org.photonvision.vision.opencv.ImageRotationMode;
})
public class CVPipelineSettings implements Cloneable {
public int pipelineIndex = 0;
public PipelineType pipelineType = PipelineType.DriverMode;
@SuppressSettingCopy public PipelineType pipelineType = PipelineType.DriverMode;
public ImageRotationMode inputImageRotationMode = ImageRotationMode.DEG_0;
public String pipelineNickname = "New Pipeline";
public boolean cameraAutoExposure = false;

28
photon-core/src/main/java/org/photonvision/vision/pipeline/SuppressSettingCopy.java Normal file
View File

@@ -0,0 +1,28 @@
/*
* Copyright (C) Photon Vision.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package org.photonvision.vision.pipeline;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
/** This annotation is used to suppress copying the settings from one pipeline to the next */
public @interface SuppressSettingCopy {}

8
photon-core/src/main/java/org/photonvision/vision/processes/PipelineManager.java
View File

@@ -518,6 +518,10 @@ public class PipelineManager {
// Copy all fields from AdvancedPipelineSettings/its superclasses from old to new
try {
for (Field field : getAllFields(AdvancedPipelineSettings.class)) {
if (field.isAnnotationPresent(SuppressSettingCopy.class)) {
// Skip fields that are annotated with SuppressSettingCopy
continue;
}
Object value = field.get(oldSettings);
logger.debug("setting " + field.getName() + " to " + value);
field.set(newSettings, value);
@@ -528,10 +532,6 @@ public class PipelineManager {
logger.info("Adding new pipe of type " + type + " at idx " + idx);
// type gets overritten by reflction hackery above
newSettings.pipelineIndex = idx;
newSettings.pipelineType = type;
userPipelineSettings.set(idx, newSettings);
setPipelineInternal(idx);