archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: rename BLI_str_format_attribute_domain_size

Browse Source 
This is useful without any functionality specific to attribute domains,
rename to `BLI_str_format_decimal_unit` to follow naming of a similar
function `BLI_str_format_byte_unit`.
This commit is contained in:
Campbell Barton
2022-05-11 22:46:19 +10:00
parent fbf92f5967
commit 87978ff560
4 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenlib/BLI_string.h
View File

@@ -307,7 +307,7 @@ void BLI_str_format_byte_unit(char dst[15], long long int bytes, bool base_10) A
* *
* Length of 7 is the maximum of the resulting string, for example, `-15.5K\0`. * Length of 7 is the maximum of the resulting string, for example, `-15.5K\0`.
*/ */
void BLI_str_format_attribute_domain_size(char dst[7], int number_to_format) ATTR_NONNULL(); void BLI_str_format_decimal_unit(char dst[7], int number_to_format) ATTR_NONNULL();
/** /**
* Compare two strings without regard to case. * Compare two strings without regard to case.
* *

2
source/blender/blenlib/intern/string.c
View File

@@ -1155,7 +1155,7 @@ void BLI_str_format_byte_unit(char dst[15], long long int bytes, const bool base
BLI_strncpy(dst + len, base_10 ? units_base_10[order] : units_base_2[order], dst_len - len); BLI_strncpy(dst + len, base_10 ? units_base_10[order] : units_base_2[order], dst_len - len);
} }
void BLI_str_format_attribute_domain_size(char dst[7], int number_to_format) void BLI_str_format_decimal_unit(char dst[7], int number_to_format)
{ {
float number_to_format_converted = number_to_format; float number_to_format_converted = number_to_format;
int order = 0; int order = 0;

86
source/blender/blenlib/tests/BLI_string_test.cc
View File

@@ -420,98 +420,98 @@ TEST(string, StrFormatByteUnits)
EXPECT_STREQ("-8191.8472 PiB", size_str); EXPECT_STREQ("-8191.8472 PiB", size_str);
} }
/* BLI_str_format_attribute_domain_size */ /* BLI_str_format_decimal_unit */
TEST(string, StrFormatAttributeDomainSize) TEST(string, StrFormatDecimalUnits)
{ {
char size_str[7]; char size_str[7];
int size; int size;
BLI_str_format_attribute_domain_size(size_str, size = 0); BLI_str_format_decimal_unit(size_str, size = 0);
EXPECT_STREQ("0", size_str); EXPECT_STREQ("0", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1); BLI_str_format_decimal_unit(size_str, size = 1);
EXPECT_STREQ("1", size_str); EXPECT_STREQ("1", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 10); BLI_str_format_decimal_unit(size_str, size = 10);
EXPECT_STREQ("10", size_str); EXPECT_STREQ("10", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 15); BLI_str_format_decimal_unit(size_str, size = 15);
EXPECT_STREQ("15", size_str); EXPECT_STREQ("15", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 100); BLI_str_format_decimal_unit(size_str, size = 100);
EXPECT_STREQ("100", size_str); EXPECT_STREQ("100", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 155); BLI_str_format_decimal_unit(size_str, size = 155);
EXPECT_STREQ("155", size_str); EXPECT_STREQ("155", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1000); BLI_str_format_decimal_unit(size_str, size = 1000);
EXPECT_STREQ("1.0K", size_str); EXPECT_STREQ("1.0K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1555); BLI_str_format_decimal_unit(size_str, size = 1555);
EXPECT_STREQ("1.6K", size_str); EXPECT_STREQ("1.6K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 10000); BLI_str_format_decimal_unit(size_str, size = 10000);
EXPECT_STREQ("10.0K", size_str); EXPECT_STREQ("10.0K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 15555); BLI_str_format_decimal_unit(size_str, size = 15555);
EXPECT_STREQ("15.6K", size_str); EXPECT_STREQ("15.6K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 100000); BLI_str_format_decimal_unit(size_str, size = 100000);
EXPECT_STREQ("100K", size_str); EXPECT_STREQ("100K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 100000); BLI_str_format_decimal_unit(size_str, size = 100000);
EXPECT_STREQ("100K", size_str); EXPECT_STREQ("100K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 155555); BLI_str_format_decimal_unit(size_str, size = 155555);
EXPECT_STREQ("156K", size_str); EXPECT_STREQ("156K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1000000); BLI_str_format_decimal_unit(size_str, size = 1000000);
EXPECT_STREQ("1.0M", size_str); EXPECT_STREQ("1.0M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1555555); BLI_str_format_decimal_unit(size_str, size = 1555555);
EXPECT_STREQ("1.6M", size_str); EXPECT_STREQ("1.6M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 10000000); BLI_str_format_decimal_unit(size_str, size = 10000000);
EXPECT_STREQ("10.0M", size_str); EXPECT_STREQ("10.0M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 15555555); BLI_str_format_decimal_unit(size_str, size = 15555555);
EXPECT_STREQ("15.6M", size_str); EXPECT_STREQ("15.6M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 100000000); BLI_str_format_decimal_unit(size_str, size = 100000000);
EXPECT_STREQ("100M", size_str); EXPECT_STREQ("100M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 155555555); BLI_str_format_decimal_unit(size_str, size = 155555555);
EXPECT_STREQ("156M", size_str); EXPECT_STREQ("156M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = 1000000000); BLI_str_format_decimal_unit(size_str, size = 1000000000);
EXPECT_STREQ("1.0B", size_str); EXPECT_STREQ("1.0B", size_str);
/* Largest possible value. */ /* Largest possible value. */
BLI_str_format_attribute_domain_size(size_str, size = INT32_MAX); BLI_str_format_decimal_unit(size_str, size = INT32_MAX);
EXPECT_STREQ("2.1B", size_str); EXPECT_STREQ("2.1B", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -0); BLI_str_format_decimal_unit(size_str, size = -0);
EXPECT_STREQ("0", size_str); EXPECT_STREQ("0", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1); BLI_str_format_decimal_unit(size_str, size = -1);
EXPECT_STREQ("-1", size_str); EXPECT_STREQ("-1", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -10); BLI_str_format_decimal_unit(size_str, size = -10);
EXPECT_STREQ("-10", size_str); EXPECT_STREQ("-10", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -15); BLI_str_format_decimal_unit(size_str, size = -15);
EXPECT_STREQ("-15", size_str); EXPECT_STREQ("-15", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -100); BLI_str_format_decimal_unit(size_str, size = -100);
EXPECT_STREQ("-100", size_str); EXPECT_STREQ("-100", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -155); BLI_str_format_decimal_unit(size_str, size = -155);
EXPECT_STREQ("-155", size_str); EXPECT_STREQ("-155", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1000); BLI_str_format_decimal_unit(size_str, size = -1000);
EXPECT_STREQ("-1.0K", size_str); EXPECT_STREQ("-1.0K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1555); BLI_str_format_decimal_unit(size_str, size = -1555);
EXPECT_STREQ("-1.6K", size_str); EXPECT_STREQ("-1.6K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -10000); BLI_str_format_decimal_unit(size_str, size = -10000);
EXPECT_STREQ("-10.0K", size_str); EXPECT_STREQ("-10.0K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -15555); BLI_str_format_decimal_unit(size_str, size = -15555);
EXPECT_STREQ("-15.6K", size_str); EXPECT_STREQ("-15.6K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -100000); BLI_str_format_decimal_unit(size_str, size = -100000);
EXPECT_STREQ("-100K", size_str); EXPECT_STREQ("-100K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -155555); BLI_str_format_decimal_unit(size_str, size = -155555);
EXPECT_STREQ("-156K", size_str); EXPECT_STREQ("-156K", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1000000); BLI_str_format_decimal_unit(size_str, size = -1000000);
EXPECT_STREQ("-1.0M", size_str); EXPECT_STREQ("-1.0M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1555555); BLI_str_format_decimal_unit(size_str, size = -1555555);
EXPECT_STREQ("-1.6M", size_str); EXPECT_STREQ("-1.6M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -10000000); BLI_str_format_decimal_unit(size_str, size = -10000000);
EXPECT_STREQ("-10.0M", size_str); EXPECT_STREQ("-10.0M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -15555555); BLI_str_format_decimal_unit(size_str, size = -15555555);
EXPECT_STREQ("-15.6M", size_str); EXPECT_STREQ("-15.6M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -100000000); BLI_str_format_decimal_unit(size_str, size = -100000000);
EXPECT_STREQ("-100M", size_str); EXPECT_STREQ("-100M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -155555555); BLI_str_format_decimal_unit(size_str, size = -155555555);
EXPECT_STREQ("-156M", size_str); EXPECT_STREQ("-156M", size_str);
BLI_str_format_attribute_domain_size(size_str, size = -1000000000); BLI_str_format_decimal_unit(size_str, size = -1000000000);
EXPECT_STREQ("-1.0B", size_str); EXPECT_STREQ("-1.0B", size_str);
/* Smallest possible value. */ /* Smallest possible value. */
BLI_str_format_attribute_domain_size(size_str, size = -INT32_MAX); BLI_str_format_decimal_unit(size_str, size = -INT32_MAX);
EXPECT_STREQ("-2.1B", size_str); EXPECT_STREQ("-2.1B", size_str);
} }

2
source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc
View File

@@ -144,7 +144,7 @@ void GeometryDataSetTreeViewItem::build_row(uiLayout &row)
/* Using the tree row button instead of a separate right aligned button gives padding /* Using the tree row button instead of a separate right aligned button gives padding
* to the right side of the number, which it didn't have with the button. */ * to the right side of the number, which it didn't have with the button. */
char element_count[7]; char element_count[7];
BLI_str_format_attribute_domain_size(element_count, *count); BLI_str_format_decimal_unit(element_count, *count);
UI_but_hint_drawstr_set((uiBut *)this->tree_row_button(), element_count); UI_but_hint_drawstr_set((uiBut *)this->tree_row_button(), element_count);
} }
} }