Skip to content

Commit

Permalink
Remove unused scalar scattering component (#6471)
Browse files Browse the repository at this point in the history
### What

A left over from how we used to time series previously. This
functionality is covered by two separate archetypes by now.

### Checklist
* [x] I have read and agree to [Contributor
Guide](https://github.com/rerun-io/rerun/blob/main/CONTRIBUTING.md) and
the [Code of
Conduct](https://github.com/rerun-io/rerun/blob/main/CODE_OF_CONDUCT.md)
* [x] I've included a screenshot or gif (if applicable)
* [x] I have tested the web demo (if applicable):
* Using examples from latest `main` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/6471?manifest_url=https://app.rerun.io/version/main/examples_manifest.json)
* Using full set of examples from `nightly` build:
[rerun.io/viewer](https://rerun.io/viewer/pr/6471?manifest_url=https://app.rerun.io/version/nightly/examples_manifest.json)
* [x] The PR title and labels are set such as to maximize their
usefulness for the next release's CHANGELOG
* [x] If applicable, add a new check to the [release
checklist](https://github.com/rerun-io/rerun/blob/main/tests/python/release_checklist)!

- [PR Build Summary](https://build.rerun.io/pr/6471)
- [Recent benchmark results](https://build.rerun.io/graphs/crates.html)
- [Wasm size tracking](https://build.rerun.io/graphs/sizes.html)

To run all checks from `main`, comment on the PR with `@rerun-bot
full-check`.
  • Loading branch information
Wumpf authored May 31, 2024
1 parent 707b037 commit 3fd7a32
Show file tree
Hide file tree
Showing 17 changed files with 1 addition and 262 deletions.
20 changes: 1 addition & 19 deletions crates/re_edit_ui/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ mod visible;
// ----

use egui::NumExt as _;
use re_types::components::{Color, MarkerSize, Name, Radius, ScalarScattering, StrokeWidth, Text};
use re_types::components::{Color, MarkerSize, Name, Radius, StrokeWidth, Text};
use re_viewer_context::ViewerContext;

// ----
Expand Down Expand Up @@ -43,23 +43,6 @@ fn edit_name_ui(_ctx: &ViewerContext<'_>, ui: &mut egui::Ui, value: &mut Name) -
response
}

fn edit_scatter_ui(
_ctx: &ViewerContext<'_>,
ui: &mut egui::Ui,
value: &mut ScalarScattering,
) -> egui::Response {
let scattered_text = if value.0 { "Scattered" } else { "Line" };

let outer_response = egui::ComboBox::from_id_source("scatter")
.selected_text(scattered_text)
.show_ui(ui, |ui| {
ui.selectable_value(&mut value.0, false, "Line")
| ui.selectable_value(&mut value.0, true, "Scattered")
});

outer_response.inner.unwrap_or(outer_response.response)
}

fn edit_radius_ui(
_ctx: &ViewerContext<'_>,
ui: &mut egui::Ui,
Expand Down Expand Up @@ -113,7 +96,6 @@ pub fn register_editors(registry: &mut re_viewer_context::ComponentUiRegistry) {
registry.add_editor(edit_marker_size_ui);
registry.add_editor(edit_name_ui);
registry.add_editor(edit_radius_ui);
registry.add_editor(edit_scatter_ui);
registry.add_editor(edit_stroke_width_ui);
registry.add_editor(edit_text_ui);
registry.add_editor(visible::edit_visible);
Expand Down
1 change: 0 additions & 1 deletion crates/re_types/definitions/rerun/components.fbs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ include "./components/range1d.fbs";
include "./components/resolution.fbs";
include "./components/rotation3d.fbs";
include "./components/scalar.fbs";
include "./components/scalar_scattering.fbs";
include "./components/stroke_width.fbs";
include "./components/tensor_data.fbs";
include "./components/texcoord2d.fbs";
Expand Down
19 changes: 0 additions & 19 deletions crates/re_types/definitions/rerun/components/scalar_scattering.fbs

This file was deleted.

1 change: 0 additions & 1 deletion crates/re_types/src/components/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions crates/re_types/src/components/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions crates/re_viewer/src/component_defaults/mod.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/content/reference/types/components.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion docs/content/reference/types/components/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 0 additions & 17 deletions docs/content/reference/types/components/scalar_scattering.md

This file was deleted.

1 change: 0 additions & 1 deletion rerun_cpp/src/rerun/components.hpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions rerun_cpp/src/rerun/components/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 0 additions & 60 deletions rerun_cpp/src/rerun/components/scalar_scattering.cpp

This file was deleted.

57 changes: 0 additions & 57 deletions rerun_cpp/src/rerun/components/scalar_scattering.hpp

This file was deleted.

1 change: 0 additions & 1 deletion rerun_py/rerun_sdk/rerun/components/.gitattributes

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions rerun_py/rerun_sdk/rerun/components/__init__.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

63 changes: 0 additions & 63 deletions rerun_py/rerun_sdk/rerun/components/scalar_scattering.py

This file was deleted.

1 change: 0 additions & 1 deletion tests/python/release_checklist/check_all_components_ui.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ def alternatives(self) -> list[Any] | None:
]
),
"ScalarBatch": TestCase(3),
"ScalarScatteringBatch": TestCase(True),
"StrokeWidthBatch": TestCase(2.0),
"TensorDataBatch": TestCase(
alternatives=[
Expand Down

0 comments on commit 3fd7a32

Please sign in to comment.