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

fix [#27673] Value sliders >1 do not represent numerical ratios right

Browse Source 
the soft limits for array buttons not take into account the min/max of all array elements
This commit is contained in:
Campbell Barton 2011-06-16 06:47:54 +00:00
parent 051dedeeec
commit 0a998decb6
3 changed files with 108 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1765,50 +1765,70 @@ static double soft_range_round_down(double value, double max)
void ui_set_but_soft_range(uiBut *but, double value) void ui_set_but_soft_range(uiBut *but, double value)
{ {
PropertyType type; /* ideally we would not limit this but practially, its more then
double softmin, softmax /*, step, precision*/; * enough worst case is very long vectors wont use a smart soft-range
* which isnt so bad. */
if(but->rnaprop) { if(but->rnaprop) {
type= RNA_property_type(but->rnaprop); const PropertyType type= RNA_property_type(but->rnaprop);
double softmin, softmax /*, step, precision*/;
double value_min= value;
double value_max= value;
/* clamp button range to something reasonable in case /* clamp button range to something reasonable in case
* we get -inf/inf from RNA properties */ * we get -inf/inf from RNA properties */
if(type == PROP_INT) { if(type == PROP_INT) {
int imin, imax, istep; int imin, imax, istep;
const int array_len= RNA_property_array_length(&but->rnapoin, but->rnaprop);
RNA_property_int_ui_range(&but->rnapoin, but->rnaprop, &imin, &imax, &istep); RNA_property_int_ui_range(&but->rnapoin, but->rnaprop, &imin, &imax, &istep);
softmin= (imin == INT_MIN)? -1e4: imin; softmin= (imin == INT_MIN)? -1e4: imin;
softmax= (imin == INT_MAX)? 1e4: imax; softmax= (imin == INT_MAX)? 1e4: imax;
/*step= istep;*/ /*UNUSED*/ /*step= istep;*/ /*UNUSED*/
/*precision= 1;*/ /*UNUSED*/ /*precision= 1;*/ /*UNUSED*/
if(array_len >= 2) {
int value_range[2];
RNA_property_int_get_array_range(&but->rnapoin, but->rnaprop, value_range);
value_min= (double)value_range[0];
value_max= (double)value_range[1];
}
} }
else if(type == PROP_FLOAT) { else if(type == PROP_FLOAT) {
float fmin, fmax, fstep, fprecision; float fmin, fmax, fstep, fprecision;
const int array_len= RNA_property_array_length(&but->rnapoin, but->rnaprop);
RNA_property_float_ui_range(&but->rnapoin, but->rnaprop, &fmin, &fmax, &fstep, &fprecision); RNA_property_float_ui_range(&but->rnapoin, but->rnaprop, &fmin, &fmax, &fstep, &fprecision);
softmin= (fmin == -FLT_MAX)? (float)-1e4: fmin; softmin= (fmin == -FLT_MAX)? (float)-1e4: fmin;
softmax= (fmax == FLT_MAX)? (float)1e4: fmax; softmax= (fmax == FLT_MAX)? (float)1e4: fmax;
/*step= fstep;*/ /*UNUSED*/ /*step= fstep;*/ /*UNUSED*/
/*precision= fprecision;*/ /*UNUSED*/ /*precision= fprecision;*/ /*UNUSED*/
if(array_len >= 2) {
float value_range[2];
RNA_property_float_get_array_range(&but->rnapoin, but->rnaprop, value_range);
value_min= (double)value_range[0];
value_max= (double)value_range[1];
}
} }
else else
return; return;
/* if the value goes out of the soft/max range, adapt the range */ /* if the value goes out of the soft/max range, adapt the range */
if(value+1e-10 < softmin) { if(value_min+1e-10 < softmin) {
if(value < 0.0) if(value_min < 0.0)
softmin= -soft_range_round_up(-value, -softmin); softmin= -soft_range_round_up(-value_min, -softmin);
else else
softmin= soft_range_round_down(value, softmin); softmin= soft_range_round_down(value_min, softmin);
if(softmin < (double)but->hardmin) if(softmin < (double)but->hardmin)
softmin= (double)but->hardmin; softmin= (double)but->hardmin;
} }
else if(value-1e-10 > softmax) { else if(value_max-1e-10 > softmax) {
if(value < 0.0) if(value_max < 0.0)
softmax= -soft_range_round_down(-value, -softmax); softmax= -soft_range_round_down(-value_max, -softmax);
else else
softmax= soft_range_round_up(value, softmax); softmax= soft_range_round_up(value_max, softmax);
if(softmax > (double)but->hardmax) if(softmax > (double)but->hardmax)
softmax= but->hardmax; softmax= but->hardmax;

2
source/blender/makesrna/RNA_access.h
View File

@ -716,6 +716,7 @@ int RNA_property_boolean_get_default_index(PointerRNA *ptr, PropertyRNA *prop, i
int RNA_property_int_get(PointerRNA *ptr, PropertyRNA *prop); int RNA_property_int_get(PointerRNA *ptr, PropertyRNA *prop);
void RNA_property_int_set(PointerRNA *ptr, PropertyRNA *prop, int value); void RNA_property_int_set(PointerRNA *ptr, PropertyRNA *prop, int value);
void RNA_property_int_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values); void RNA_property_int_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values);
void RNA_property_int_get_array_range(PointerRNA *ptr, PropertyRNA *prop, int values[2]);
int RNA_property_int_get_index(PointerRNA *ptr, PropertyRNA *prop, int index); int RNA_property_int_get_index(PointerRNA *ptr, PropertyRNA *prop, int index);
void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *values); void RNA_property_int_set_array(PointerRNA *ptr, PropertyRNA *prop, const int *values);
void RNA_property_int_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, int value); void RNA_property_int_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, int value);
@ -726,6 +727,7 @@ int RNA_property_int_get_default_index(PointerRNA *ptr, PropertyRNA *prop, int i
float RNA_property_float_get(PointerRNA *ptr, PropertyRNA *prop); float RNA_property_float_get(PointerRNA *ptr, PropertyRNA *prop);
void RNA_property_float_set(PointerRNA *ptr, PropertyRNA *prop, float value); void RNA_property_float_set(PointerRNA *ptr, PropertyRNA *prop, float value);
void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *values); void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *values);
void RNA_property_float_get_array_range(PointerRNA *ptr, PropertyRNA *prop, float values[2]);
float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index); float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index);
void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const float *values); void RNA_property_float_set_array(PointerRNA *ptr, PropertyRNA *prop, const float *values);
void RNA_property_float_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, float value); void RNA_property_float_set_index(PointerRNA *ptr, PropertyRNA *prop, int index, float value);

74
source/blender/makesrna/intern/rna_access.c
View File

@ -1643,6 +1643,43 @@ void RNA_property_int_get_array(PointerRNA *ptr, PropertyRNA *prop, int *values)
memset(values, 0, sizeof(int)*prop->totarraylength); memset(values, 0, sizeof(int)*prop->totarraylength);
} }
void RNA_property_int_get_array_range(PointerRNA *ptr, PropertyRNA *prop, int values[2])
{
const int array_len= RNA_property_array_length(ptr, prop);
if(array_len <= 0) {
values[0]= 0;
values[1]= 0;
}
else if (array_len == 1) {
RNA_property_int_get_array(ptr, prop, values);
values[1]= values[0];
}
else {
int arr_stack[32];
int *arr;
int i;
if(array_len > 32) {
arr= MEM_mallocN(sizeof(int) * array_len, "RNA_property_int_get_array_range");
}
else {
arr= arr_stack;
}
RNA_property_int_get_array(ptr, prop, arr);
values[0]= values[1]= arr[0];
for(i= 1; i < array_len; i++) {
values[0]= MIN2(values[0], arr[i]);
values[1]= MAX2(values[1], arr[i]);
}
if(arr != arr_stack) {
MEM_freeN(arr);
}
}
}
int RNA_property_int_get_index(PointerRNA *ptr, PropertyRNA *prop, int index) int RNA_property_int_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)
{ {
int tmp[RNA_MAX_ARRAY_LENGTH]; int tmp[RNA_MAX_ARRAY_LENGTH];
@ -1839,6 +1876,43 @@ void RNA_property_float_get_array(PointerRNA *ptr, PropertyRNA *prop, float *val
memset(values, 0, sizeof(float)*prop->totarraylength); memset(values, 0, sizeof(float)*prop->totarraylength);
} }
void RNA_property_float_get_array_range(PointerRNA *ptr, PropertyRNA *prop, float values[2])
{
const int array_len= RNA_property_array_length(ptr, prop);
if(array_len <= 0) {
values[0]= 0.0f;
values[1]= 0.0f;
}
else if (array_len == 1) {
RNA_property_float_get_array(ptr, prop, values);
values[1]= values[0];
}
else {
float arr_stack[32];
float *arr;
int i;
if(array_len > 32) {
arr= MEM_mallocN(sizeof(float) * array_len, "RNA_property_float_get_array_range");
}
else {
arr= arr_stack;
}
RNA_property_float_get_array(ptr, prop, arr);
values[0]= values[1]= arr[0];
for(i= 1; i < array_len; i++) {
values[0]= MIN2(values[0], arr[i]);
values[1]= MAX2(values[1], arr[i]);
}
if(arr != arr_stack) {
MEM_freeN(arr);
}
}
}
float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index) float RNA_property_float_get_index(PointerRNA *ptr, PropertyRNA *prop, int index)
{ {
float tmp[RNA_MAX_ARRAY_LENGTH]; float tmp[RNA_MAX_ARRAY_LENGTH];