diff --git a/web/app/app-init.js b/web/app/app-init.js index 9fda5836..93a8b7a0 100644 --- a/web/app/app-init.js +++ b/web/app/app-init.js @@ -26,7 +26,13 @@ function start() { function infoStr(c) { if (c.SettableFields === undefined) return ""; var info = Object.keys(c.SettableFields).map(function(f) { - return Number(c[f]).toFixed(2); + var val = c[f]; + var num = Number(val); + if (isNaN(num)) { + num = Number(app.viewer.parametricManager.constantResolver(val)); + return val + "(" + (isNaN(num) ? "?" : num.toFixed(2)) + ")" ; + } + return num.toFixed(2); }).join(", "); if (info.length != 0) { info = " [" + info + "]"; @@ -76,8 +82,12 @@ function start() { for (var f in c.SettableFields) { var value = c[f]; var intro = c.SettableFields[f]; - value = TCAD.TWO.utils.askNumber(intro, value.toFixed(4), prompt); - c[f] = value; + + + value = TCAD.TWO.utils.askNumber(intro, typeof(value) == "number" ? value.toFixed(4) : value, prompt, pm.constantResolver); + if (value != null) { + c[f] = value; + } } app.viewer.parametricManager.refresh(); } @@ -161,13 +171,21 @@ function start() { app.viewer.bus.subscribe('dimScale', function(value) { dimScale.input.val(value); }); - app.dock.views['Dimensions'].node.append($('