Added clear button, slight reformatting of analyser.js
This commit is contained in:
parent
9d96a0b7cd
commit
5e2d5ba19d
41
analyser.js
41
analyser.js
@ -7,6 +7,8 @@ var dataROA = [];
|
||||
var dataElong = [];
|
||||
var dataDelta = [];
|
||||
|
||||
///// START OF MATHS FUNCTIONS /////
|
||||
|
||||
// This function gets the reduction of area with two provided sizes, and returns it
|
||||
function getReduction(startSize, finalSize) {
|
||||
var startArea = Math.PI * ((startSize / 2) * (startSize / 2));
|
||||
@ -25,6 +27,20 @@ function getDelta(startSize, finalSize, angle) {
|
||||
return ((startSize + finalSize) / (startSize - finalSize)) * Math.sin(angle);
|
||||
}
|
||||
|
||||
function toMillimetres(size) { //convert to mm
|
||||
size = Math.round((size * 100) * 25.4) / 100;
|
||||
return size;
|
||||
}
|
||||
|
||||
function toInches(size) { //convert to inches
|
||||
size = Math.round((size * 1000) / 25.4) / 1000;
|
||||
return size;
|
||||
}
|
||||
|
||||
///// END OF MATHS SECTION /////
|
||||
|
||||
///// START OF DISPLAY SECTION /////
|
||||
|
||||
function addReduction() {
|
||||
numDies ++; // Increment our die count
|
||||
|
||||
@ -58,6 +74,10 @@ function removeReduction() { // function to remove the last row
|
||||
}
|
||||
}
|
||||
|
||||
///// END OF DISPLAY SECTION /////
|
||||
|
||||
///// START OF ALGORITHMS SECTION /////
|
||||
|
||||
function doMath() {
|
||||
outputVisible = 1; // set visible status to enabled
|
||||
outputTable = document.getElementById("output"); // Select our output data table
|
||||
@ -237,13 +257,20 @@ function drawGraph() {
|
||||
});
|
||||
}
|
||||
|
||||
function toMillimetres(size) { //convert to mm
|
||||
size = Math.round((size * 100) * 25.4) / 100;
|
||||
return size;
|
||||
function clearScreen() {
|
||||
// Reset variables back to defaults
|
||||
numDies = 2;
|
||||
outputVisible = 0;
|
||||
|
||||
// Delete the table
|
||||
outputTable = document.getElementById("output");
|
||||
outputTable.innerHTML = "";
|
||||
|
||||
// Delete the output graph
|
||||
outputGraph = document.getElementById("outputChart");
|
||||
outputGraph.innerHTML = " ";
|
||||
|
||||
}
|
||||
|
||||
function toInches(size) { //convert to inches
|
||||
size = Math.round((size * 1000) / 25.4) / 1000;
|
||||
return size;
|
||||
}
|
||||
|
||||
///// START OF ALGORITHMS SECTION /////
|
@ -11,7 +11,6 @@
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<p> </p>
|
||||
<div class="content">
|
||||
<div class="header">
|
||||
<p id="vanity">Taylor Courage's</p>
|
||||
@ -39,6 +38,7 @@
|
||||
</table>
|
||||
<p></p>
|
||||
<button name="Calculate" id="calculateButton" onclick="doMath()">Recalculate</button>
|
||||
<button name="Clear" id="clearButton" onclick="clearScreen()">Clear</button>
|
||||
<script>addReduction()</script>
|
||||
<script>addReduction()</script>
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user