Browse Source

web: move hsv picker conversions into functions

master
Max Prokhorov 5 years ago
parent
commit
e233fd5b08
5 changed files with 3228 additions and 3198 deletions
  1. BIN
      code/espurna/data/index.all.html.gz
  2. BIN
      code/espurna/data/index.light.html.gz
  3. +1675
    -1672
      code/espurna/static/index.all.html.gz.h
  4. +1516
    -1513
      code/espurna/static/index.light.html.gz.h
  5. +37
    -13
      code/html/custom.js

BIN
code/espurna/data/index.all.html.gz View File


BIN
code/espurna/data/index.light.html.gz View File


+ 1675
- 1672
code/espurna/static/index.all.html.gz.h
File diff suppressed because it is too large
View File


+ 1516
- 1513
code/espurna/static/index.light.html.gz.h
File diff suppressed because it is too large
View File


+ 37
- 13
code/html/custom.js View File

@ -377,7 +377,7 @@ function checkTempRangeMin() {
$("#tempRangeMinInput").val(max - 1); $("#tempRangeMinInput").val(max - 1);
} }
} }
function checkTempRangeMax() { function checkTempRangeMax() {
var min = parseInt($("#tempRangeMinInput").val(), 10); var min = parseInt($("#tempRangeMinInput").val(), 10);
var max = parseInt($("#tempRangeMaxInput").val(), 10); var max = parseInt($("#tempRangeMaxInput").val(), 10);
@ -1098,6 +1098,38 @@ function initMagnitudes(data) {
<!-- removeIf(!light)--> <!-- removeIf(!light)-->
// wheelColorPicker accepts:
// hsv(0...360,0...1,0...1)
// hsv(0...100%,0...100%,0...100%)
// While we use:
// hsv(0...360,0...100%,0...100%)
function _hsv_round(value) {
return Math.round(value * 100) / 100;
}
function getPickerRGB(picker) {
return $(picker).wheelColorPicker("getValue", "css");
}
// TODO: use pct values instead of doing conversion?
function getPickerHSV(picker) {
var color = $(picker).wheelColorPicker("getColor");
return String(Math.ceil(_hsv_round(color.h) * 360))
+ "," + String(Math.ceil(_hsv_round(color.s) * 100))
+ "," + String(Math.ceil(_hsv_round(color.v) * 100));
}
function setPickerHSV(picker, value) {
if (value === getPickerHSV(picker)) return;
var chunks = value.split(",");
$(picker).wheelColorPicker("setColor", {
h: _hsv_round(chunks[0] / 360),
s: _hsv_round(chunks[1] / 100),
v: _hsv_round(chunks[2] / 100)
});
}
function initColor(rgb) { function initColor(rgb) {
// check if already initialized // check if already initialized
@ -1114,12 +1146,9 @@ function initColor(rgb) {
sliders: (rgb ? "wrgbp" : "whsvp") sliders: (rgb ? "wrgbp" : "whsvp")
}).on("sliderup", function() { }).on("sliderup", function() {
if (rgb) { if (rgb) {
var value = $(this).wheelColorPicker("getValue", "css");
sendAction("color", {rgb: value});
sendAction("color", {rgb: getPickerRGB(this)});
} else { } else {
var color = $(this).wheelColorPicker("getColor");
var value = parseInt(color.h * 360, 10) + "," + parseInt(color.s * 100, 10) + "," + parseInt(color.v * 100, 10);
sendAction("color", {hsv: value});
sendAction("color", {hsv: getPickerHSV(this)});
} }
}); });
@ -1440,13 +1469,8 @@ function processData(data) {
if ("hsv" === key) { if ("hsv" === key) {
initColor(false); initColor(false);
// wheelColorPicker expects HSV to be between 0 and 1 all of them
var chunks = value.split(",");
var obj = {};
obj.h = chunks[0] / 360;
obj.s = chunks[1] / 100;
obj.v = chunks[2] / 100;
$("input[name='color']").wheelColorPicker("setColor", obj);
$("#brightness").hide();
setPickerHSV(value);
return; return;
} }


Loading…
Cancel
Save