kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

optimized getColor function by adding global max/min/range

Browse Source
This commit is contained in:
ksjdragon 2016-04-15 22:40:49 -04:00
parent ed97353224
commit 6300af1436
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
atoms/index.html
View File

@ -34,10 +34,12 @@
var settings = {};
var info;
var options = ["theme","displayTheme","elecConf","unit"];
var ranges = {};
var elementCount = 118;
var choices = [
["light","dark"],
["category", "atomRadi", "moleWeig", "ioniEner", "elecAffi", "elecNega", "density", "melting","boiling"],
["category", "atomRadi", "moleWeig", "ioniEner", "elecAffi", "elecNega", "density", "melting", "boiling"],
["abr","norm"],
["K","C","F"]
];
@ -60,6 +62,11 @@
"melting": ["#D7301E", "#69F2F2"],
"boiling": ["#D7301E", "#69F2F2"]
};
var themeChart = {
"pulltab": {'light': '#B3DAFF','dark': '#F33333'},
"sidebar": {'light':'#E6F5FF','dark':'#FF5858'}
};
</script>
<script src="./js/main.js"></script>

25
atoms/js/main.js
View File

@ -55,7 +55,7 @@ function createTable() {
// Creates text for the periodic table
cells = get("td");
for(var i = 0;i < 118;i++) {
for(var i = 0;i < elementCount;i++) {
ele = document.createElement("p");
text = document.createTextNode(i+1); // i+1 to offset 0
ele.appendChild(text);
@ -106,6 +106,28 @@ function createGradientLegend() {
get("legendholder").appendChild(tbl);
}
function getRanges() {
// Format of ranges is [Min, Max, Range]
for(var i = 1; i < choices[1].length; i++) { // Possible data types are options except for category
var option = choices[1][i];
if(i == 7 || i == 8) {
ranges[option] = {};
for(var j = 0; j < 3; j++) { // Units for temperatures
var unit = choices[3][j];
var min = Math.min.apply(null,info[option][unit]);
var max = Math.max.apply(null,info[option][unit]);
var range = max - min;
ranges[option][unit] = [min,max,range];
}
} else {
var min = Math.min.apply(null,info[option]);
var max = Math.max.apply(null,info[option]);
var range = max - min;
ranges[option] = [min,max,range];
}
}
}
function get(name) {
// Condensed format for document.getX
var elements = [];
@ -143,5 +165,6 @@ setTimeout(function mainFunc() {
update();
makeSettings();
tableDesc();
getRanges();
createGradientLegend();
}, 600);