2011-02-23 10:52:22 +00:00
|
|
|
/*
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
* ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software Foundation,
|
2010-02-12 13:34:04 +00:00
|
|
|
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
*
|
|
|
|
* Contributor(s): Campbell Barton
|
|
|
|
*
|
|
|
|
* ***** END GPL LICENSE BLOCK *****
|
|
|
|
*/
|
2011-02-27 20:40:57 +00:00
|
|
|
|
|
|
|
/** \file blender/blenkernel/intern/unit.c
|
|
|
|
* \ingroup bke
|
|
|
|
*/
|
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <ctype.h>
|
|
|
|
#include <string.h>
|
2010-12-10 04:10:21 +00:00
|
|
|
#include <assert.h>
|
2010-09-16 04:19:22 +00:00
|
|
|
|
2014-01-04 17:16:19 +11:00
|
|
|
#include "BLI_sys_types.h"
|
2010-10-21 07:29:15 +00:00
|
|
|
#include "BLI_math.h"
|
2011-08-30 10:07:50 +00:00
|
|
|
#include "BLI_string.h"
|
2012-04-10 02:51:24 +00:00
|
|
|
#include "BLI_string_utf8.h"
|
2012-04-15 07:54:07 +00:00
|
|
|
|
2014-01-04 17:16:19 +11:00
|
|
|
#include "BKE_unit.h" /* own include */
|
|
|
|
|
2012-04-15 07:54:07 +00:00
|
|
|
#ifdef WIN32
|
|
|
|
# include "BLI_winstuff.h"
|
|
|
|
#endif
|
2009-08-13 18:26:15 +00:00
|
|
|
|
2014-08-26 20:52:07 +10:00
|
|
|
/* no BKE or DNA includes! */
|
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
#define TEMP_STR_SIZE 256
|
|
|
|
|
2009-08-17 12:48:56 +00:00
|
|
|
#define SEP_CHR '#'
|
|
|
|
#define SEP_STR "#"
|
|
|
|
|
2010-09-22 02:36:14 +00:00
|
|
|
#define EPS 0.00001
|
2009-08-17 12:48:56 +00:00
|
|
|
|
2010-09-22 02:36:14 +00:00
|
|
|
#define UN_SC_KM 1000.0f
|
|
|
|
#define UN_SC_HM 100.0f
|
|
|
|
#define UN_SC_DAM 10.0f
|
|
|
|
#define UN_SC_M 1.0f
|
|
|
|
#define UN_SC_DM 0.1f
|
|
|
|
#define UN_SC_CM 0.01f
|
|
|
|
#define UN_SC_MM 0.001f
|
|
|
|
#define UN_SC_UM 0.000001f
|
|
|
|
|
|
|
|
#define UN_SC_MI 1609.344f
|
|
|
|
#define UN_SC_FUR 201.168f
|
|
|
|
#define UN_SC_CH 20.1168f
|
|
|
|
#define UN_SC_YD 0.9144f
|
|
|
|
#define UN_SC_FT 0.3048f
|
|
|
|
#define UN_SC_IN 0.0254f
|
|
|
|
#define UN_SC_MIL 0.0000254f
|
|
|
|
|
|
|
|
#define UN_SC_MTON 1000.0f /* metric ton */
|
|
|
|
#define UN_SC_QL 100.0f
|
|
|
|
#define UN_SC_KG 1.0f
|
|
|
|
#define UN_SC_HG 0.1f
|
|
|
|
#define UN_SC_DAG 0.01f
|
|
|
|
#define UN_SC_G 0.001f
|
2014-01-04 04:10:55 +01:00
|
|
|
#define UN_SC_MG 0.000001f
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
#define UN_SC_ITON 907.18474f /* imperial ton */
|
|
|
|
#define UN_SC_CWT 45.359237f
|
|
|
|
#define UN_SC_ST 6.35029318f
|
|
|
|
#define UN_SC_LB 0.45359237f
|
|
|
|
#define UN_SC_OZ 0.028349523125f
|
2009-08-17 12:48:56 +00:00
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* define a single unit */
|
|
|
|
typedef struct bUnitDef {
|
2010-11-23 14:14:06 +00:00
|
|
|
const char *name;
|
2012-03-10 14:20:55 +00:00
|
|
|
const char *name_plural; /* abused a bit for the display name */
|
|
|
|
const char *name_short; /* this is used for display*/
|
|
|
|
const char *name_alt; /* keyboard-friendly ASCII-only version of name_short, can be NULL */
|
|
|
|
/* if name_short has non-ASCII chars, name_alt should be present */
|
|
|
|
|
|
|
|
const char *name_display; /* can be NULL */
|
2009-08-17 12:48:56 +00:00
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
double scalar;
|
2012-03-10 14:20:55 +00:00
|
|
|
double bias; /* not used yet, needed for converting temperature */
|
2009-08-12 14:11:53 +00:00
|
|
|
int flag;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
} bUnitDef;
|
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
#define B_UNIT_DEF_NONE 0
|
|
|
|
#define B_UNIT_DEF_SUPPRESS 1 /* Use for units that are not used enough to be translated into for common use */
|
2013-05-30 21:17:50 +00:00
|
|
|
#define B_UNIT_DEF_TENTH 2 /* Display a unit even if its value is 0.1, eg 0.1mm instead of 100um */
|
2009-08-12 14:11:53 +00:00
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* define a single unit */
|
|
|
|
typedef struct bUnitCollection {
|
|
|
|
struct bUnitDef *units;
|
2012-03-10 14:20:55 +00:00
|
|
|
int base_unit; /* basic unit index (when user doesn't specify unit explicitly) */
|
|
|
|
int flag; /* options for this system */
|
|
|
|
int length; /* to quickly find the last item */
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
} bUnitCollection;
|
|
|
|
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
/* Dummy */
|
2012-03-10 14:20:55 +00:00
|
|
|
static struct bUnitDef buDummyDef[] = { {"", NULL, "", NULL, NULL, 1.0, 0.0}, {NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buDummyCollection = {buDummyDef, 0, 0, sizeof(buDummyDef)};
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
|
|
|
|
/* Lengths */
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
static struct bUnitDef buMetricLenDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"kilometer", "kilometers", "km", NULL, "Kilometers", UN_SC_KM, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"hectometer", "hectometers", "hm", NULL, "100 Meters", UN_SC_HM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"dekameter", "dekameters", "dam", NULL, "10 Meters", UN_SC_DAM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"meter", "meters", "m", NULL, "Meters", UN_SC_M, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"decimeter", "decimeters", "dm", NULL, "10 Centimeters", UN_SC_DM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"centimeter", "centimeters", "cm", NULL, "Centimeters", UN_SC_CM, 0.0, B_UNIT_DEF_NONE},
|
2013-05-30 21:17:50 +00:00
|
|
|
{"millimeter", "millimeters", "mm", NULL, "Millimeters", UN_SC_MM, 0.0, B_UNIT_DEF_NONE | B_UNIT_DEF_TENTH},
|
2013-11-08 11:25:50 +00:00
|
|
|
{"micrometer", "micrometers", "µm", "um", "Micrometers", UN_SC_UM, 0.0, B_UNIT_DEF_NONE},
|
2009-08-12 17:02:03 +00:00
|
|
|
|
|
|
|
/* These get displayed because of float precision problems in the transform header,
|
|
|
|
* could work around, but for now probably people wont use these */
|
2012-03-03 20:19:11 +00:00
|
|
|
#if 0
|
2012-07-04 12:56:58 +00:00
|
|
|
{"nanometer", "Nanometers", "nm", NULL, 0.000000001, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"picometer", "Picometers", "pm", NULL, 0.000000000001, 0.0, B_UNIT_DEF_NONE},
|
2012-03-03 20:19:11 +00:00
|
|
|
#endif
|
2009-08-17 12:48:56 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buMetricLenCollection = {buMetricLenDef, 3, 0, sizeof(buMetricLenDef) / sizeof(bUnitDef)};
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialLenDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"mile", "miles", "mi", "m", "Miles", UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"furlong", "furlongs", "fur", NULL, "Furlongs", UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"chain", "chains", "ch", NULL, "Chains", UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"yard", "yards", "yd", NULL, "Yards", UN_SC_YD, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"foot", "feet", "'", "ft", "Feet", UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"inch", "inches", "\"", "in", "Inches", UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"thou", "thou", "thou", "mil", "Thou", UN_SC_MIL, 0.0, B_UNIT_DEF_NONE}, /* plural for thou has no 's' */
|
2009-08-17 12:48:56 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialLenCollection = {buImperialLenDef, 4, 0, sizeof(buImperialLenDef) / sizeof(bUnitDef)};
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2010-09-22 02:36:14 +00:00
|
|
|
/* Areas */
|
|
|
|
static struct bUnitDef buMetricAreaDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"square kilometer", "square kilometers", "km²", "km2", "Square Kilometers", UN_SC_KM * UN_SC_KM, 0.0, B_UNIT_DEF_NONE},
|
2013-02-11 07:12:15 +00:00
|
|
|
{"square hectometer", "square hectometers", "hm²", "hm2", "Square Hectometers", UN_SC_HM * UN_SC_HM, 0.0, B_UNIT_DEF_SUPPRESS}, /* hectare */
|
2012-07-04 12:56:58 +00:00
|
|
|
{"square dekameter", "square dekameters", "dam²", "dam2", "Square Dekameters", UN_SC_DAM * UN_SC_DAM, 0.0, B_UNIT_DEF_SUPPRESS}, /* are */
|
|
|
|
{"square meter", "square meters", "m²", "m2", "Square Meters", UN_SC_M * UN_SC_M, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"square decimeter", "square decimetees", "dm²", "dm2", "Square Decimeters", UN_SC_DM * UN_SC_DM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"square centimeter", "square centimeters", "cm²", "cm2", "Square Centimeters", UN_SC_CM * UN_SC_CM, 0.0, B_UNIT_DEF_NONE},
|
2013-05-30 21:17:50 +00:00
|
|
|
{"square millimeter", "square millimeters", "mm²", "mm2", "Square Millimeters", UN_SC_MM * UN_SC_MM, 0.0, B_UNIT_DEF_NONE | B_UNIT_DEF_TENTH},
|
2013-11-08 11:25:50 +00:00
|
|
|
{"square micrometer", "square micrometers", "µm²", "um2", "Square Micrometers", UN_SC_UM * UN_SC_UM, 0.0, B_UNIT_DEF_NONE},
|
2012-07-04 12:56:58 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
2010-09-22 02:36:14 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buMetricAreaCollection = {buMetricAreaDef, 3, 0, sizeof(buMetricAreaDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialAreaDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"square mile", "square miles", "sq mi", "sq m", "Square Miles", UN_SC_MI * UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"square furlong", "square furlongs", "sq fur", NULL, "Square Furlongs", UN_SC_FUR * UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"square chain", "square chains", "sq ch", NULL, "Square Chains", UN_SC_CH * UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"square yard", "square yards", "sq yd", NULL, "Square Yards", UN_SC_YD * UN_SC_YD, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"square foot", "square feet", "sq ft", NULL, "Square Feet", UN_SC_FT * UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"square inch", "square inches", "sq in", NULL, "Square Inches", UN_SC_IN * UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"square thou", "square thous", "sq mil", NULL, "Square Thous", UN_SC_MIL * UN_SC_MIL, 0.0, B_UNIT_DEF_NONE},
|
2010-09-22 02:36:14 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialAreaCollection = {buImperialAreaDef, 4, 0, sizeof(buImperialAreaDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
/* Volumes */
|
|
|
|
static struct bUnitDef buMetricVolDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"cubic kilometer", "cubic kilometers", "km³", "km3", "Cubic Kilometers", UN_SC_KM * UN_SC_KM * UN_SC_KM, 0.0, B_UNIT_DEF_NONE},
|
2013-02-11 07:12:15 +00:00
|
|
|
{"cubic hectometer", "cubic hectometers", "hm³", "hm3", "Cubic Hectometers", UN_SC_HM * UN_SC_HM * UN_SC_HM, 0.0, B_UNIT_DEF_SUPPRESS},
|
2012-07-04 12:56:58 +00:00
|
|
|
{"cubic dekameter", "cubic dekameters", "dam³", "dam3", "Cubic Dekameters", UN_SC_DAM * UN_SC_DAM * UN_SC_DAM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"cubic meter", "cubic meters", "m³", "m3", "Cubic Meters", UN_SC_M * UN_SC_M * UN_SC_M, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"cubic decimeter", "cubic decimeters", "dm³", "dm3", "Cubic Decimeters", UN_SC_DM * UN_SC_DM * UN_SC_DM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"cubic centimeter", "cubic centimeters", "cm³", "cm3", "Cubic Centimeters", UN_SC_CM * UN_SC_CM * UN_SC_CM, 0.0, B_UNIT_DEF_NONE},
|
2013-05-30 21:17:50 +00:00
|
|
|
{"cubic millimeter", "cubic millimeters", "mm³", "mm3", "Cubic Millimeters", UN_SC_MM * UN_SC_MM * UN_SC_MM, 0.0, B_UNIT_DEF_NONE | B_UNIT_DEF_TENTH},
|
2013-11-08 11:25:50 +00:00
|
|
|
{"cubic micrometer", "cubic micrometers", "µm³", "um3", "Cubic Micrometers", UN_SC_UM * UN_SC_UM * UN_SC_UM, 0.0, B_UNIT_DEF_NONE},
|
2012-07-04 12:56:58 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
2010-09-22 02:36:14 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buMetricVolCollection = {buMetricVolDef, 3, 0, sizeof(buMetricVolDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialVolDef[] = {
|
2012-08-11 22:12:32 +00:00
|
|
|
{"cubic mile", "cubic miles", "cu mi", "cu m", "Cubic Miles", UN_SC_MI * UN_SC_MI * UN_SC_MI, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"cubic furlong", "cubic furlongs", "cu fur", NULL, "Cubic Furlongs", UN_SC_FUR * UN_SC_FUR * UN_SC_FUR, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"cubic chain", "cubic chains", "cu ch", NULL, "Cubic Chains", UN_SC_CH * UN_SC_CH * UN_SC_CH, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"cubic yard", "cubic yards", "cu yd", NULL, "Cubic Yards", UN_SC_YD * UN_SC_YD * UN_SC_YD, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"cubic foot", "cubic feet", "cu ft", NULL, "Cubic Feet", UN_SC_FT * UN_SC_FT * UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"cubic inch", "cubic inches", "cu in", NULL, "Cubic Inches", UN_SC_IN * UN_SC_IN * UN_SC_IN, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"cubic thou", "cubic thous", "cu mil", NULL, "Cubic Thous", UN_SC_MIL * UN_SC_MIL * UN_SC_MIL, 0.0, B_UNIT_DEF_NONE},
|
2010-09-22 02:36:14 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialVolCollection = {buImperialVolDef, 4, 0, sizeof(buImperialVolDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
/* Mass */
|
|
|
|
static struct bUnitDef buMetricMassDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"ton", "tonnes", "ton", "t", "1000 Kilograms", UN_SC_MTON, 0.0, B_UNIT_DEF_NONE},
|
2013-02-11 07:12:15 +00:00
|
|
|
{"quintal", "quintals", "ql", "q", "100 Kilograms", UN_SC_QL, 0.0, B_UNIT_DEF_SUPPRESS},
|
2014-01-04 04:09:11 +01:00
|
|
|
{"kilogram", "kilograms", "kg", NULL, "Kilograms", UN_SC_KG, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
2013-02-11 01:14:45 +00:00
|
|
|
{"hectogram", "hectograms", "hg", NULL, "Hectograms", UN_SC_HG, 0.0, B_UNIT_DEF_SUPPRESS},
|
2012-07-04 12:56:58 +00:00
|
|
|
{"dekagram", "dekagrams", "dag", NULL, "10 Grams", UN_SC_DAG, 0.0, B_UNIT_DEF_SUPPRESS},
|
2014-01-04 04:09:11 +01:00
|
|
|
{"gram", "grams", "g", NULL, "Grams", UN_SC_G, 0.0, B_UNIT_DEF_NONE},
|
2014-01-04 04:10:55 +01:00
|
|
|
{"milligram", "milligrams", "mg", NULL, "Milligrams", UN_SC_MG, 0.0, B_UNIT_DEF_NONE},
|
2012-07-04 12:56:58 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
2010-09-22 02:36:14 +00:00
|
|
|
};
|
2014-01-04 04:09:11 +01:00
|
|
|
static struct bUnitCollection buMetricMassCollection = {buMetricMassDef, 2, 0, sizeof(buMetricMassDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialMassDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"ton", "tonnes", "ton", "t", "Tonnes", UN_SC_ITON, 0.0, B_UNIT_DEF_NONE},
|
2010-09-22 02:36:14 +00:00
|
|
|
{"centum weight", "centum weights", "cwt", NULL, "Centum weights", UN_SC_CWT, 0.0, B_UNIT_DEF_NONE},
|
2012-07-04 12:56:58 +00:00
|
|
|
{"stone", "stones", "st", NULL, "Stones", UN_SC_ST, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"pound", "pounds", "lb", NULL, "Pounds", UN_SC_LB, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"ounce", "ounces", "oz", NULL, "Ounces", UN_SC_OZ, 0.0, B_UNIT_DEF_NONE},
|
2010-09-22 02:36:14 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialMassCollection = {buImperialMassDef, 3, 0, sizeof(buImperialMassDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
/* Even if user scales the system to a point where km^3 is used, velocity and
|
|
|
|
* acceleration aren't scaled: that's why we have so few units for them */
|
|
|
|
|
|
|
|
/* Velocity */
|
|
|
|
static struct bUnitDef buMetricVelDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"meter per second", "meters per second", "m/s", NULL, "Meters per second", UN_SC_M, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"kilometer per hour", "kilometers per hour", "km/h", NULL, "Kilometers per hour", UN_SC_KM / 3600.0f, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
2010-09-22 02:36:14 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buMetricVelCollection = {buMetricVelDef, 0, 0, sizeof(buMetricVelDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialVelDef[] = {
|
2012-07-04 12:56:58 +00:00
|
|
|
{"foot per second", "feet per second", "ft/s", "fps", "Feet per second", UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"mile per hour", "miles per hour", "mph", NULL, "Miles per hour", UN_SC_MI / 3600.0f, 0.0, B_UNIT_DEF_SUPPRESS},
|
2010-09-22 02:36:14 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialVelCollection = {buImperialVelDef, 0, 0, sizeof(buImperialVelDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
/* Acceleration */
|
|
|
|
static struct bUnitDef buMetricAclDef[] = {
|
|
|
|
{"meter per second squared", "meters per second squared", "m/s²", "m/s2", "Meters per second squared", UN_SC_M, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
2012-07-04 12:56:58 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
2010-09-22 02:36:14 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buMetricAclCollection = {buMetricAclDef, 0, 0, sizeof(buMetricAclDef) / sizeof(bUnitDef)};
|
2010-09-22 02:36:14 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buImperialAclDef[] = {
|
|
|
|
{"foot per second squared", "feet per second squared", "ft/s²", "ft/s2", "Feet per second squared", UN_SC_FT, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buImperialAclCollection = {buImperialAclDef, 0, 0, sizeof(buImperialAclDef) / sizeof(bUnitDef)};
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
|
|
|
|
/* Time */
|
|
|
|
static struct bUnitDef buNaturalTimeDef[] = {
|
|
|
|
/* weeks? - probably not needed for blender */
|
2012-07-04 12:56:58 +00:00
|
|
|
{"day", "days", "d", NULL, "Days", 90000.0, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"hour", "hours", "hr", "h", "Hours", 3600.0, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"minute", "minutes", "min", "m", "Minutes", 60.0, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
{"second", "seconds", "sec", "s", "Seconds", 1.0, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"millisecond", "milliseconds", "ms", NULL, "Milliseconds", 0.001, 0.0, B_UNIT_DEF_NONE},
|
2013-11-08 11:25:50 +00:00
|
|
|
{"microsecond", "microseconds", "µs", "us", "Microseconds", 0.000001, 0.0, B_UNIT_DEF_NONE},
|
2009-08-17 12:48:56 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
};
|
2013-03-13 17:16:49 +00:00
|
|
|
static struct bUnitCollection buNaturalTimeCollection = {buNaturalTimeDef, 3, 0, sizeof(buNaturalTimeDef) / sizeof(bUnitDef)};
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
|
2010-01-25 06:24:05 +00:00
|
|
|
|
|
|
|
static struct bUnitDef buNaturalRotDef[] = {
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
{"degree", "degrees", "°", "d", "Degrees", M_PI / 180.0, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
/* arcminutes/arcseconds are used in Astronomy/Navigation areas... */
|
|
|
|
{"arcminute", "arcminutes", "'", NULL, "Arcminutes", (M_PI / 180.0) / 60.0, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"arcsecond", "arcseconds", "\"", NULL, "Arcseconds", (M_PI / 180.0) / 3600.0, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"radian", "radians", "r", NULL, "Radians", 1.0, 0.0, B_UNIT_DEF_NONE},
|
|
|
|
// {"turn", "turns", "t", NULL, "Turns", 1.0 / (M_PI * 2.0), 0.0, B_UNIT_DEF_NONE},
|
2010-01-25 06:24:05 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
2012-06-27 18:29:47 +00:00
|
|
|
static struct bUnitCollection buNaturalRotCollection = {buNaturalRotDef, 0, 0, sizeof(buNaturalRotDef) / sizeof(bUnitDef)};
|
2010-01-25 06:24:05 +00:00
|
|
|
|
2013-03-13 17:16:49 +00:00
|
|
|
/* Camera Lengths */
|
|
|
|
static struct bUnitDef buCameraLenDef[] = {
|
|
|
|
{"meter", "meters", "m", NULL, "Meters", UN_SC_KM, 0.0, B_UNIT_DEF_NONE}, /* base unit */
|
|
|
|
{"decimeter", "decimeters", "dm", NULL, "10 Centimeters", UN_SC_HM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"centimeter", "centimeters", "cm", NULL, "Centimeters", UN_SC_DAM, 0.0, B_UNIT_DEF_SUPPRESS},
|
|
|
|
{"millimeter", "millimeters", "mm", NULL, "Millimeters", UN_SC_M, 0.0, B_UNIT_DEF_NONE},
|
2013-11-08 11:25:50 +00:00
|
|
|
{"micrometer", "micrometers", "µm", "um", "Micrometers", UN_SC_MM, 0.0, B_UNIT_DEF_SUPPRESS},
|
2013-03-13 17:16:49 +00:00
|
|
|
{NULL, NULL, NULL, NULL, NULL, 0.0, 0.0}
|
|
|
|
};
|
|
|
|
static struct bUnitCollection buCameraLenCollection = {buCameraLenDef, 3, 0, sizeof(buCameraLenDef) / sizeof(bUnitDef)};
|
|
|
|
|
|
|
|
|
|
|
|
#define UNIT_SYSTEM_TOT (((sizeof(bUnitSystems) / B_UNIT_TYPE_TOT) / sizeof(void *)) - 1)
|
|
|
|
static struct bUnitCollection *bUnitSystems[][B_UNIT_TYPE_TOT] = {
|
|
|
|
{NULL, NULL, NULL, NULL, NULL, &buNaturalRotCollection, &buNaturalTimeCollection, NULL, NULL, NULL},
|
|
|
|
{NULL, &buMetricLenCollection, &buMetricAreaCollection, &buMetricVolCollection, &buMetricMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buMetricVelCollection, &buMetricAclCollection, &buCameraLenCollection}, /* metric */
|
|
|
|
{NULL, &buImperialLenCollection, &buImperialAreaCollection, &buImperialVolCollection, &buImperialMassCollection, &buNaturalRotCollection, &buNaturalTimeCollection, &buImperialVelCollection, &buImperialAclCollection, &buCameraLenCollection}, /* imperial */
|
|
|
|
{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
};
|
|
|
|
|
2010-09-16 04:19:22 +00:00
|
|
|
|
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* internal, has some option not exposed */
|
|
|
|
static bUnitCollection *unit_get_system(int system, int type)
|
|
|
|
{
|
2010-12-10 04:10:21 +00:00
|
|
|
assert((system > -1) && (system < UNIT_SYSTEM_TOT) && (type > -1) && (type < B_UNIT_TYPE_TOT));
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
return bUnitSystems[system][type]; /* select system to use, metric/imperial/other? */
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2009-08-12 07:23:10 +00:00
|
|
|
static bUnitDef *unit_default(bUnitCollection *usys)
|
|
|
|
{
|
|
|
|
return &usys->units[usys->base_unit];
|
|
|
|
}
|
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
static bUnitDef *unit_best_fit(double value, bUnitCollection *usys, bUnitDef *unit_start, int suppress)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
|
|
|
bUnitDef *unit;
|
2012-03-10 14:20:55 +00:00
|
|
|
double value_abs = value > 0.0 ? value : -value;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
for (unit = unit_start ? unit_start : usys->units; unit->name; unit++) {
|
2009-08-12 14:11:53 +00:00
|
|
|
|
2012-02-23 02:17:50 +00:00
|
|
|
if (suppress && (unit->flag & B_UNIT_DEF_SUPPRESS))
|
2009-08-12 14:11:53 +00:00
|
|
|
continue;
|
|
|
|
|
2011-12-21 22:56:06 +00:00
|
|
|
/* scale down scalar so 1cm doesnt convert to 10mm because of float error */
|
2013-05-30 21:17:50 +00:00
|
|
|
if (UNLIKELY(unit->flag & B_UNIT_DEF_TENTH)) {
|
|
|
|
if (value_abs >= unit->scalar * (0.1 - EPS)) {
|
|
|
|
return unit;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (value_abs >= unit->scalar * (1.0 - EPS)) {
|
|
|
|
return unit;
|
|
|
|
}
|
|
|
|
}
|
2009-08-12 14:11:53 +00:00
|
|
|
}
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2009-08-12 07:23:10 +00:00
|
|
|
return unit_default(usys);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* convert into 2 units and 2 values for "2ft, 3inch" syntax */
|
2012-03-10 14:20:55 +00:00
|
|
|
static void unit_dual_convert(double value, bUnitCollection *usys, bUnitDef **unit_a, bUnitDef **unit_b,
|
|
|
|
double *value_a, double *value_b)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
2012-03-10 14:20:55 +00:00
|
|
|
bUnitDef *unit = unit_best_fit(value, usys, NULL, 1);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
*value_a = (value < 0.0 ? ceil : floor)(value / unit->scalar) * unit->scalar;
|
|
|
|
*value_b = value - (*value_a);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
*unit_a = unit;
|
|
|
|
*unit_b = unit_best_fit(*value_b, usys, *unit_a, 1);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
static size_t unit_as_string(char *str, int len_max, double value, int prec, bUnitCollection *usys,
|
|
|
|
/* non exposed options */
|
2014-07-12 09:07:51 +10:00
|
|
|
const bUnitDef *unit, char pad)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
|
|
|
double value_conv;
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
size_t len, i;
|
2012-03-10 14:20:55 +00:00
|
|
|
|
2012-02-23 02:17:50 +00:00
|
|
|
if (unit) {
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* use unit without finding the best one */
|
|
|
|
}
|
2012-02-23 02:17:50 +00:00
|
|
|
else if (value == 0.0) {
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* use the default units since there is no way to convert */
|
2012-03-10 14:20:55 +00:00
|
|
|
unit = unit_default(usys);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
else {
|
2012-03-10 14:20:55 +00:00
|
|
|
unit = unit_best_fit(value, usys, NULL, 1);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
value_conv = value / unit->scalar;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
|
|
|
/* Convert to a string */
|
2015-04-22 05:37:22 +10:00
|
|
|
len = BLI_snprintf_rlen(str, len_max, "%.*f", prec, value_conv);
|
2012-03-10 14:20:55 +00:00
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* Add unit prefix and strip zeros */
|
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
/* replace trailing zero's with spaces
|
2012-09-26 20:05:38 +00:00
|
|
|
* so the number is less complicated but alignment in a button wont
|
2009-08-13 17:05:27 +00:00
|
|
|
* jump about while dragging */
|
2012-03-10 14:20:55 +00:00
|
|
|
i = len - 1;
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2013-04-08 18:55:08 +00:00
|
|
|
if (prec > 0) {
|
|
|
|
while (i > 0 && str[i] == '0') { /* 4.300 -> 4.3 */
|
|
|
|
str[i--] = pad;
|
|
|
|
}
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2013-04-08 18:55:08 +00:00
|
|
|
if (i > 0 && str[i] == '.') { /* 10. -> 10 */
|
|
|
|
str[i--] = pad;
|
|
|
|
}
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
2012-03-10 14:20:55 +00:00
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
/* Now add the suffix */
|
2012-03-10 14:20:55 +00:00
|
|
|
if (i < len_max) {
|
|
|
|
int j = 0;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
i++;
|
2012-03-10 14:20:55 +00:00
|
|
|
while (unit->name_short[j] && (i < len_max)) {
|
|
|
|
str[i++] = unit->name_short[j++];
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
2013-12-11 21:27:13 +11:00
|
|
|
#if 0
|
2012-02-23 02:17:50 +00:00
|
|
|
if (pad) {
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* this loop only runs if so many zeros were removed that
|
|
|
|
* the unit name only used padded chars,
|
|
|
|
* In that case add padding for the name. */
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
while (i <= len + j && (i < len_max)) {
|
|
|
|
str[i++] = pad;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
}
|
2013-12-11 21:27:13 +11:00
|
|
|
#endif
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
/* terminate no matter whats done with padding above */
|
2012-02-23 02:17:50 +00:00
|
|
|
if (i >= len_max)
|
2012-03-10 14:20:55 +00:00
|
|
|
i = len_max - 1;
|
2009-08-13 17:05:27 +00:00
|
|
|
|
|
|
|
str[i] = '\0';
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
/* Used for drawing number buttons, try keep fast.
|
|
|
|
* Return the length of the generated string.
|
|
|
|
*/
|
2014-02-03 18:55:59 +11:00
|
|
|
size_t bUnit_AsString(char *str, int len_max, double value, int prec, int system, int type, bool split, bool pad)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (usys == NULL || usys->units[0].name == NULL)
|
2013-03-13 17:16:49 +00:00
|
|
|
usys = &buDummyCollection;
|
2012-03-10 14:20:55 +00:00
|
|
|
|
2010-09-22 02:44:03 +00:00
|
|
|
/* split output makes sense only for length, mass and time */
|
2013-03-13 17:16:49 +00:00
|
|
|
if (split && (type == B_UNIT_LENGTH || type == B_UNIT_MASS || type == B_UNIT_TIME || type == B_UNIT_CAMERA)) {
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
bUnitDef *unit_a, *unit_b;
|
|
|
|
double value_a, value_b;
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
unit_dual_convert(value, usys, &unit_a, &unit_b, &value_a, &value_b);
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
|
|
|
/* check the 2 is a smaller unit */
|
2012-02-23 02:17:50 +00:00
|
|
|
if (unit_b > unit_a) {
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
size_t i;
|
|
|
|
i = unit_as_string(str, len_max, value_a, prec, usys, unit_a, '\0');
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
/* is there enough space for at least 1 char of the next unit? */
|
2012-03-10 14:20:55 +00:00
|
|
|
if (i + 2 < len_max) {
|
|
|
|
str[i++] = ' ';
|
2009-08-13 17:05:27 +00:00
|
|
|
|
|
|
|
/* use low precision since this is a smaller unit */
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
i += unit_as_string(str + i, len_max - i, value_b, prec ? 1 : 0, usys, unit_b, '\0');
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
return i;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
return unit_as_string(str, len_max, value, prec, usys, NULL, pad ? ' ' : '\0');
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2014-08-20 12:31:15 +02:00
|
|
|
BLI_INLINE bool isalpha_or_utf8(const int ch)
|
2012-04-10 02:51:24 +00:00
|
|
|
{
|
|
|
|
return (ch >= 128 || isalpha(ch));
|
|
|
|
}
|
|
|
|
|
2011-11-05 11:04:28 +00:00
|
|
|
static const char *unit_find_str(const char *str, const char *substr)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
2011-11-05 11:04:28 +00:00
|
|
|
const char *str_found;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
|
2012-02-23 02:17:50 +00:00
|
|
|
if (substr && substr[0] != '\0') {
|
2012-03-10 14:20:55 +00:00
|
|
|
str_found = strstr(str, substr);
|
2012-02-23 02:17:50 +00:00
|
|
|
if (str_found) {
|
2009-08-13 17:05:27 +00:00
|
|
|
/* previous char cannot be a letter */
|
2012-04-10 02:51:24 +00:00
|
|
|
if (str_found == str ||
|
|
|
|
/* weak unicode support!, so "µm" won't match up be replaced by "m"
|
2014-04-01 11:34:00 +11:00
|
|
|
* since non ascii utf8 values will NEVER return true */
|
2012-04-10 02:51:24 +00:00
|
|
|
isalpha_or_utf8(*BLI_str_prev_char_utf8(str_found)) == 0)
|
|
|
|
{
|
2009-08-13 17:05:27 +00:00
|
|
|
/* next char cannot be alphanum */
|
|
|
|
int len_name = strlen(substr);
|
added time units, currently only used when metric or imperial are enabled.
long/short units...
day,d, hour,hr,h, minute,min,m, second,sec,s, millisecond,ms, microsecond,us
Also may fix some bugs that were reported.
Note, to convert fps to time evil_C needs to be used to get the scene.
2009-08-12 05:20:16 +00:00
|
|
|
|
2012-04-10 02:51:24 +00:00
|
|
|
if (!isalpha_or_utf8(*(str_found + len_name))) {
|
2009-08-13 17:05:27 +00:00
|
|
|
return str_found;
|
|
|
|
}
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
}
|
2009-08-13 17:05:27 +00:00
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
2009-08-13 17:05:27 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
2009-08-17 12:48:56 +00:00
|
|
|
/* Note that numbers are added within brackets
|
|
|
|
* ") " - is used to detect numbers we added so we can detect if commas need to be added
|
|
|
|
*
|
|
|
|
* "1m1cm+2mm" - Original value
|
|
|
|
* "1*1#1*0.01#+2*0.001#" - Replace numbers
|
2014-08-20 12:12:03 +02:00
|
|
|
* "1*1+1*0.01 +2*0.001 " - Add add signs if ( + - * / | & ~ < > ^ ! = % ) not found in between
|
2009-08-17 12:48:56 +00:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
/* not too strict, (+ - * /) are most common */
|
2014-02-05 22:36:15 +11:00
|
|
|
static bool ch_is_op(char op)
|
2009-08-17 12:48:56 +00:00
|
|
|
{
|
2012-03-10 14:20:55 +00:00
|
|
|
switch (op) {
|
|
|
|
case '+':
|
|
|
|
case '-':
|
|
|
|
case '*':
|
|
|
|
case '/':
|
|
|
|
case '|':
|
|
|
|
case '&':
|
|
|
|
case '~':
|
|
|
|
case '<':
|
|
|
|
case '>':
|
|
|
|
case '^':
|
|
|
|
case '!':
|
|
|
|
case '=':
|
|
|
|
case '%':
|
2014-08-20 12:31:15 +02:00
|
|
|
return true;
|
|
|
|
break;
|
2012-03-10 14:20:55 +00:00
|
|
|
default:
|
2014-08-20 12:31:15 +02:00
|
|
|
return false;
|
|
|
|
break;
|
2009-08-17 12:48:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
static int unit_scale_str(char *str, int len_max, char *str_tmp, double scale_pref, bUnitDef *unit,
|
|
|
|
const char *replace_str)
|
2009-08-13 17:05:27 +00:00
|
|
|
{
|
2009-08-14 12:29:55 +00:00
|
|
|
char *str_found;
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if ((len_max > 0) && (str_found = (char *)unit_find_str(str, replace_str))) {
|
2011-12-21 22:56:06 +00:00
|
|
|
/* XXX - investigate, does not respect len_max properly */
|
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
int len, len_num, len_name, len_move, found_ofs;
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
found_ofs = (int)(str_found - str);
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
len = strlen(str);
|
2009-08-13 17:05:27 +00:00
|
|
|
|
|
|
|
len_name = strlen(replace_str);
|
2012-03-10 14:20:55 +00:00
|
|
|
len_move = (len - (found_ofs + len_name)) + 1; /* 1+ to copy the string terminator */
|
2014-06-17 16:06:12 +02:00
|
|
|
len_num = BLI_snprintf(str_tmp, TEMP_STR_SIZE, "*%.9g"SEP_STR, unit->scalar / scale_pref); /* # removed later */
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2012-02-23 02:17:50 +00:00
|
|
|
if (len_num > len_max)
|
2012-03-10 14:20:55 +00:00
|
|
|
len_num = len_max;
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (found_ofs + len_num + len_move > len_max) {
|
2009-08-13 17:05:27 +00:00
|
|
|
/* can't move the whole string, move just as much as will fit */
|
2012-03-10 14:20:55 +00:00
|
|
|
len_move -= (found_ofs + len_num + len_move) - len_max;
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (len_move > 0) {
|
2009-08-13 17:05:27 +00:00
|
|
|
/* resize the last part of the string */
|
2012-03-10 14:20:55 +00:00
|
|
|
memmove(str_found + len_num, str_found + len_name, len_move); /* may grow or shrink the string */
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (found_ofs + len_num > len_max) {
|
2009-08-13 17:05:27 +00:00
|
|
|
/* not even the number will fit into the string, only copy part of it */
|
2012-03-10 14:20:55 +00:00
|
|
|
len_num -= (found_ofs + len_num) - len_max;
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
|
|
|
|
2012-02-23 02:17:50 +00:00
|
|
|
if (len_num > 0) {
|
2009-08-13 17:05:27 +00:00
|
|
|
/* its possible none of the number could be copied in */
|
|
|
|
memcpy(str_found, str_tmp, len_num); /* without the string terminator */
|
|
|
|
}
|
|
|
|
|
2009-08-14 12:29:55 +00:00
|
|
|
/* since the null terminator wont be moved if the stringlen_max
|
|
|
|
* was not long enough to fit everything in it */
|
2012-03-10 14:20:55 +00:00
|
|
|
str[len_max - 1] = '\0';
|
2009-08-14 12:29:55 +00:00
|
|
|
return found_ofs + len_num;
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
|
|
|
return 0;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2009-08-13 17:05:27 +00:00
|
|
|
static int unit_replace(char *str, int len_max, char *str_tmp, double scale_pref, bUnitDef *unit)
|
2012-03-10 14:20:55 +00:00
|
|
|
{
|
|
|
|
int ofs = 0;
|
|
|
|
ofs += unit_scale_str(str + ofs, len_max - ofs, str_tmp, scale_pref, unit, unit->name_short);
|
|
|
|
ofs += unit_scale_str(str + ofs, len_max - ofs, str_tmp, scale_pref, unit, unit->name_plural);
|
|
|
|
ofs += unit_scale_str(str + ofs, len_max - ofs, str_tmp, scale_pref, unit, unit->name_alt);
|
|
|
|
ofs += unit_scale_str(str + ofs, len_max - ofs, str_tmp, scale_pref, unit, unit->name);
|
2009-08-14 12:29:55 +00:00
|
|
|
return ofs;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
|
|
|
|
2014-08-20 12:31:15 +02:00
|
|
|
static bool unit_find(const char *str, bUnitDef *unit)
|
2009-08-13 17:05:27 +00:00
|
|
|
{
|
2014-08-20 12:31:15 +02:00
|
|
|
if (unit_find_str(str, unit->name_short)) return true;
|
|
|
|
if (unit_find_str(str, unit->name_plural)) return true;
|
|
|
|
if (unit_find_str(str, unit->name_alt)) return true;
|
|
|
|
if (unit_find_str(str, unit->name)) return true;
|
2009-08-13 17:05:27 +00:00
|
|
|
|
2014-08-20 12:31:15 +02:00
|
|
|
return false;
|
2009-08-13 17:05:27 +00:00
|
|
|
}
|
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
static bUnitDef *unit_detect_from_str(bUnitCollection *usys, const char *str, const char *str_prev)
|
|
|
|
{
|
|
|
|
/* Try to find a default unit from current or previous string.
|
|
|
|
* This allows us to handle cases like 2 + 2mm, people would expect to get 4mm, not 2.002m!
|
|
|
|
* Note this does not handle corner cases like 2 + 2cm + 1 + 2.5mm... We can't support everything. */
|
|
|
|
bUnitDef *unit = NULL;
|
|
|
|
|
|
|
|
/* see which units the new value has */
|
|
|
|
for (unit = usys->units; unit->name; unit++) {
|
|
|
|
if (unit_find(str, unit))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* Else, try to infer the default unit from the previous string. */
|
|
|
|
if (str_prev && (unit == NULL || unit->name == NULL)) {
|
|
|
|
/* see which units the original value had */
|
|
|
|
for (unit = usys->units; unit->name; unit++) {
|
|
|
|
if (unit_find(str_prev, unit))
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* Else, fall back to default unit. */
|
|
|
|
if (unit == NULL || unit->name == NULL) {
|
|
|
|
unit = unit_default(usys);
|
|
|
|
}
|
|
|
|
|
|
|
|
return unit;
|
|
|
|
}
|
|
|
|
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
/* make a copy of the string that replaces the units with numbers
|
|
|
|
* this is used before parsing
|
|
|
|
* This is only used when evaluating user input and can afford to be a bit slower
|
2012-03-10 14:20:55 +00:00
|
|
|
*
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
* This is to be used before python evaluation so..
|
|
|
|
* 10.1km -> 10.1*1000.0
|
|
|
|
* ...will be resolved by python.
|
2012-03-10 14:20:55 +00:00
|
|
|
*
|
2014-08-20 12:12:03 +02:00
|
|
|
* values will be split by an add sign
|
|
|
|
* 5'2" -> 5*0.3048 + 2*0.0254
|
2009-08-17 12:48:56 +00:00
|
|
|
*
|
2009-08-12 07:23:10 +00:00
|
|
|
* str_prev is optional, when valid it is used to get a base unit when none is set.
|
|
|
|
*
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
* return true of a change was made.
|
|
|
|
*/
|
2014-08-20 12:31:15 +02:00
|
|
|
bool bUnit_ReplaceString(char *str, int len_max, const char *str_prev, double scale_pref, int system, int type)
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
2009-08-12 07:23:10 +00:00
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
bUnitDef *unit = NULL, *default_unit;
|
|
|
|
double scale_pref_base = scale_pref;
|
2009-08-13 17:05:27 +00:00
|
|
|
char str_tmp[TEMP_STR_SIZE];
|
2014-08-20 12:31:15 +02:00
|
|
|
bool changed = false;
|
2009-08-12 05:53:12 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (usys == NULL || usys->units[0].name == NULL) {
|
2014-08-20 12:31:15 +02:00
|
|
|
return changed;
|
2009-08-12 05:53:12 +00:00
|
|
|
}
|
2009-08-17 12:48:56 +00:00
|
|
|
|
Support units in modal numinput
Summary:
This completly changes the way modal numinput is handled. Now, edited expression is a string, which then gets unit- and py-evaluated to get a float value.
We gain many power and flexibility, but lose a few "shortcuts" like '-' to negate, or '/' to inverse (if they are really needed, we still can add them with modifiers, like e.g. ctrl-/ or so).
Features:
- units (cm, ", deg, etc.).
- basic operations from python/BKE_unit (+, *, **, etc.), and math constants and functions (pi, sin, etc.).
- you can navigate in edited value (left/right key, ctrl to move by block) and insert/delete chars, e.g. to fix a typo without having to rewrite everything.
- you can go to next/previous value with (ctrl-)TAB key.
- As before, hitting backspace after having deleted all leading chars will first reset the edited value to init state, and on second press, the whole "modal numinput" editing will be cancelled, going back to usual transform with mouse.
Notes:
- Did not touch to how values are shown in header when modal numinput is not enabled (would do that in another commit), so this is still quite inconsistent.
- Added back radian support in BKE_unit.
- Added arcminute/arcsecond to BKE_unit.
(those unit changes affect all angle UI controls, btw, so you can now enter radians or longitude/latitude values when in degrees units).
Related to T37600.
Reviewers: brecht, campbellbarton, carter2422
Reviewed By: brecht, campbellbarton, carter2422
Thanks everybody!
Differential Revision: http://developer.blender.org/D61
2013-12-21 17:11:43 +01:00
|
|
|
/* make lowercase */
|
2015-07-14 09:17:00 +10:00
|
|
|
BLI_str_tolower_ascii(str, len_max);
|
2009-08-17 12:48:56 +00:00
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
/* Try to find a default unit from current or previous string. */
|
|
|
|
default_unit = unit_detect_from_str(usys, str, str_prev);
|
|
|
|
|
|
|
|
/* We apply the default unit to the whole expression (default unit is now the reference '1.0' one). */
|
|
|
|
scale_pref_base *= default_unit->scalar;
|
|
|
|
|
|
|
|
/* Apply the default unit on the whole expression, this allows to handle nasty cases like '2+2in'. */
|
|
|
|
if (BLI_snprintf(str_tmp, sizeof(str_tmp), "(%s)*%.9g", str, default_unit->scalar) < sizeof(str_tmp)) {
|
|
|
|
strncpy(str, str_tmp, len_max);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* BLI_snprintf would not fit into str_tmp, cant do much in this case
|
|
|
|
* check for this because otherwise bUnit_ReplaceString could call its self forever */
|
2014-08-20 12:31:15 +02:00
|
|
|
return changed;
|
2014-08-20 12:12:03 +02:00
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
for (unit = usys->units; unit->name; unit++) {
|
2012-03-09 00:41:09 +00:00
|
|
|
/* in case there are multiple instances */
|
2014-08-20 12:12:03 +02:00
|
|
|
while (unit_replace(str, len_max, str_tmp, scale_pref_base, unit))
|
2013-11-26 06:39:14 +11:00
|
|
|
changed = true;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
2012-03-10 14:20:55 +00:00
|
|
|
unit = NULL;
|
2009-08-12 07:23:10 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
/* try other unit systems now, so we can evaluate imperial when metric is set for eg. */
|
2014-08-20 12:12:03 +02:00
|
|
|
/* Note that checking other systems at that point means we do not support their units as 'default' one.
|
|
|
|
* In other words, when in metrics, typing '2+2in' will give 2 meters 2 inches, not 4 inches.
|
|
|
|
* I do think this is the desired behavior!
|
|
|
|
*/
|
2009-08-12 07:23:10 +00:00
|
|
|
bUnitCollection *usys_iter;
|
|
|
|
int system_iter;
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
for (system_iter = 0; system_iter < UNIT_SYSTEM_TOT; system_iter++) {
|
2009-08-12 07:23:10 +00:00
|
|
|
if (system_iter != system) {
|
2012-03-10 14:20:55 +00:00
|
|
|
usys_iter = unit_get_system(system_iter, type);
|
2010-01-25 06:24:05 +00:00
|
|
|
if (usys_iter) {
|
2012-03-10 14:20:55 +00:00
|
|
|
for (unit = usys_iter->units; unit->name; unit++) {
|
2010-09-22 02:47:08 +00:00
|
|
|
int ofs = 0;
|
2012-03-09 00:41:09 +00:00
|
|
|
/* in case there are multiple instances */
|
2014-08-20 12:12:03 +02:00
|
|
|
while ((ofs = unit_replace(str + ofs, len_max - ofs, str_tmp, scale_pref_base, unit)))
|
2013-11-26 06:39:14 +11:00
|
|
|
changed = true;
|
2009-08-14 12:29:55 +00:00
|
|
|
}
|
2009-08-12 07:23:10 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-03-10 14:20:55 +00:00
|
|
|
unit = NULL;
|
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
/* replace # with add sign when there is no operator between it and the next number
|
2009-08-17 12:48:56 +00:00
|
|
|
*
|
2014-08-20 12:12:03 +02:00
|
|
|
* "1*1# 3*100# * 3" -> "1*1+ 3*100 * 3"
|
2009-08-17 12:48:56 +00:00
|
|
|
*
|
|
|
|
* */
|
|
|
|
{
|
2012-03-10 14:20:55 +00:00
|
|
|
char *str_found = str;
|
2014-04-27 00:20:13 +10:00
|
|
|
const char *ch = str;
|
2009-08-17 12:48:56 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
while ((str_found = strchr(str_found, SEP_CHR))) {
|
2014-08-20 12:12:03 +02:00
|
|
|
bool op_found = false;
|
2009-08-12 07:23:10 +00:00
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
/* any operators after this? */
|
2012-03-10 14:20:55 +00:00
|
|
|
for (ch = str_found + 1; *ch != '\0'; ch++) {
|
|
|
|
if (*ch == ' ' || *ch == '\t') {
|
2014-08-20 12:12:03 +02:00
|
|
|
continue;
|
2009-08-17 12:48:56 +00:00
|
|
|
}
|
2014-08-20 12:12:03 +02:00
|
|
|
op_found = (ch_is_op(*ch) || ELEM(*ch, ',', ')'));
|
|
|
|
break;
|
2009-08-17 12:48:56 +00:00
|
|
|
}
|
|
|
|
|
2014-08-20 12:12:03 +02:00
|
|
|
/* If found an op, comma or closing parenthesis, no need to insert a '+', else we need it. */
|
|
|
|
*str_found++ = op_found ? ' ' : '+';
|
2009-08-17 12:48:56 +00:00
|
|
|
}
|
2009-08-12 07:23:10 +00:00
|
|
|
}
|
|
|
|
|
2013-11-26 06:39:14 +11:00
|
|
|
return changed;
|
user interface units, off by default.
- currently only distances work.
- user preferences, edit section to set the units and scale.
- option to display pairs (nicer for imperial display?)
- support for evaluating multiple comma separated values eg: 2',11" ..or.. 5ft, 4mil
- comma separated expressions/values accumulate 1+1,2**3,4cm/3
- attempted fast conversion from a value to a string so button drawing isn't too slow.
* imperial long/short *
- mile, mi
- yard, yd
- foot, '
- inch, "
- thou, mil
* metric long/short *
kilometer, km
meter, m
centimeter, cm
millimeter, mm
micrometer, um
nanometer, nm
picometer, pm
2009-08-11 18:53:01 +00:00
|
|
|
}
|
2009-08-12 08:16:10 +00:00
|
|
|
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
/* 45µm --> 45um */
|
2011-11-05 11:04:28 +00:00
|
|
|
void bUnit_ToUnitAltName(char *str, int len_max, const char *orig_str, int system, int type)
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
|
|
|
|
|
|
|
bUnitDef *unit;
|
2012-03-10 14:20:55 +00:00
|
|
|
bUnitDef *unit_def = unit_default(usys);
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
|
|
|
|
/* find and substitute all units */
|
2012-03-10 14:20:55 +00:00
|
|
|
for (unit = usys->units; unit->name; unit++) {
|
2012-03-06 18:40:15 +00:00
|
|
|
if (len_max > 0 && (unit->name_alt || unit == unit_def)) {
|
2012-03-10 14:20:55 +00:00
|
|
|
const char *found = unit_find_str(orig_str, unit->name_short);
|
2012-02-23 02:17:50 +00:00
|
|
|
if (found) {
|
2012-03-10 14:20:55 +00:00
|
|
|
int offset = (int)(found - orig_str);
|
|
|
|
int len_name = 0;
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
|
|
|
|
/* copy everything before the unit */
|
2012-03-10 14:20:55 +00:00
|
|
|
offset = (offset < len_max ? offset : len_max);
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
strncpy(str, orig_str, offset);
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
str += offset;
|
|
|
|
orig_str += offset + strlen(unit->name_short);
|
|
|
|
len_max -= offset;
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
|
|
|
|
/* print the alt_name */
|
2012-02-23 02:17:50 +00:00
|
|
|
if (unit->name_alt)
|
2013-03-14 10:39:18 +00:00
|
|
|
len_name = BLI_strncpy_rlen(str, unit->name_alt, len_max);
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
else
|
2012-03-10 14:20:55 +00:00
|
|
|
len_name = 0;
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
len_name = (len_name < len_max ? len_name : len_max);
|
|
|
|
str += len_name;
|
|
|
|
len_max -= len_name;
|
patch [#23758] Better handling of UTF chars in UNITS fields (lengths, angles, etc.)
from Lorenzo Tozzi (oni_niubbo) with minor edits.
--- from the tracker
The present situation is this: due to bug#22274, during editing, UTF chars are stripped from buttons with a unit associated
(length, angles, etc.).
Example: if the button displays '90°' and you click on it with LMB, the editing string will become '90'.
The problem arises if you use microns: '34µm' becomes '34' that blender interprets as 34 meters. So clicking on a button
and hitting enter won't confirm the previous value, but will change it (very badly also).
Of course nobody is using microns in blender, but the problem will arise when we will implement areas and option 'Separate
Units' will be enabled. The value '2m² 3cm²' will become '2m' during editing.
This patch solves the problem rewriting the string in a smarter way than just stripping the UTF chars: the unit is translated
from unit->name_short ('µm') to unit->name_alt ('um'). So clicking on '34µm' the editing string will become
'34um'.
--- end
note: rather then allowing empty strings in name_alt field I made it so if the unit system was the default one a NULL name_alt will just strip the string, since its the default its not needed.
2010-09-15 17:37:00 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* finally copy the rest of the string */
|
|
|
|
strncpy(str, orig_str, len_max);
|
|
|
|
}
|
2009-08-12 08:16:10 +00:00
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
double bUnit_ClosestScalar(double value, int system, int type)
|
2009-08-12 08:16:10 +00:00
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
|
|
|
bUnitDef *unit;
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (usys == NULL)
|
2009-08-12 08:16:10 +00:00
|
|
|
return -1;
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
unit = unit_best_fit(value, usys, NULL, 1);
|
|
|
|
if (unit == NULL)
|
2009-08-12 08:16:10 +00:00
|
|
|
return -1;
|
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
return unit->scalar;
|
|
|
|
}
|
|
|
|
|
2009-08-12 17:02:03 +00:00
|
|
|
double bUnit_BaseScalar(int system, int type)
|
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
|
|
|
return unit_default(usys)->scalar;
|
|
|
|
}
|
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
/* external access */
|
2014-08-20 12:31:15 +02:00
|
|
|
bool bUnit_IsValid(int system, int type)
|
2010-09-16 04:19:22 +00:00
|
|
|
{
|
2010-12-10 04:10:21 +00:00
|
|
|
return !(system < 0 || system > UNIT_SYSTEM_TOT || type < 0 || type > B_UNIT_TYPE_TOT);
|
2010-09-16 04:19:22 +00:00
|
|
|
}
|
|
|
|
|
2009-08-12 14:11:53 +00:00
|
|
|
void bUnit_GetSystem(void **usys_pt, int *len, int system, int type)
|
|
|
|
{
|
|
|
|
bUnitCollection *usys = unit_get_system(system, type);
|
2012-03-10 14:20:55 +00:00
|
|
|
*usys_pt = usys;
|
2009-08-12 14:11:53 +00:00
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
if (usys == NULL) {
|
|
|
|
*len = 0;
|
2009-08-12 14:11:53 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-03-10 14:20:55 +00:00
|
|
|
*len = usys->length;
|
2009-08-12 14:11:53 +00:00
|
|
|
}
|
|
|
|
|
2010-11-23 17:14:03 +00:00
|
|
|
int bUnit_GetBaseUnit(void *usys_pt)
|
|
|
|
{
|
|
|
|
return ((bUnitCollection *)usys_pt)->base_unit;
|
|
|
|
}
|
|
|
|
|
2010-11-23 14:14:06 +00:00
|
|
|
const char *bUnit_GetName(void *usys_pt, int index)
|
2009-08-12 14:11:53 +00:00
|
|
|
{
|
|
|
|
return ((bUnitCollection *)usys_pt)->units[index].name;
|
|
|
|
}
|
2010-11-23 14:14:06 +00:00
|
|
|
const char *bUnit_GetNameDisplay(void *usys_pt, int index)
|
2009-08-12 14:11:53 +00:00
|
|
|
{
|
2009-08-17 12:48:56 +00:00
|
|
|
return ((bUnitCollection *)usys_pt)->units[index].name_display;
|
2009-08-12 14:11:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
double bUnit_GetScaler(void *usys_pt, int index)
|
|
|
|
{
|
|
|
|
return ((bUnitCollection *)usys_pt)->units[index].scalar;
|
2009-08-12 08:16:10 +00:00
|
|
|
}
|