sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

smarter precision calculation, so 0.000001 isn't displayed as 0.00.

Browse Source 
there is a minor problem with this commit:
 0.00001 --> 0.00001 # good
 0.000015 --> 0.000015 # good
 0.0000199 --> 0.00002 # ok
 0.00002 --> 0.000020 # wrong, has trailing 0

Tried to fix this but the case is hard to check for without more calculations which Id like to avoid.
This commit is contained in:
Campbell Barton 2011-06-07 04:06:10 +00:00
parent 34b0c217f8
commit 06c3756db8
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/blender/editors/interface/interface.c
View File

@ -449,11 +449,36 @@ void uiCenteredBoundsBlock(uiBlock *block, int addval)
/* link line drawing is not part of buttons or theme.. so we stick with it here */
static int ui_but_float_precision(uiBut *but, double UNUSED(value))
static int ui_but_float_precision(uiBut *but, double value)
{
int prec= (int)but->a2;
if(prec==0) prec= (but->hardmax < 10.001f) ? 3 : 2;
else CLAMP(prec, 1, 7);
int prec;
/* first check if prec is 0 and fallback to a simple default */
if((prec= (int)but->a2) == 0) {
prec= (but->hardmax < 10.001f) ? 3 : 2;
}
/* check on the number of decimal places neede to display
* the number, this is so 0.00001 is not displayed as 0.00,
* _but_, this is only for small values si 10.0001 will not get
* the same treatment */
if(value != 0.0 && (value= ABS(value)) < 0.1) {
double prec_d= -(log10(value));
double prec_d_floor = floor(prec_d + FLT_EPSILON);
int test_prec= (int)prec_d_floor;
/* this check is so 0.00016 from isnt rounded to 0.0001 _but_ it is not working ideally because 0.0002 becomes 0.00020 */
if(prec_d - prec_d_floor > FLT_EPSILON) {
test_prec += 2;
}
if(test_prec > prec && test_prec <= 7) {
prec= test_prec;
}
}
CLAMP(prec, 1, 7);
return prec;
}