Skip to content

Commit c088a37

Browse files
committed
Add view properties to choose group by (entity or time) and sort order (asc vs desc)
1 parent 1a3e035 commit c088a37

File tree

34 files changed

+1374
-37
lines changed

34 files changed

+1374
-37
lines changed

Cargo.lock

+3
Original file line numberDiff line numberDiff line change
@@ -4904,10 +4904,13 @@ dependencies = [
49044904
"re_entity_db",
49054905
"re_log_types",
49064906
"re_renderer",
4907+
"re_space_view",
49074908
"re_tracing",
4909+
"re_types",
49084910
"re_types_core",
49094911
"re_ui",
49104912
"re_viewer_context",
4913+
"re_viewport_blueprint",
49114914
]
49124915

49134916
[[package]]

crates/store/re_types/definitions/rerun/blueprint.fbs

+3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ include "./blueprint/components/panel_state.fbs";
1717
include "./blueprint/components/query_expression.fbs";
1818
include "./blueprint/components/root_container.fbs";
1919
include "./blueprint/components/row_share.fbs";
20+
include "./blueprint/components/sort_order.fbs";
2021
include "./blueprint/components/space_view_class.fbs";
2122
include "./blueprint/components/space_view_maximized.fbs";
2223
include "./blueprint/components/space_view_origin.fbs";
24+
include "./blueprint/components/table_group_by.fbs";
2325
include "./blueprint/components/tensor_dimension_index_slider.fbs";
2426
include "./blueprint/components/view_fit.fbs";
2527
include "./blueprint/components/viewer_recommendation_hash.fbs";
@@ -41,6 +43,7 @@ include "./blueprint/archetypes/visible_time_ranges.fbs";
4143
include "./blueprint/archetypes/visual_bounds2d.fbs";
4244

4345
include "./blueprint/archetypes/plot_legend.fbs";
46+
include "./blueprint/archetypes/range_table_settings.fbs";
4447
include "./blueprint/archetypes/scalar_axis.fbs";
4548

4649
include "./blueprint/views/bar_chart.fbs";
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
include "arrow/attributes.fbs";
2+
include "python/attributes.fbs";
3+
include "rust/attributes.fbs";
4+
5+
include "rerun/attributes.fbs";
6+
7+
namespace rerun.blueprint.archetypes;
8+
9+
10+
/// Configuration for the sorting of the rows of a time range table.
11+
table TableRowOrder (
12+
"attr.rerun.scope": "blueprint",
13+
"attr.rust.derive": "Copy",
14+
"attr.rust.generate_field_info"
15+
) {
16+
// --- Optional ---
17+
18+
/// The type of the background.
19+
group_by: rerun.blueprint.components.TableGroupBy ("attr.rerun.component_optional", nullable, order: 1000);
20+
21+
/// Color used for the `SolidColor` background type.
22+
sort_order: rerun.blueprint.components.SortOrder ("attr.rerun.component_optional", nullable, order: 2000);
23+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
include "arrow/attributes.fbs";
2+
include "python/attributes.fbs";
3+
include "rust/attributes.fbs";
4+
5+
include "rerun/datatypes.fbs";
6+
include "rerun/attributes.fbs";
7+
8+
namespace rerun.blueprint.components;
9+
10+
11+
/// Sort order for data table.
12+
enum SortOrder: byte (
13+
"attr.rerun.scope": "blueprint"
14+
) {
15+
/// Ascending
16+
Ascending (default),
17+
18+
/// Descending
19+
Descending,
20+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
include "arrow/attributes.fbs";
2+
include "python/attributes.fbs";
3+
include "rust/attributes.fbs";
4+
5+
include "rerun/datatypes.fbs";
6+
include "rerun/attributes.fbs";
7+
8+
namespace rerun.blueprint.components;
9+
10+
11+
/// Primary element by which to group by in a temporal data table.
12+
enum TableGroupBy: byte (
13+
"attr.rerun.scope": "blueprint"
14+
) {
15+
/// Group by entity.
16+
Entity (default),
17+
18+
/// Group by instance.
19+
Time,
20+
}

crates/store/re_types/src/blueprint/archetypes/.gitattributes

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/blueprint/archetypes/mod.rs

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/blueprint/archetypes/table_row_order.rs

+201
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/blueprint/components/.gitattributes

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/store/re_types/src/blueprint/components/mod.rs

+4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)