Skip to content

Commit fcbf3b1

Browse files
LukeReinkac-freemanCopilot
authored
UI help messages (#130)
* Update ui.rs Add parameter descriptions * Update adder-viz/src/transcoder/ui.rs Co-authored-by: Copilot <[email protected]> * Some updates * Cleanup * Cleanup * Begin ui cleanup * Use new label function with help cursor * Add more hover hints * Add more hover hints * Feature gate --------- Co-authored-by: Andrew C. Freeman <[email protected]> Co-authored-by: Copilot <[email protected]>
1 parent 859ba46 commit fcbf3b1

File tree

9 files changed

+205
-602
lines changed

9 files changed

+205
-602
lines changed

.idea/runConfigurations/Clippy.xml renamed to .idea/runConfigurations/Clippy_fix_allow_dirty.xml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

adder-codec-core/src/codec/compressed/source_model/event_structure/event_adu.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ impl EventAdu {
5454
dt_ref: DeltaT,
5555
num_intervals: usize,
5656
) -> Self {
57-
let blocks_y = (plane.h_usize() + BLOCK_SIZE - 1) / BLOCK_SIZE;
58-
let blocks_x = (plane.w_usize() + BLOCK_SIZE - 1) / BLOCK_SIZE;
57+
let blocks_y = plane.h_usize().div_ceil(BLOCK_SIZE);
58+
let blocks_x = plane.w_usize().div_ceil(BLOCK_SIZE);
5959

6060
Self {
6161
event_cubes: Array2::from_shape_fn((blocks_y, blocks_x), |(y, x)| {

adder-codec-core/src/codec/compressed/source_model/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use crate::codec::compressed::source_model::cabac_contexts::Contexts;
33
use crate::codec::CodecError;
44
use crate::{AbsoluteT, Event};
55
use arithmetic_coding_adder_dep::{Decoder, Encoder};
6-
use bitstream_io::{BitWriter, BitWrite, BigEndian, BitReader};
6+
use bitstream_io::{BitWriter, BigEndian, BitReader};
77
use std::io::Cursor;
88

99
pub trait HandleEvent {

adder-codec-rs/src/transcoder/source/video.rs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
#[cfg(feature = "open-cv")]
2-
use opencv::core::{Mat, Size};
3-
#[cfg(feature = "opencv")]
4-
use opencv::prelude::*;
2+
use {
3+
opencv::core::{Mat, Size},
4+
opencv::prelude::*,
5+
davis_edi_rs::util::reconstructor::ReconstructionError,
6+
opencv::{highgui, imgproc::resize},
7+
};
8+
9+
510
use std::cmp::min;
611
use std::collections::HashSet;
712
#[cfg(feature = "feature-logging")]
@@ -27,10 +32,8 @@ use std::time::Instant;
2732
use crate::framer::scale_intensity::{FrameValue, SaeTime};
2833
use crate::transcoder::event_pixel_tree::{Intensity32, PixelArena};
2934
use adder_codec_core::D;
30-
#[cfg(feature = "opencv")]
31-
use davis_edi_rs::util::reconstructor::ReconstructionError;
32-
#[cfg(feature = "opencv")]
33-
use opencv::{highgui, imgproc::resize};
35+
36+
3437

3538
#[cfg(feature = "compression")]
3639
use adder_codec_core::codec::compressed::stream::CompressedOutput;

adder-codec-rs/src/utils/cv.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
use crate::transcoder::source::video::SourceError;
22
#[cfg(feature = "open-cv")]
3-
use adder_codec_core::PixelAddress;
3+
use {
4+
adder_codec_core::PixelAddress,
5+
opencv::prelude::KeyPointTraitConst,
6+
std::collections::HashSet,
7+
};
48
use adder_codec_core::{Coord, PlaneSize};
59
use const_for::const_for;
610
use ndarray::{Array3, ArrayView, Axis, Ix2};
7-
#[cfg(feature = "open-cv")]
8-
use opencv::prelude::KeyPointTraitConst;
11+
12+
913
use serde::{Deserialize, Serialize};
10-
#[cfg(feature = "open-cv")]
11-
use std::collections::HashSet;
14+
15+
1216

1317
use std::error::Error;
1418
use video_rs_adder_dep::Frame;

adder-codec-rs/src/utils/viz.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
12
use adder_codec_core::{Event, PixelAddress};
23
#[cfg(feature = "open-cv")]
3-
use opencv::core::{Mat, MatTraitConst, MatTraitConstManual};
4+
use {opencv::core::{Mat, MatTraitConst, MatTraitConstManual}, std::io::BufWriter, std::io::Write, std::error::Error};
45
use std::fs::File;
56
use std::io;
6-
#[cfg(feature = "open-cv")]
7-
use std::io::BufWriter;
7+
88
use std::io::Cursor;
99
use std::path::Path;
1010
use std::process::{Command, Output};

adder-viz/src/transcoder/adder.rs

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
use std::error::Error;
22

3-
#[cfg(feature = "open-cv")]
4-
use adder_codec_rs::transcoder::source::davis::Davis;
53
use adder_codec_rs::transcoder::source::framed::Framed;
64
use eframe::epaint::ColorImage;
75
use std::fs::File;
86
use std::io::BufWriter;
97
use std::time::Instant;
108

119
#[cfg(feature = "open-cv")]
12-
use adder_codec_rs::transcoder::source::davis::TranscoderMode;
10+
use {
11+
adder_codec_rs::transcoder::source::davis::TranscoderMode,
12+
adder_codec_rs::davis_edi_rs::util::reconstructor::Reconstructor,
13+
adder_codec_rs::transcoder::source::davis::Davis,
14+
adder_codec_rs::davis_edi_rs::util::reconstructor::ReconstructorError,
15+
opencv::Result,
16+
std::ffi::OsString,
17+
adder_codec_rs::adder_codec_core::SourceCamera::DavisU8,
18+
};
1319

14-
#[cfg(feature = "open-cv")]
15-
use adder_codec_rs::davis_edi_rs::util::reconstructor::Reconstructor;
1620

1721
use crate::transcoder::adder::AdderTranscoderError::{
1822
InvalidFileType, NoFileSelected, Uninitialized,
@@ -22,16 +26,12 @@ use crate::transcoder::EventRateMsg;
2226
use crate::utils::prep_epaint_image;
2327
use adder_codec_rs::adder_codec_core::codec::rate_controller::DEFAULT_CRF_QUALITY;
2428
use adder_codec_rs::adder_codec_core::Event;
25-
use adder_codec_rs::adder_codec_core::SourceCamera::{Dvs, FramedU8};
26-
#[cfg(feature = "open-cv")]
27-
use adder_codec_rs::davis_edi_rs::util::reconstructor::ReconstructorError;
29+
use adder_codec_rs::adder_codec_core::SourceCamera::{ Dvs, FramedU8};
2830
use adder_codec_rs::transcoder::source::prophesee::Prophesee;
2931
use adder_codec_rs::transcoder::source::video::SourceError::{NoData, VideoError};
3032
use adder_codec_rs::transcoder::source::video::{Source, SourceError, VideoBuilder};
3133
use adder_codec_rs::transcoder::source::AdderSource;
3234
use adder_codec_rs::utils::cv::{calculate_quality_metrics, QualityMetrics};
33-
#[cfg(feature = "open-cv")]
34-
use opencv::Result;
3535
use thiserror::Error;
3636
use tokio::sync::mpsc;
3737
use tokio::sync::mpsc::error::TrySendError;
@@ -172,6 +172,8 @@ impl AdderTranscoder {
172172
AdderTranscoderError::IoError(_) => {}
173173
AdderTranscoderError::OtherError(_) => {}
174174
Uninitialized => {}
175+
#[cfg(feature = "open-cv")]
176+
AdderTranscoderError::ReconstructorError(_) => {}
175177
}
176178

177179
if let Err(TrySendError::Full(..)) = self

0 commit comments

Comments
 (0)