Revert to calc before tests
This commit is contained in:
@@ -193,7 +193,7 @@ function toExponential(num, precision) {
|
|||||||
|
|
||||||
function fixFloat(n) {
|
function fixFloat(n) {
|
||||||
if (Math.abs(n) < 1e-10) return 0;
|
if (Math.abs(n) < 1e-10) return 0;
|
||||||
return parseFloat(n.toPrecision(14));
|
return n;
|
||||||
}
|
}
|
||||||
|
|
||||||
function addSeparators(s) {
|
function addSeparators(s) {
|
||||||
@@ -364,8 +364,6 @@ function buttonPress(val) {
|
|||||||
operator = null;
|
operator = null;
|
||||||
prevExpression = null;
|
prevExpression = null;
|
||||||
currExpression = "";
|
currExpression = "";
|
||||||
angleMode = 'deg';
|
|
||||||
scientificOperators.angleMode.val = angleMode;
|
|
||||||
} else {
|
} else {
|
||||||
specials.R.val = 'AC';
|
specials.R.val = 'AC';
|
||||||
drawKey('R', specials.R, true);
|
drawKey('R', specials.R, true);
|
||||||
@@ -390,7 +388,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "sqrt(" + prevExpression + ")";
|
prevExpression = "sqrt(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
currNumber = Math.sqrt(parseFloat(currNumber));
|
currNumber = Math.sqrt(currNumber);
|
||||||
displayOutput(currNumber);
|
displayOutput(currNumber);
|
||||||
currExpression = "sqrt(" + currExpression + ")";
|
currExpression = "sqrt(" + currExpression + ")";
|
||||||
}
|
}
|
||||||
@@ -419,7 +417,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "sin(" + prevExpression + ")";
|
prevExpression = "sin(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
let angle = parseFloat(currNumber);
|
let angle = currNumber;
|
||||||
if (angleMode === 'deg') {
|
if (angleMode === 'deg') {
|
||||||
angle = angle * Math.PI / 180;
|
angle = angle * Math.PI / 180;
|
||||||
}
|
}
|
||||||
@@ -439,7 +437,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "cos(" + prevExpression + ")";
|
prevExpression = "cos(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
let angle = parseFloat(currNumber);
|
let angle = currNumber;
|
||||||
if (angleMode === 'deg') {
|
if (angleMode === 'deg') {
|
||||||
angle = angle * Math.PI / 180;
|
angle = angle * Math.PI / 180;
|
||||||
}
|
}
|
||||||
@@ -459,7 +457,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "tan(" + prevExpression + ")";
|
prevExpression = "tan(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
let angle = parseFloat(currNumber);
|
let angle = currNumber;
|
||||||
if (angleMode === 'deg') {
|
if (angleMode === 'deg') {
|
||||||
angle = angle * Math.PI / 180;
|
angle = angle * Math.PI / 180;
|
||||||
}
|
}
|
||||||
@@ -475,7 +473,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "log(" + prevExpression + ")";
|
prevExpression = "log(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
currNumber = Math.log(parseFloat(currNumber)) / Math.LN10;
|
currNumber = Math.log(currNumber) / Math.LN10;
|
||||||
displayOutput(currNumber);
|
displayOutput(currNumber);
|
||||||
currExpression = "log(" + currExpression + ")";
|
currExpression = "log(" + currExpression + ")";
|
||||||
}
|
}
|
||||||
@@ -487,7 +485,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "10^(" + prevExpression + ")";
|
prevExpression = "10^(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
currNumber = Math.pow(10, parseFloat(currNumber));
|
currNumber = Math.pow(10, currNumber);
|
||||||
displayOutput(currNumber);
|
displayOutput(currNumber);
|
||||||
currExpression = "10^(" + currExpression + ")";
|
currExpression = "10^(" + currExpression + ")";
|
||||||
}
|
}
|
||||||
@@ -499,7 +497,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "ln(" + prevExpression + ")";
|
prevExpression = "ln(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
currNumber = Math.log(parseFloat(currNumber));
|
currNumber = Math.log(currNumber);
|
||||||
displayOutput(currNumber);
|
displayOutput(currNumber);
|
||||||
currExpression = "ln(" + currExpression + ")";
|
currExpression = "ln(" + currExpression + ")";
|
||||||
}
|
}
|
||||||
@@ -511,7 +509,7 @@ function buttonPress(val) {
|
|||||||
displayOutput(results);
|
displayOutput(results);
|
||||||
prevExpression = "e^(" + prevExpression + ")";
|
prevExpression = "e^(" + prevExpression + ")";
|
||||||
} else if (currNumber != null) {
|
} else if (currNumber != null) {
|
||||||
currNumber = Math.exp(parseFloat(currNumber));
|
currNumber = Math.exp(currNumber);
|
||||||
displayOutput(currNumber);
|
displayOutput(currNumber);
|
||||||
currExpression = "e^(" + currExpression + ")";
|
currExpression = "e^(" + currExpression + ")";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user