From dcaec8a127fd426b68199140b927ba3927ebd803 Mon Sep 17 00:00:00 2001 From: "Cameron (3539)" Date: Tue, 8 Oct 2024 22:54:12 -0400 Subject: [PATCH] lint and formatting --- .../pipeline/ArucoPipelineSettings.java | 3 +- .../vision/processes/VisionModule.java | 11 +++--- .../VisionModuleChangeSubscriber.java | 34 +++++++++---------- .../vision/processes/VisionRunner.java | 1 - 4 files changed, 21 insertions(+), 28 deletions(-) diff --git a/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java b/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java index 42987e3fa..54fdc584e 100644 --- a/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java +++ b/photon-core/src/main/java/org/photonvision/vision/pipeline/ArucoPipelineSettings.java @@ -17,12 +17,11 @@ package org.photonvision.vision.pipeline; +import com.fasterxml.jackson.annotation.JsonTypeName; import org.photonvision.common.util.numbers.IntegerCouple; import org.photonvision.vision.apriltag.AprilTagFamily; import org.photonvision.vision.target.TargetModel; -import com.fasterxml.jackson.annotation.JsonTypeName; - @JsonTypeName("ArucoPipelineSettings") public class ArucoPipelineSettings extends AdvancedPipelineSettings { public AprilTagFamily tagFamily = AprilTagFamily.kTag16h5; diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java index 9dd0a9523..6fd00c363 100644 --- a/photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java +++ b/photon-core/src/main/java/org/photonvision/vision/processes/VisionModule.java @@ -17,13 +17,16 @@ package org.photonvision.vision.processes; +import edu.wpi.first.cscore.CameraServerJNI; +import edu.wpi.first.cscore.VideoException; +import edu.wpi.first.math.util.Units; +import io.javalin.websocket.WsContext; import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.function.BiConsumer; import java.util.stream.Collectors; - import org.opencv.core.Size; import org.photonvision.common.configuration.CameraConfiguration; import org.photonvision.common.configuration.ConfigManager; @@ -54,11 +57,6 @@ import org.photonvision.vision.target.TargetModel; import org.photonvision.vision.target.TrackedTarget; -import edu.wpi.first.cscore.CameraServerJNI; -import edu.wpi.first.cscore.VideoException; -import edu.wpi.first.math.util.Units; -import io.javalin.websocket.WsContext; - /** * This is the God Class * @@ -94,7 +92,6 @@ public class VisionModule { MJPGFrameConsumer inputVideoStreamer; MJPGFrameConsumer outputVideoStreamer; - public VisionModule(PipelineManager pipelineManager, VisionSource visionSource, int index) { logger = new Logger( diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java index 17af68f68..3737f611a 100644 --- a/photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java +++ b/photon-core/src/main/java/org/photonvision/vision/processes/VisionModuleChangeSubscriber.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.locks.ReentrantLock; - import org.apache.commons.lang3.tuple.Pair; import org.opencv.core.Point; import org.photonvision.common.dataflow.DataChangeSubscriber; @@ -47,10 +46,11 @@ public class VisionModuleChangeSubscriber extends DataChangeSubscriber { public VisionModuleChangeSubscriber(VisionModule parentModule) { this.parentModule = parentModule; - logger = new Logger( - VisionModuleChangeSubscriber.class, - parentModule.visionSource.getSettables().getConfiguration().nickname, - LogGroup.VisionModule); + logger = + new Logger( + VisionModuleChangeSubscriber.class, + parentModule.visionSource.getSettables().getConfiguration().nickname, + LogGroup.VisionModule); } @Override @@ -95,8 +95,8 @@ public void processSettingChanges() { switch (propName) { case "pipelineName": // rename current pipeline logger.info("Changing nick to " + newPropValue); - parentModule.pipelineManager - .getCurrentPipelineSettings().pipelineNickname = (String) newPropValue; + parentModule.pipelineManager.getCurrentPipelineSettings().pipelineNickname = + (String) newPropValue; parentModule.saveAndBroadcastAll(); continue; case "newPipelineInfo": // add new pipeline @@ -128,8 +128,9 @@ public void processSettingChanges() { continue; case "startCalibration": try { - var data = JacksonUtils.deserialize( - (Map) newPropValue, UICalibrationData.class); + var data = + JacksonUtils.deserialize( + (Map) newPropValue, UICalibrationData.class); parentModule.startCalibration(data); parentModule.saveAndBroadcastAll(); } catch (Exception e) { @@ -249,18 +250,15 @@ public void processSettingChanges() { } /** - * Sets the value of a property in the given object using reflection. This - * method should not be - * used generally and is only known to be correct in the context of - * `onDataChangeEvent`. + * Sets the value of a property in the given object using reflection. This method should not be + * used generally and is only known to be correct in the context of `onDataChangeEvent`. * * @param currentSettings The object whose property needs to be set. - * @param propName The name of the property to be set. - * @param newPropValue The new value to be assigned to the property. + * @param propName The name of the property to be set. + * @param newPropValue The new value to be assigned to the property. * @throws IllegalAccessException If the field cannot be accessed. - * @throws NoSuchFieldException If the field does not exist. - * @throws Exception If an some other unknown exception occurs - * while setting the property. + * @throws NoSuchFieldException If the field does not exist. + * @throws Exception If an some other unknown exception occurs while setting the property. */ protected static void setProperty(Object currentSettings, String propName, Object newPropValue) throws IllegalAccessException, NoSuchFieldException, Exception { diff --git a/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java b/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java index dbcb4a644..a1299bd54 100644 --- a/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java +++ b/photon-core/src/main/java/org/photonvision/vision/processes/VisionRunner.java @@ -19,7 +19,6 @@ import java.util.function.Consumer; import java.util.function.Supplier; - import org.photonvision.common.logging.LogGroup; import org.photonvision.common.logging.Logger; import org.photonvision.vision.camera.QuirkyCamera;