diff --git a/crates/midra-layout/src/device_ui.rs b/crates/midra-layout/src/device_ui.rs index 228d820..2f8816f 100644 --- a/crates/midra-layout/src/device_ui.rs +++ b/crates/midra-layout/src/device_ui.rs @@ -13,6 +13,8 @@ enum Destination { #[derive(Default)] pub(super) struct DeviceUi { pub open: bool, + pub(super) prepare_send: bool, + send_targets: std::collections::BTreeMap, host: String, pending: Option>>, snapshot: Option, @@ -29,6 +31,7 @@ impl DeviceUi { self.pending = Some(rx); self.snapshot = None; self.destinations.clear(); + self.send_targets.clear(); self.error.clear(); let host = self.host.clone(); let ctx = ctx.clone(); @@ -71,8 +74,12 @@ impl Editor { let mut imported = false; egui::Window::new("Midra connection · Preview") .open(&mut open).default_width(660.0).collapsible(false) + .max_height((ctx.screen_rect().height() - 100.0).max(200.0)).vscroll(true) .show(ctx, |ui| { - ui.label("Read a snapshot from your Eikos, then review layer mapping before importing."); + ui.horizontal(|ui| { + ui.selectable_value(&mut self.device.prepare_send, false, "Import from Midra"); + ui.selectable_value(&mut self.device.prepare_send, true, "Prepare selected layers for Preview"); + }); ui.horizontal(|ui| { ui.label("Device IP"); if ui.add_enabled(self.device.pending.is_none(), egui::TextEdit::singleline(&mut self.device.host).hint_text("192.168.…")).changed() { @@ -96,10 +103,14 @@ impl Editor { for (i, screen) in snapshot.screens.iter().enumerate() { ui.selectable_value(&mut self.device.screen, i, format!("Screen {} · {} × {}", screen.id, screen.resolution[0], screen.resolution[1])); } }); let screen = &snapshot.screens[self.device.screen]; - if previous != self.device.screen { self.device.destinations = vec![Destination::Skip; screen.layers.len()]; } + if previous != self.device.screen { self.device.destinations = vec![Destination::Skip; screen.layers.len()]; self.device.send_targets.clear(); } ui.label(format!("Captured Preview bank: {}. Refresh to read subsequent changes.", screen.preview_bank)); let matches = screen.resolution == self.layout.formats().output; if !matches { ui.colored_label(ui.visuals().warn_fg_color, format!("Device canvas {} × {}; editor {} × {}. Match output resolution before importing.", screen.resolution[0], screen.resolution[1], self.layout.formats().output[0], self.layout.formats().output[1])); } + if self.device.prepare_send { + send_review(ui, &self.layout, screen, &mut self.device.send_targets); + return; + } egui::ScrollArea::vertical().max_height(300.0).show(ui, |ui| { for (i, layer) in screen.layers.iter().enumerate() { ui.horizontal(|ui| { @@ -159,10 +170,128 @@ impl Editor { } } +/// Local review only: no writable transport is available until logical Preview +/// addressing and the two crop conversions have been verified on the device. +fn send_review( + ui: &mut egui::Ui, + layout: &midra_layout::Layout, + screen: &device::Screen, + targets: &mut std::collections::BTreeMap, +) { + let selected = layout.selected_indices(); + targets.retain(|id, _| selected.iter().any(|&i| layout.layer_info(i).id == *id)); + ui.strong(format!( + "{} selected editor layers → Screen {} · Preview", + selected.len(), + screen.id + )); + if selected.is_empty() { + ui.label("Select editor layers to prepare their destination mapping."); + } + let mut used = std::collections::BTreeSet::new(); + for i in selected { + let id = layout.layer_info(i).id; + let target = targets.entry(id).or_default(); + ui.separator(); + ui.horizontal(|ui| { + ui.strong(layout.layer_label(i)); + egui::ComboBox::from_id_salt(("midra_send_target", id)) + .selected_text(if target.is_empty() { + "Choose Midra layer".into() + } else { + format!("Midra layer {target}") + }) + .show_ui(ui, |ui| { + ui.selectable_value(target, String::new(), "Choose Midra layer"); + for layer in &screen.layers { + ui.selectable_value( + target, + layer.id.clone(), + format!("Layer {} · {}", layer.id, layer.source), + ); + } + }); + }); + if let Some(layer) = screen.layers.iter().find(|layer| layer.id == *target) { + if !used.insert(target.clone()) { + ui.colored_label( + ui.visuals().error_fg_color, + "Each editor layer needs a different Midra destination.", + ); + } + ui.label(format!( + "Snapshot container: {}", + container_label(layer.geometry) + )); + if let Some(reason) = &layer.unsupported { + ui.weak(reason); + } + } + ui.label(format!( + "Requested visible box: {}", + container_label(layout.layers()[i]) + )); + if let Ok(mapping) = layout.formats().mapping(i, layout.layers()[i]) { + ui.label(format!( + "Content zoom: {:.1}% · offset: {:.1}, {:.1}", + mapping.framing.zoom * 100.0, + mapping.framing.offset[0], + mapping.framing.offset[1] + )); + } + } + ui.separator(); + ui.colored_label(ui.visuals().warn_fg_color, + "Sending unavailable: geometry writes address physical banks. A TAKE can turn the target into Program while sending. Preview-safe addressing must be verified first."); + ui.weak("These are requested layout values, not device commands. Crop/zoom conversion is also pending. Source routing and shared input/output settings are excluded."); + ui.add_enabled(false, egui::Button::new("Send selected layers to Preview")); +} + +fn container_label(geometry: midra_layout::Geometry) -> String { + let center = geometry.center(); + format!( + "{:.1} × {:.1} px · center {:.1}, {:.1}", + geometry.width, geometry.height, center[0], center[1] + ) +} + #[cfg(test)] mod tests { use super::*; #[test] + fn send_review_only_maps_selected_layers_and_never_mutates_layout() { + let ctx = egui::Context::default(); + let mut layout = midra_layout::Layout::default(); + layout.select(Some(1)); + let before = layout.layers().clone(); + let selected_id = layout.layer_info(1).id; + let mut targets = std::collections::BTreeMap::from([ + (layout.layer_info(0).id, "1".into()), + (selected_id, "2".into()), + ]); + let screen = device::Screen { + id: "1".into(), + resolution: [1920, 1080], + preview_bank: "UP".into(), + layers: vec![], + }; + let _ = ctx.run(egui::RawInput::default(), |ctx| { + egui::CentralPanel::default() + .show(ctx, |ui| send_review(ui, &layout, &screen, &mut targets)); + }); + assert_eq!( + targets, + std::collections::BTreeMap::from([(selected_id, "2".into())]) + ); + assert_eq!(*layout.layers(), before); + layout.select(None); + let _ = ctx.run(egui::RawInput::default(), |ctx| { + egui::CentralPanel::default() + .show(ctx, |ui| send_review(ui, &layout, &screen, &mut targets)); + }); + assert!(targets.is_empty()); + } + #[test] fn successful_read_sets_online_and_failure_clears_it() { let mut state = DeviceUi::default(); assert!(!state.online()); diff --git a/crates/midra-layout/src/menu_ui.rs b/crates/midra-layout/src/menu_ui.rs index 55b527b..703ad7a 100644 --- a/crates/midra-layout/src/menu_ui.rs +++ b/crates/midra-layout/src/menu_ui.rs @@ -4,6 +4,7 @@ impl Editor { pub(super) fn import_menu(&mut self, ui: &mut egui::Ui) { ui.set_min_width(225.0); if ui.button("Midra Preview…").clicked() { + self.device.prepare_send = false; self.device.open = true; ui.close_menu(); } diff --git a/crates/midra-layout/src/project_ui.rs b/crates/midra-layout/src/project_ui.rs index 71537ac..d01ca55 100644 --- a/crates/midra-layout/src/project_ui.rs +++ b/crates/midra-layout/src/project_ui.rs @@ -116,6 +116,15 @@ impl Editor { } ui.small("Saves applied values and the reference image."); ui.separator(); + if ui.add_enabled(self.device.online() && !self.layout.selected_indices().is_empty(), + egui::Button::new("Prepare selected layers for Midra…")) + .on_hover_text("Review Preview destinations and requested values. Device sending is not yet available.") + .on_disabled_hover_text("Read the Midra connection and select editor layers first.") + .clicked() { + self.device.prepare_send = true; + self.device.open = true; + ui.close_menu(); + } ui.menu_button("Export SVG", |ui| { ui.menu_button("Specific layer…", |ui| { egui::ScrollArea::vertical() diff --git a/docs/midra-layout-device-check.md b/docs/midra-layout-device-check.md index f75830d..0885978 100644 --- a/docs/midra-layout-device-check.md +++ b/docs/midra-layout-device-check.md @@ -106,3 +106,27 @@ sanitize before sharing. Its exchange contract is documented in Do not expose this diagnostic write technique as a generally safe send button. - Never write shared input/output configuration to implement a Preview-only edit. No Program or TAKE operation belongs in this layout tool's Preview adapter. + +## Selected-layer send preparation + +After a successful read, **Project → Prepare selected layers for Midra…** opens +an outbound review in the connection window. The **Prepare selected layers for +Preview** tab is also accessible there. Each selected local layer has an explicit +Midra destination, snapshot container values, requested visible bounds and local +zoom/offset. Duplicate targets are flagged; mappings are transient and reset when +refreshing or changing screens. No file interface changes are involved. + +**Actual sending remains unavailable.** The review is preparation, not a device +payload: container geometry and visible bounds are not interchangeable when +cropping is involved. Both crop export strategies still require verification. + +The manufacturer's [REST API guide v3.0.13](https://s3.eu-west-3.amazonaws.com/aw.store01/Site+Internet/Series/Midra+4k/Common/Rest+API+Programmer%27s+Guide/midra4k_rest_api_programmers_guide_v3_0_13.pdf) +was retrieved and inspected on 2026-11-13. Sections 3.5–3.6 document logical +Preview layer status/source operations, but the guide does not document layer +position/size writes. This does not establish a Preview-safe geometry endpoint. +The tested WebRCS geometry path addresses physical UP/DOWN banks, and a read +followed by a write cannot prevent a concurrent TAKE from making that bank Program. +No device writes were performed while adding the outbound review. Enabling the +send button requires verified logical Preview addressing or an atomic device-side +guard, in addition to conversion/readback tests. A client-side warning or a bank +check immediately before writing does not fulfill the user's never-Program rule. diff --git a/docs/midra-layout-plan.md b/docs/midra-layout-plan.md index 08c64ef..c3b953e 100644 --- a/docs/midra-layout-plan.md +++ b/docs/midra-layout-plan.md @@ -526,6 +526,11 @@ container verification, crop quantization and hardware integration remain deferr ## Current external/verification gates +Selected-layer outbound preparation is implemented in the connection window: +explicit per-layer destinations, snapshot/requested geometry, zoom/offset and +duplicate warnings. It performs no writes. The REST v3.0.13 guide was inspected; +logical Preview source assignment exists, but geometry writes are not documented. + - Preview geometry writes remain disabled: physical UP/DOWN bank writes race with a TAKE from another controller. A verified logical Preview or atomic guarded API is needed before offering sends that satisfy “never modify Program”. diff --git a/docs/midra-layout.md b/docs/midra-layout.md index 4579a07..676495b 100644 --- a/docs/midra-layout.md +++ b/docs/midra-layout.md @@ -518,8 +518,11 @@ and reviewed container import. Each device layer has its own destination selecto (existing layer, new layer, or skip), independent of the editor selection. Import applies directly from the Midra window as one undoable edit. The footer shows ONLINE after a successful read; there is no automatic connection polling. -Full device crop mapping and safe Preview writes -are pending; this adapter exposes no write endpoints. +**Project → Prepare selected layers for Midra…** opens a per-selected-layer +Preview destination review after connecting. It shows snapshot container values +and requested local geometry/zoom. Sending remains explicitly unavailable until +Preview-safe geometry addressing and crop conversion are verified; the review +never sends commands. This adapter exposes no write endpoints. ## Layer management