Skip to content

Commit b2f8439

Browse files
lucasmerlinemilkgrtlr
authored
Add arrow DisplayOptions and make limits configurable (#11139)
Co-authored-by: Emil Ernerfeldt <[email protected]> Co-authored-by: Jochen Görtler <[email protected]>
1 parent 5b273ad commit b2f8439

23 files changed

+336
-105
lines changed

Cargo.lock

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7219,6 +7219,7 @@ dependencies = [
72197219
"arrow",
72207220
"egui",
72217221
"egui_kittest",
7222+
"insta",
72227223
"re_arrow_util",
72237224
"re_format",
72247225
"re_tracing",

crates/viewer/re_arrow_ui/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,7 @@ arrow.workspace = true
2525
egui.workspace = true
2626

2727
[dev-dependencies]
28-
egui_kittest.workspace = true
2928
re_types.workspace = true
29+
30+
egui_kittest.workspace = true
31+
insta.workspace = true

crates/viewer/re_arrow_ui/src/arrow_ui.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
use arrow::{array::Array, error::ArrowError, util::display::FormatOptions};
1+
use arrow::{array::Array, error::ArrowError};
22
use re_ui::list_item::list_item_scope;
33
use re_ui::{UiExt as _, UiLayout};
44

55
use crate::datatype_ui::DataTypeUi;
6-
use crate::show_index::ArrayUi;
6+
use crate::show_index::{ArrayUi, DisplayOptions};
77

88
pub fn arrow_ui(ui: &mut egui::Ui, ui_layout: UiLayout, array: &dyn Array) {
99
re_tracing::profile_function!();
@@ -51,9 +51,6 @@ pub fn arrow_ui(ui: &mut egui::Ui, ui_layout: UiLayout, array: &dyn Array) {
5151
}
5252

5353
pub(crate) fn make_ui(array: &dyn Array) -> Result<ArrayUi<'_>, ArrowError> {
54-
let options = FormatOptions::default()
55-
.with_null("null")
56-
.with_display_error(true);
57-
let array_ui = ArrayUi::try_new(array, &options)?;
54+
let array_ui = ArrayUi::try_new(array, &DisplayOptions::default())?;
5855
Ok(array_ui)
5956
}

crates/viewer/re_arrow_ui/src/lib.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@ mod list_item_ranges;
66
mod show_index;
77

88
pub use arrow_ui::arrow_ui;
9+
10+
pub fn arrow_syntax_highlighted(
11+
data: &dyn arrow::array::Array,
12+
) -> Result<re_ui::syntax_highlighting::SyntaxHighlightedBuilder, arrow::error::ArrowError> {
13+
show_index::ArrayUi::try_new(data, &show_index::DisplayOptions::default())?.highlighted()
14+
}

0 commit comments

Comments
 (0)