repos/franz
repos/franz
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge with Ryan, added log in bubblesort to show data inconsistencies

Browse source 
Conflicts:
	index.php
	js/franz.js
This commit is contained in:
Dominick Pham 2009-08-14 01:17:49 -04:00
commit 63b2fd8d16
2 changed files with 36 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
index.php
View file

@ -41,7 +41,7 @@
}); });
$("#try_these a").click(function() { $("#try_these a").click(function() {
img_input.value = "awesome/" + this.innerHTML; img_input.value = "awesome/" + $(this)[0].innerHTML;
return false; return false;
}); });
@ -99,11 +99,11 @@
<input type="submit" class="img_submit" value="Go for it!"> <input type="submit" class="img_submit" value="Go for it!">
</form> </form>
<p id="try_these"><strong>Try out:</strong> <p id="try_these"><strong>Try out:</strong>
<a href="#" title="lol.png">lol.png</a>, <a href="#" title="awesome/lol.png">lol.png</a>,
<a href="#" title="testjubs.jpg">testjubs.jpg</a>, <a href="#" title="awesome/testjubs.jpg">testjubs.jpg</a>,
<a href="#" title="stars.jpg">stars.jpg</a>, <a href="#" title="awesome/stars.jpg">stars.jpg</a>,
<a href="#" title="1600.jpg">1600.jpg</a>, <a href="#" title="awesome/1600.jpg">1600.jpg</a>,
<a href="#" title="fallout.jpg">fallout.jpg</a> <a href="#" title="awesome/fallout.jpg">fallout.jpg</a>
</p> </p>
</div> </div>

44
js/franz.js
View file

@ -111,11 +111,10 @@ var franz = {
}, },
getHue: function(red, green, blue) { getHue: function(red, green, blue) {
var min, max, delta, hue; var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue)),
min = Math.min(red,Math.min(green,blue)); delta = max - min,
max = Math.max(red,Math.max(green,blue)); hue;
delta = max - min;
if (max == min) if (max == min)
return 0; return 0;
@ -136,11 +135,9 @@ var franz = {
}, },
getSatHSV: function(red, green, blue) { getSatHSV: function(red, green, blue) {
var min, max, delta, sat; var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue)),
min = Math.min(red,Math.min(green,blue)); delta = max - min,
max = Math.max(red,Math.max(green,blue));
delta = max - min;
sat = delta / max; sat = delta / max;
return sat; return sat;
@ -149,11 +146,10 @@ var franz = {
getValHSV: function(red, green, blue) { return Math.max(red, Math.max(green,blue)); }, getValHSV: function(red, green, blue) { return Math.max(red, Math.max(green,blue)); },
getSatHSL: function(red, green, blue) { getSatHSL: function(red, green, blue) {
var min, max, sat; var min = Math.min(red, Math.min(green, blue)),
var lightness = franz.getLightHSL(); max = Math.max(red, Math.max(green, blue)),
lightness = franz.getLightHSL(),
min = Math.min(red,Math.min(green,blue)); sat;
max = Math.max(red,Math.max(green,blue));
if(min == max) return 0; if(min == max) return 0;
@ -164,22 +160,20 @@ var franz = {
}, },
getLightHSL: function(red, green, blue) { getLightHSL: function(red, green, blue) {
var min, max; var min = Math.min(red, Math.min(green, blue)),
min = Math.min(red,Math.min(green,blue));
max = Math.max(red, Math.max(green, blue)); max = Math.max(red, Math.max(green, blue));
return 1/2*(min+max); return 0.5 * (min + max);
}, },
/* routines to display color swatches */
displayColors: function(order_array) { displayColors: function(order_array) {
var docString = ""; var docStr = "";
for(var i = 0; i < franz.rgb.alpha.length; i++) { for(var i = 0; i < franz.alpha.length; i++) {
docString += '<div class="color_box" style="background-color: rgb(' + franz.rgb.red[order_array[i]] + ', ' + franz.rgb.green[order_array[i]] + ',' + franz.rgb.blue[order_array[i]] + ');"></div>'; docStr += '<div class="color_box" style="background-color: rgb(' + franz.red[order_array[i]] + ', ' + franz.green[order_array[i]] + ',' + franz.blue[order_array[i]] + ');"></div>';
}
document.getElementById("log_colors").innerHTML = docString; document.getElementById("log_colors").innerHTML = docStr;
$("#container_bottom").fadeIn("slow"); if(typeof jQuery != "undefined") $("#container_bottom").fadeIn("slow");
else document.getElementById("container_bottom").style.display = "block";
return false; return false;
}, },