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

1 files changed, 144 insertions, 111 deletions

diff --git a/source/blender/editors/mesh/editmesh_inset.c b/source/blender/editors/mesh/editmesh_inset.c
index 137554459ce..5f23a5deb97 100644
--- a/source/blender/editors/mesh/editmesh_inset.c
+++ b/source/blender/editors/mesh/editmesh_inset.c
@@ -36,6 +36,7 @@
 #include "BKE_context.h"
 #include "BKE_global.h"
 #include "BKE_editmesh.h"
+#include "BKE_unit.h"
 
 #include "RNA_define.h"
 #include "RNA_access.h"
@@ -110,6 +111,7 @@ static void edbm_inset_update_header(wmOperator *op, bContext *C)
 static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 {
 	InsetData *opdata;
+	Scene *scene = CTX_data_scene(C);
 	Object *obedit = CTX_data_edit_object(C);
 	BMEditMesh *em = BKE_editmesh_from_object(obedit);
 
@@ -129,6 +131,9 @@ static bool edbm_inset_init(bContext *C, wmOperator *op, const bool is_modal)
 
 	initNumInput(&opdata->num_input);
 	opdata->num_input.idx_max = 1; /* Two elements. */
+	opdata->num_input.unit_sys = scene->unit.system;
+	opdata->num_input.unit_type[0] = B_UNIT_LENGTH;
+	opdata->num_input.unit_type[1] = B_UNIT_LENGTH;
 
 	if (is_modal) {
 		View3D *v3d = CTX_wm_view3d(C);
@@ -291,10 +296,9 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 {
 	InsetData *opdata = op->customdata;
 
-	if (event->val == KM_PRESS) {
-		/* Try to handle numeric inputs... */
-
-		if (handleNumInput(&opdata->num_input, event)) {
+	if (event->val == KM_PRESS && hasNumInput(&opdata->num_input)) {
+		/* Modal numinput active, try to handle numeric inputs first... */
+		if (handleNumInput(C, &opdata->num_input, event)) {
 			float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
 			                    RNA_float_get(op->ptr, "depth")};
 			applyNumInput(&opdata->num_input, amounts);
@@ -312,134 +316,163 @@ static int edbm_inset_modal(bContext *C, wmOperator *op, const wmEvent *event)
 			}
 		}
 	}
+	else {
+		bool handled = false;
+		switch (event->type) {
+			case ESCKEY:
+			case RIGHTMOUSE:
+				edbm_inset_cancel(C, op);
+				return OPERATOR_CANCELLED;
 
-	switch (event->type) {
-		case ESCKEY:
-		case RIGHTMOUSE:
-			edbm_inset_cancel(C, op);
-			return OPERATOR_CANCELLED;
-
-		case MOUSEMOVE:
-			if (!hasNumInput(&opdata->num_input)) {
-				float mdiff[2];
-				float amount;
-
-				mdiff[0] = opdata->mcenter[0] - event->mval[0];
-				mdiff[1] = opdata->mcenter[1] - event->mval[1];
-
-				if (opdata->modify_depth)
-					amount = opdata->old_depth     + ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
-				else
-					amount = opdata->old_thickness - ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
-
-				/* Fake shift-transform... */
-				if (opdata->shift)
-					amount = (amount - opdata->shift_amount) * 0.1f + opdata->shift_amount;
-
-				if (opdata->modify_depth)
-					RNA_float_set(op->ptr, "depth", amount);
-				else {
-					amount = max_ff(amount, 0.0f);
-					RNA_float_set(op->ptr, "thickness", amount);
+			case MOUSEMOVE:
+				if (!hasNumInput(&opdata->num_input)) {
+					float mdiff[2];
+					float amount;
+
+					mdiff[0] = opdata->mcenter[0] - event->mval[0];
+					mdiff[1] = opdata->mcenter[1] - event->mval[1];
+
+					if (opdata->modify_depth)
+						amount = opdata->old_depth     + ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
+					else
+						amount = opdata->old_thickness - ((len_v2(mdiff) - opdata->initial_length) * opdata->pixel_size);
+
+					/* Fake shift-transform... */
+					if (opdata->shift)
+						amount = (amount - opdata->shift_amount) * 0.1f + opdata->shift_amount;
+
+					if (opdata->modify_depth)
+						RNA_float_set(op->ptr, "depth", amount);
+					else {
+						amount = max_ff(amount, 0.0f);
+						RNA_float_set(op->ptr, "thickness", amount);
+					}
+
+					if (edbm_inset_calc(op))
+						edbm_inset_update_header(op, C);
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
+				}
+				break;
+
+			case LEFTMOUSE:
+			case PADENTER:
+			case RETKEY:
+				edbm_inset_calc(op);
+				edbm_inset_exit(C, op);
+				return OPERATOR_FINISHED;
+
+			case LEFTSHIFTKEY:
+			case RIGHTSHIFTKEY:
+				if (event->val == KM_PRESS) {
+					if (opdata->modify_depth)
+						opdata->shift_amount = RNA_float_get(op->ptr, "depth");
+					else
+						opdata->shift_amount = RNA_float_get(op->ptr, "thickness");
+					opdata->shift = true;
+					handled = true;
 				}
-
-				if (edbm_inset_calc(op))
-					edbm_inset_update_header(op, C);
 				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+					opdata->shift_amount = 0.0f;
+					opdata->shift = false;
+					handled = true;
 				}
-			}
-			break;
-
-		case LEFTMOUSE:
-		case PADENTER:
-		case RETKEY:
-			edbm_inset_calc(op);
-			edbm_inset_exit(C, op);
-			return OPERATOR_FINISHED;
-
-		case LEFTSHIFTKEY:
-		case RIGHTSHIFTKEY:
-			if (event->val == KM_PRESS) {
-				if (opdata->modify_depth)
-					opdata->shift_amount = RNA_float_get(op->ptr, "depth");
-				else
-					opdata->shift_amount = RNA_float_get(op->ptr, "thickness");
-				opdata->shift = true;
-			}
-			else {
-				opdata->shift_amount = 0.0f;
-				opdata->shift = false;
-			}
-			break;
-
-		case LEFTCTRLKEY:
-		case RIGHTCTRLKEY:
-		{
-			float mlen[2];
+				break;
 
-			mlen[0] = opdata->mcenter[0] - event->mval[0];
-			mlen[1] = opdata->mcenter[1] - event->mval[1];
-
-			if (event->val == KM_PRESS) {
-				opdata->old_thickness = RNA_float_get(op->ptr, "thickness");
-				if (opdata->shift)
-					opdata->shift_amount = opdata->old_thickness;
-				opdata->modify_depth = true;
-			}
-			else {
-				opdata->old_depth = RNA_float_get(op->ptr, "depth");
-				if (opdata->shift)
-					opdata->shift_amount = opdata->old_depth;
-				opdata->modify_depth = false;
-			}
-			opdata->initial_length = len_v2(mlen);
+			case LEFTCTRLKEY:
+			case RIGHTCTRLKEY:
+			{
+				float mlen[2];
 
-			edbm_inset_update_header(op, C);
-			break;
-		}
+				mlen[0] = opdata->mcenter[0] - event->mval[0];
+				mlen[1] = opdata->mcenter[1] - event->mval[1];
 
-		case OKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_outset = RNA_boolean_get(op->ptr, "use_outset");
-				RNA_boolean_set(op->ptr, "use_outset", !use_outset);
-				if (edbm_inset_calc(op)) {
-					edbm_inset_update_header(op, C);
+				if (event->val == KM_PRESS) {
+					opdata->old_thickness = RNA_float_get(op->ptr, "thickness");
+					if (opdata->shift)
+						opdata->shift_amount = opdata->old_thickness;
+					opdata->modify_depth = true;
 				}
 				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+					opdata->old_depth = RNA_float_get(op->ptr, "depth");
+					if (opdata->shift)
+						opdata->shift_amount = opdata->old_depth;
+					opdata->modify_depth = false;
 				}
+				opdata->initial_length = len_v2(mlen);
+
+				edbm_inset_update_header(op, C);
+				handled = true;
+				break;
 			}
-			break;
-		case BKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
-				RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
-				if (edbm_inset_calc(op)) {
-					edbm_inset_update_header(op, C);
+
+			case OKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_outset = RNA_boolean_get(op->ptr, "use_outset");
+					RNA_boolean_set(op->ptr, "use_outset", !use_outset);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
 				}
-				else {
-					edbm_inset_cancel(C, op);
-					return OPERATOR_CANCELLED;
+				break;
+			case BKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_boundary = RNA_boolean_get(op->ptr, "use_boundary");
+					RNA_boolean_set(op->ptr, "use_boundary", !use_boundary);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
 				}
-			}
-			break;
-		case IKEY:
-			if (event->val == KM_PRESS) {
-				const bool use_individual = RNA_boolean_get(op->ptr, "use_individual");
-				RNA_boolean_set(op->ptr, "use_individual", !use_individual);
+				break;
+			case IKEY:
+				if (event->val == KM_PRESS) {
+					const bool use_individual = RNA_boolean_get(op->ptr, "use_individual");
+					RNA_boolean_set(op->ptr, "use_individual", !use_individual);
+					if (edbm_inset_calc(op)) {
+						edbm_inset_update_header(op, C);
+					}
+					else {
+						edbm_inset_cancel(C, op);
+						return OPERATOR_CANCELLED;
+					}
+					handled = true;
+				}
+				break;
+		}
+
+		if (!handled && event->val == KM_PRESS) {
+			/* Modal numinput inactive, try to handle numeric inputs last... */
+			if (handleNumInput(C, &opdata->num_input, event)) {
+				float amounts[2] = {RNA_float_get(op->ptr, "thickness"),
+				                    RNA_float_get(op->ptr, "depth")};
+				applyNumInput(&opdata->num_input, amounts);
+				amounts[0] = max_ff(amounts[0], 0.0f);
+				RNA_float_set(op->ptr, "thickness", amounts[0]);
+				RNA_float_set(op->ptr, "depth", amounts[1]);
+
 				if (edbm_inset_calc(op)) {
 					edbm_inset_update_header(op, C);
+					return OPERATOR_RUNNING_MODAL;
 				}
 				else {
 					edbm_inset_cancel(C, op);
 					return OPERATOR_CANCELLED;
 				}
 			}
-			break;
-
+		}
 	}
 
 	return OPERATOR_RUNNING_MODAL;