From af3ae03bafb810a031e76de5a7736b0de184d18d Mon Sep 17 00:00:00 2001 From: gillian Date: Mon, 23 Feb 2026 14:09:42 -0500 Subject: [PATCH] Moving annotate into CLI --- src/ria_toolkit_oss_cli/ria_toolkit_oss/annotate.py | 2 +- src/ria_toolkit_oss_cli/ria_toolkit_oss/commands.py | 4 ++-- src/ria_toolkit_oss_cli/ria_toolkit_oss/view.py | 7 ++++++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/annotate.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/annotate.py index 74e1370..1ae1e32 100644 --- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/annotate.py +++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/annotate.py @@ -14,7 +14,7 @@ from ria_toolkit_oss.annotations import ( from ria_toolkit_oss.data import Annotation from ria_toolkit_oss.data.recording import Recording from ria_toolkit_oss.io import load_recording, to_blue, to_npy, to_sigmf, to_wav -from ria_toolkit_oss_cli.common import format_frequency, format_sample_count +from ria_toolkit_oss_cli.ria_toolkit_oss.common import format_frequency, format_sample_count def normalize_sigmf_path(filepath): diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/commands.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/commands.py index 60ddba9..77cac92 100644 --- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/commands.py +++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/commands.py @@ -2,7 +2,7 @@ """ This module contains all the CLI bindings for the ria package. """ - +from .annotate import annotate from .capture import capture from .combine import combine from .convert import convert @@ -16,7 +16,7 @@ from .init import init from .split import split from .transform import transform from .transmit import transmit -from .view import view +from .view import viewe # Aliases synth = generate diff --git a/src/ria_toolkit_oss_cli/ria_toolkit_oss/view.py b/src/ria_toolkit_oss_cli/ria_toolkit_oss/view.py index 8e0b51f..9c67e80 100644 --- a/src/ria_toolkit_oss_cli/ria_toolkit_oss/view.py +++ b/src/ria_toolkit_oss_cli/ria_toolkit_oss/view.py @@ -7,7 +7,7 @@ from typing import Optional import click from ria_toolkit_oss.io.recording import from_npy, load_recording -from ria_toolkit_oss.view.view_signal import view_channels, view_sig +from ria_toolkit_oss.view.view_signal import view_annotations, view_channels, view_sig from ria_toolkit_oss.view.view_signal_simple import view_simple_sig from .common import echo_progress, echo_verbose, load_yaml_config @@ -33,6 +33,11 @@ VISUALIZATION_TYPES = { "dark", "spines", ], + }, + "annotations": { + "function": view_annotations, + "description": "Annotation-focused spectrogram view", + "options": ["channel", "dark"], }, "channels": {"function": view_channels, "description": "Multi-channel IQ and spectrogram view", "options": []}, }