Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use the american spelling of "Gray" #2099

Merged
merged 1 commit into from
May 12, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions _typos.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,17 @@
# install: cargo install typos-cli
# run: typos

[files]
extend-exclude = [
"_typos.toml",
"crates/re_ui/data/design_tokens.json",
"crates/re_ui/src/design_tokens.rs",
]


[default.extend-words]
lod = "lod" # level-of-detail
teh = "teh" # part of @teh-cmc

# American English:
grey = "gray"
8 changes: 4 additions & 4 deletions crates/re_log_types/src/component_types/tensor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ impl Tensor {

match shape_short.len() {
1 => {
// Special case: Nx1(x1x1x...) tensors are treated as Nx1 grey images.
// Special case: Nx1(x1x1x...) tensors are treated as Nx1 gray images.
if self.shape.len() >= 2 {
Some([shape_short[0].size, 1, 1])
} else {
Expand Down Expand Up @@ -1272,7 +1272,7 @@ fn test_tensor_shape_utilities() {
assert!(!tensor.is_shaped_like_an_image());
}

// Single element, but it might be interpreted as a 1x1 grey image!
// Single element, but it might be interpreted as a 1x1 gray image!
for shape in [
vec![1, 1],
vec![1, 1, 1],
Expand Down Expand Up @@ -1308,7 +1308,7 @@ fn test_tensor_shape_utilities() {
assert!(tensor.is_shaped_like_an_image());
}

// Grey 1x4 images
// gray 1x4 images
for shape in [
vec![4, 1],
vec![4, 1, 1],
Expand All @@ -1323,7 +1323,7 @@ fn test_tensor_shape_utilities() {
assert!(tensor.is_shaped_like_an_image());
}

// Grey 4x1 images
// gray 4x1 images
for shape in [
vec![1, 4],
vec![1, 4, 1],
Expand Down
2 changes: 1 addition & 1 deletion rerun_py/rerun_sdk/rerun/log/scalar.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def log_scalar(
will have differently colored segments as appropriate.
If all points within a single entity path (i.e. a line) share the same
color, then this color will be used as the line color in the plot legend.
Otherwise, the line will appear grey in the legend.
Otherwise, the line will appear gray in the legend.
radius:
An optional radius for the point.

Expand Down