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

64
js/franz.js
View file

@ -110,76 +110,70 @@ var franz = {
return false
},
getHue: function(red,green,blue) {
var min, max, delta, hue;
min = Math.min(red,Math.min(green,blue));
max = Math.max(red,Math.max(green,blue));
delta = max - min;
getHue: function(red, green, blue) {
var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue)),
delta = max - min,
hue;
if (max == min)
return 0;
else {
if (red == max)
if(red == max)
hue = (green - blue) / delta; //between yellow & magenta
else if (green == max)
else if(green == max)
hue = 2 + (blue - red) / delta; //between cyan & yellow
else
hue = 4 + (red - green) / delta; //between magenta & cyan
// hue degrees
hue = hue * 60;
if (hue < 0) hue += 360;
if(hue < 0) hue += 360;
}
return hue;
},
getSatHSV: function(red, green, blue) {
var min, max, delta, sat;
min = Math.min(red,Math.min(green,blue));
max = Math.max(red,Math.max(green,blue));
delta = max - min;
sat = delta / max;
var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue)),
delta = max - min,
sat = delta / max;
return sat;
},
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) {
var min, max, sat;
var lightness = franz.getLightHSL();
var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue)),
lightness = franz.getLightHSL(),
sat;
min = Math.min(red,Math.min(green,blue));
max = Math.max(red,Math.max(green,blue));
if(min == max) return 0;
if (min == max) return 0;
if (lightness < 1/2) sat = (max-min)/(max+min);
else sat = (max-min)/(2 - (max+min));
if(lightness < 1/2) sat = (max-min)/(max+min);
else sat = (max - min) / (2 - (max + min));
return sat;
},
getLightHSL: function(red, green, blue) {
var min, max;
min = Math.min(red,Math.min(green,blue));
max = Math.max(red,Math.max(green,blue));
return 1/2*(min+max);
var min = Math.min(red, Math.min(green, blue)),
max = Math.max(red, Math.max(green, blue));
return 0.5 * (min + max);
},
/* routines to display color swatches */
displayColors: function(order_array) {
var docString = "";
var docStr = "";
for(var i = 0; i < franz.rgb.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>';
}
for(var i = 0; i < franz.alpha.length; i++) {
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;
$("#container_bottom").fadeIn("slow");
document.getElementById("log_colors").innerHTML = docStr;
if(typeof jQuery != "undefined") $("#container_bottom").fadeIn("slow");
else document.getElementById("container_bottom").style.display = "block";
return false;
},