Add full metadata fields popup (#60)

Author: timcogan

Cargo.toml

@@ -18,6 +18,7 @@ jpeg2000 = ["dicom-pixeldata/openjp2"]
 
 [dependencies]
 anyhow = "1.0"
+dicom-core = "0.8.2"
 dicom-object = "0.8.2"
 dicom-pixeldata = "0.8.2"
 eframe = "0.30"
@@ -27,7 +28,6 @@ rfd = "0.15"
 reqwest = { version = "0.12", default-features = false, features = ["blocking", "rustls-tls"] }
 
 [dev-dependencies]
-dicom-core = "0.8.2"
 dicom-encoding = "0.8.2"
 dicom-transfer-syntax-registry = "0.8.2"
 

DESIGN.md

@@ -19,6 +19,7 @@ Its primary purpose is consistency during development, not full architecture cov
 - `src/renderer.rs`: pixel buffer to `egui::ColorImage` rendering helpers.
 - `src/logging.rs`: logging setup and log-level configuration.
 - `src/app.rs`: UI, application state, interactions, and worker orchestration.
+- `src/app/metadata.rs`: metadata overlay, metadata popup, and active-object metadata presentation.
 - `src/app/overlay.rs`: overlay reconciliation, authoritative overlay snapshots, and overlay availability/navigation.
 - `src/app/load.rs`: launch/open/load orchestration and DICOMweb/local load pipelines.
 - `src/app/history.rs`: history management and preload/orchestration.
@@ -47,6 +48,7 @@ Its primary purpose is consistency during development, not full architecture cov
 19. If the user switches away from a streaming DICOMweb active group, remaining active-group work MUST continue staging into history and MUST NOT clear, replace, or visually mask the currently displayed study.
 20. Multi-frame images with per-frame `ImagePositionPatient` MUST expose frames in logical patient-position order; if the dominant per-frame patient-position progression increases across stored frames, display and cine MUST reverse with it, and GSPS/SR frame lookups MUST translate the displayed frame back to the referenced stored DICOM frame.
 21. DICOM content inside the viewer MUST use explicit `DicomSource` ownership; DICOMweb bytes MUST be represented as `DicomSource::Memory`, not temp files or a global backing store.
+22. Visible metadata field settings MUST apply only to the summary overlay; the full metadata popup MUST ignore that filter and show all extracted fields for the active object.
 
 ## Change Rules
 

README.md

@@ -35,7 +35,7 @@ Perspecta DICOM Viewer is an open-source Rust desktop DICOM viewer (`egui`/`efra
 - Structured Report (SR) DICOM support with a dedicated text/document view.
 - Mouse-wheel zoom + drag pan in single-image and multi-view (`1x2` / `1x3` / `2x2` / `2x4`) mammo views.
 - Typical DICOM mouse conventions (single modifier): `Shift + wheel` for frame navigation and `Shift + drag` for window/level in multi-view layouts.
-- Metadata side panel for quick inspection.
+- Metadata side panel for quick inspection, with a full-field popup for the active object (`V`).
 - Launch through a custom URL scheme (`perspecta://...`).
 - Launch directly from DICOMweb (study/series/instance aware).
 
@@ -151,6 +151,7 @@ This writes a desktop entry under `~/.local/share/applications`.
 - `C`: toggle cine mode
 - `G`: toggle image overlay (GSPS, Mammography CAD SR, or a matching Parametric Map, when available)
 - `N`: jump to the next image/frame with an overlay
+- `V`: open or close the full metadata field popup for the active object
 - `Tab`: next history item
 - `Shift+Tab`: previous history item
 - `Cmd/Ctrl+W`: close the active study/group; if the window is already empty, close the window

src/app.rs

@@ -3,6 +3,7 @@ use std::env;
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::mpsc::{self, Receiver, Sender, TryRecvError};
+use std::sync::Arc;
 use std::thread;
 use std::time::{Duration, Instant};
 
@@ -13,9 +14,9 @@ use eframe::egui::{
 use crate::dicom::{
     classify_dicom_path, load_dicom, load_gsps_overlays, load_mammography_cad_sr_overlays,
     load_parametric_map, load_parametric_map_overlays, load_structured_report,
-    read_sop_instance_uid, DicomImage, DicomPathKind, DicomSource, DicomSourceMeta, GspsGraphic,
-    GspsOverlay, GspsUnits, ParametricMapOverlay, SrOverlay, StructuredReportDocument,
-    StructuredReportNode, METADATA_FIELD_NAMES,
+    read_sop_instance_uid, DicomImage, DicomPathKind, DicomSource, DicomSourceMeta,
+    FullMetadataField, GspsGraphic, GspsOverlay, GspsUnits, ParametricMapOverlay, SrOverlay,
+    StructuredReportDocument, StructuredReportNode, METADATA_FIELD_NAMES,
 };
 use crate::dicomweb::{
     download_dicomweb_group_request, download_dicomweb_request, DicomWebDownloadResult,
@@ -27,6 +28,7 @@ use crate::renderer::{blend_rgba_overlay, render_rgb, render_window_level};
 
 mod history;
 mod load;
+mod metadata;
 mod overlay;
 
 #[cfg(test)]
@@ -42,6 +44,7 @@ use self::load::{PendingLoad, PendingSingleLoad, PreparedLoadPaths};
 
 const APP_TITLE: &str = "Perspecta Viewer";
 const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
+const TITLE_TEXT_SIZE: f32 = 14.0;
 const HISTORY_MAX_ENTRIES: usize = 24;
 const HISTORY_THUMB_MAX_DIM: usize = 96;
 const HISTORY_LIST_THUMB_MAX_DIM: f32 = 56.0;
@@ -100,6 +103,16 @@ struct ActiveViewportState {
     current_frame: usize,
 }
 
+enum FullMetadataLoadResult {
+    Loaded {
+        source: DicomSource,
+        metadata: Arc<[FullMetadataField]>,
+    },
+    Failed {
+        source: DicomSource,
+    },
+}
+
 pub struct DicomViewerApp {
     image: Option<DicomImage>,
     report: Option<StructuredReportDocument>,
@@ -109,6 +122,7 @@ pub struct DicomViewerApp {
     mammo_selected_index: usize,
     history_entries: Vec<HistoryEntry>,
     visible_metadata_fields: HashSet<String>,
+    full_metadata_popup_open: bool,
     settings_path: Option<PathBuf>,
     history_nonce: u64,
     pending_history_open_id: Option<String>,
@@ -122,6 +136,8 @@ pub struct DicomViewerApp {
     dicomweb_active_group_paths: Vec<DicomSourceMeta>,
     dicomweb_completed_background_groups: HashSet<usize>,
     dicomweb_active_pending_paths: VecDeque<DicomSource>,
+    full_metadata_receiver: Option<Receiver<FullMetadataLoadResult>>,
+    full_metadata_sender: Option<Sender<FullMetadataLoadResult>>,
     single_load_receiver: Option<Receiver<Result<PendingSingleLoad, String>>>,
     mammo_load_receiver: Option<Receiver<Result<PendingLoad, String>>>,
     mammo_load_sender: Option<Sender<Result<PendingLoad, String>>>,
@@ -158,6 +174,7 @@ impl Default for DicomViewerApp {
 impl DicomViewerApp {
     pub fn new(initial_request: Option<LaunchRequest>) -> Self {
         let settings_path = metadata_settings_file_path();
+        let (full_metadata_sender, full_metadata_receiver) = mpsc::channel();
         let visible_metadata_fields = settings_path
             .as_deref()
             .and_then(load_visible_metadata_fields)
@@ -172,6 +189,7 @@ impl DicomViewerApp {
             mammo_selected_index: 0,
             history_entries: Vec::new(),
             visible_metadata_fields,
+            full_metadata_popup_open: false,
             settings_path,
             history_nonce: 0,
             pending_history_open_id: None,
@@ -185,6 +203,8 @@ impl DicomViewerApp {
             dicomweb_active_group_paths: Vec::new(),
             dicomweb_completed_background_groups: HashSet::new(),
             dicomweb_active_pending_paths: VecDeque::new(),
+            full_metadata_receiver: Some(full_metadata_receiver),
+            full_metadata_sender: Some(full_metadata_sender),
             single_load_receiver: None,
             mammo_load_receiver: None,
             mammo_load_sender: None,
@@ -976,6 +996,15 @@ impl DicomViewerApp {
         }
     }
 
+    fn active_image_mut(&mut self) -> Option<&mut DicomImage> {
+        if self.image.is_some() {
+            self.image.as_mut()
+        } else {
+            self.selected_mammo_viewport_mut()
+                .map(|viewport| &mut viewport.image)
+        }
+    }
+
     fn active_metadata(&self) -> Option<&[(String, String)]> {
         if let Some(image) = self.active_image() {
             Some(image.metadata.as_slice())
@@ -1855,6 +1884,7 @@ impl eframe::App for DicomViewerApp {
         self.poll_dicomweb_active_paths(ctx);
         self.poll_dicomweb_download(ctx);
         self.poll_history_preload(ctx);
+        self.poll_full_metadata_load(ctx);
         self.poll_single_load(ctx);
         self.poll_mammo_group_load(ctx);
         if self.frame_wait_pending && !self.cine_mode {
@@ -1878,6 +1908,8 @@ impl eframe::App for DicomViewerApp {
         let mut c_pressed = false;
         let mut g_pressed = false;
         let mut n_pressed = false;
+        let mut v_pressed = false;
+        let mut escape_pressed = false;
         ctx.input_mut(|input| {
             if input.consume_key(
                 egui::Modifiers::COMMAND | egui::Modifiers::SHIFT,
@@ -1894,6 +1926,12 @@ impl eframe::App for DicomViewerApp {
             c_pressed = input.consume_key(egui::Modifiers::NONE, egui::Key::C);
             g_pressed = input.consume_key(egui::Modifiers::NONE, egui::Key::G);
             n_pressed = input.consume_key(egui::Modifiers::NONE, egui::Key::N);
+            if self.can_toggle_full_metadata_popup() {
+                v_pressed = input.consume_key(egui::Modifiers::NONE, egui::Key::V);
+            }
+            if self.full_metadata_popup_open {
+                escape_pressed = input.consume_key(egui::Modifiers::NONE, egui::Key::Escape);
+            }
         });
         if close_app_requested {
             ctx.send_viewport_cmd(ViewportCommand::Close);
@@ -1919,6 +1957,12 @@ impl eframe::App for DicomViewerApp {
         if n_pressed && !history_transition_pending {
             self.jump_to_next_overlay(ctx);
         }
+        if v_pressed {
+            self.toggle_full_metadata_popup();
+        }
+        if escape_pressed {
+            self.close_full_metadata_popup();
+        }
 
         let mut open_dicoms_clicked = false;
         let hovered_files = ctx.input(|input| input.raw.hovered_files.clone());
@@ -1994,7 +2038,7 @@ impl eframe::App for DicomViewerApp {
                         window_centered_title_pos,
                         egui::Align2::CENTER_CENTER,
                         &title_text,
-                        egui::FontId::proportional(14.0),
+                        egui::FontId::proportional(TITLE_TEXT_SIZE),
                         ui.visuals().text_color(),
                     );
 
@@ -2592,35 +2636,7 @@ impl eframe::App for DicomViewerApp {
             }
         });
 
-        if let Some(metadata) = self.active_metadata() {
-            let overlay_height = (ctx.screen_rect().height() * 0.62).max(180.0);
-            egui::Area::new(egui::Id::new("metadata-overlay-left"))
-                .order(egui::Order::Foreground)
-                .anchor(egui::Align2::LEFT_TOP, egui::vec2(10.0, 36.0))
-                .show(ctx, |ui| {
-                    ui.set_min_width(300.0);
-                    ui.set_max_width(300.0);
-                    ui.set_max_height(overlay_height);
-                    egui::ScrollArea::vertical()
-                        .id_salt("metadata-overlay-scroll")
-                        .show(ui, |ui| {
-                            let mut shown_count = 0usize;
-                            for (key, value) in metadata {
-                                if !self.visible_metadata_fields.contains(key.as_str()) {
-                                    continue;
-                                }
-                                shown_count = shown_count.saturating_add(1);
-                                ui.horizontal_wrapped(|ui| {
-                                    ui.monospace(key);
-                                    ui.label(value);
-                                });
-                            }
-                            if shown_count == 0 {
-                                ui.label("No metadata fields selected.");
-                            }
-                        });
-                });
-        }
+        self.show_metadata_ui(ctx);
 
         if has_history {
             let overlay_height = (ctx.screen_rect().height() * 0.62).max(160.0);
@@ -5854,7 +5870,7 @@ mod tests {
         let (tx, rx) = mpsc::channel::<Result<PendingSingleLoad, String>>();
         tx.send(Ok(PendingSingleLoad::StructuredReport {
             path: test_source("report.dcm"),
-            report: StructuredReportDocument::test_stub(),
+            report: Box::new(StructuredReportDocument::test_stub()),
         }))
         .expect("report should send");
 

src/app/load.rs

@@ -31,7 +31,7 @@ pub(super) enum PendingSingleLoad {
     Image(Box<PendingLoad>),
     StructuredReport {
         path: DicomSource,
-        report: StructuredReportDocument,
+        report: Box<StructuredReportDocument>,
     },
 }
 
@@ -837,7 +837,7 @@ impl DicomViewerApp {
                         self.clear_load_error();
                     }
                     Ok(PendingSingleLoad::StructuredReport { path, report }) => {
-                        self.apply_loaded_structured_report(path, report, ctx);
+                        self.apply_loaded_structured_report(path, *report, ctx);
                         self.clear_load_error();
                     }
                     Err(err) => {
@@ -1113,7 +1113,10 @@ impl DicomViewerApp {
         let (tx, rx) = mpsc::channel::<Result<PendingSingleLoad, String>>();
         thread::spawn(move || {
             let result = match load_structured_report(&path) {
-                Ok(report) => Ok(PendingSingleLoad::StructuredReport { path, report }),
+                Ok(report) => Ok(PendingSingleLoad::StructuredReport {
+                    path,
+                    report: Box::new(report),
+                }),
                 Err(err) => Err(format!("Error opening selected Structured Report: {err:#}")),
             };
             let _ = tx.send(result);