diff --git a/photon-client/src/components/dashboard/tabs/ObjectDetectionTab.vue b/photon-client/src/components/dashboard/tabs/ObjectDetectionTab.vue index a249273cf3..5128f1db44 100644 --- a/photon-client/src/components/dashboard/tabs/ObjectDetectionTab.vue +++ b/photon-client/src/components/dashboard/tabs/ObjectDetectionTab.vue @@ -32,14 +32,14 @@ const interactiveCols = computed(() => // Filters out models that are not supported by the current backend, and returns a flattened list. const supportedModels = computed(() => { const { availableModels, supportedBackends } = useSettingsStore().general; - return supportedBackends.flatMap(backend => availableModels[backend] || []); + return supportedBackends.flatMap((backend) => availableModels[backend] || []); }); const selectedModel = computed({ get: () => supportedModels.value.indexOf(currentPipelineSettings.value.model), set: (v) => { - useCameraSettingsStore().changeCurrentPipelineSetting({ model: supportedModels.value[v] }, false) - }, + useCameraSettingsStore().changeCurrentPipelineSetting({ model: supportedModels.value[v] }, false); + } }); diff --git a/photon-client/src/types/PipelineTypes.ts b/photon-client/src/types/PipelineTypes.ts index 5f609c5005..7223f3ffcb 100644 --- a/photon-client/src/types/PipelineTypes.ts +++ b/photon-client/src/types/PipelineTypes.ts @@ -306,7 +306,7 @@ export const DefaultObjectDetectionPipelineSettings: ObjectDetectionPipelineSett confidence: 0.9, nms: 0.45, box_thresh: 0.25, - model: "", + model: "" }; export type ActivePipelineSettings = diff --git a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java index 305a9c9099..0cee3b4fde 100644 --- a/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java +++ b/photon-core/src/main/java/org/photonvision/common/configuration/NeuralNetworkModelManager.java @@ -166,8 +166,6 @@ public Optional getModel(String modelName) { /** * The default model when no model is specified. - * - * @param model */ public Optional getDefaultModel() { if (models == null) { diff --git a/photon-core/src/main/java/org/photonvision/vision/objects/ObjectDetector.java b/photon-core/src/main/java/org/photonvision/vision/objects/ObjectDetector.java index bba14dff63..00c0be6052 100644 --- a/photon-core/src/main/java/org/photonvision/vision/objects/ObjectDetector.java +++ b/photon-core/src/main/java/org/photonvision/vision/objects/ObjectDetector.java @@ -24,9 +24,14 @@ import org.photonvision.vision.pipe.impl.NeuralNetworkPipeResult; /** - * ObjectDetector lifecycle: - {@link Model}s are discovered by {@link NeuralNetworkModelManager} - - * {@link Model} is selected as a parameter of {@link ObjectDetectionPipeline} - {@link Model.load} - * is called to create a ObjectDetector instance + * ObjectDetector lifecycle: + *
    + *
  1. {@link Model}s are discovered by {@link NeuralNetworkModelManager}
  2. + *
  3. {@link Model} is selected as a parameter of {@link org.photonvision.vision.pipe.impl.ObjectDetectionPipe ObjectDetectionPipe}
  4. + *
  5. {@link Model#load()} is called to create a ObjectDetector instance
  6. + *
  7. {@link ObjectDetector#detect(Mat, double, double)} is called to perform object detection
  8. + *
  9. {@link ObjectDetector#release()} is called to release resources
  10. + *
*/ public interface ObjectDetector extends Releasable { /** Returns the model that created this ObjectDetector. */