Skip to content

Commit

Permalink
prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
Alextopher committed Sep 19, 2024
1 parent 3f1b010 commit 47a54a9
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
});
</script>

Expand Down
2 changes: 1 addition & 1 deletion photon-client/src/types/PipelineTypes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ export const DefaultObjectDetectionPipelineSettings: ObjectDetectionPipelineSett
confidence: 0.9,
nms: 0.45,
box_thresh: 0.25,
model: "",
model: ""
};

export type ActivePipelineSettings =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,6 @@ public Optional<Model> getModel(String modelName) {

/**
* The default model when no model is specified.
*
* @param model
*/
public Optional<Model> getDefaultModel() {
if (models == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
* <ol>
* <li> {@link Model}s are discovered by {@link NeuralNetworkModelManager} </li>
* <li> {@link Model} is selected as a parameter of {@link org.photonvision.vision.pipe.impl.ObjectDetectionPipe ObjectDetectionPipe} </li>
* <li> {@link Model#load()} is called to create a ObjectDetector instance </li>
* <li> {@link ObjectDetector#detect(Mat, double, double)} is called to perform object detection </li>
* <li> {@link ObjectDetector#release()} is called to release resources </li>
* </ol>
*/
public interface ObjectDetector extends Releasable {
/** Returns the model that created this ObjectDetector. */
Expand Down

0 comments on commit 47a54a9

Please sign in to comment.