mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-03 16:56:54 +00:00
fhemweb_colorpicker.js: hue preset fix
git-svn-id: https://svn.fhem.de/fhem/trunk@25828 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
2c8b88183f
commit
1783d595fb
@ -28,27 +28,7 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
|
||||
mode = vArr[1]
|
||||
//console.log( "mode: "+mode );
|
||||
|
||||
//preset ?
|
||||
if( params && params.length ) {
|
||||
var color = params[0];
|
||||
if( mode == 'CT' )
|
||||
color = colorpicker_ct2rgb(color);
|
||||
else if( mode == 'BRI' ) {
|
||||
color = parseInt(255 * color / vArr[4]);
|
||||
color = colorpicker_rgb2hex(color,color,color);
|
||||
} else if( mode == 'HUE' ) {
|
||||
var h = 255 * params[0] / vArr[4];
|
||||
var s = 1;
|
||||
var v = 1;
|
||||
var color = colorpicker_hsv2rgb(h,s,v);
|
||||
}
|
||||
|
||||
var newEl = $('<div informID="###" style="width:32px;height:19px;border:1px solid #fff;border-radius:8px;background-color:#'+color+'" >').get(0);
|
||||
$(newEl).click(function(arg) { cmd(params[0]) });
|
||||
return newEl;
|
||||
}
|
||||
|
||||
var cmds = []; // the 3 commands für hue, sat, bri
|
||||
var cmds = []; // the 3 commands für hue, sat, bri
|
||||
var ranges = []; // the 3 slider ranges
|
||||
var is_real_hsv = false;
|
||||
if( vArr.length == 14 ) { // hsv:colorpicker,HSV,hue,0,1,360,sat,0,1,100,bri,0,1,100
|
||||
@ -62,6 +42,26 @@ FW_colorpickerCreate(elName, devName, vArr, currVal, set, params, cmd)
|
||||
ranges[2] = [vArr[11],vArr[12],vArr[13]];
|
||||
}
|
||||
|
||||
//preset ?
|
||||
if( params && params.length ) {
|
||||
var color = params[0];
|
||||
if( mode == 'CT' )
|
||||
color = colorpicker_ct2rgb(color);
|
||||
else if( mode == 'BRI' ) {
|
||||
color = parseInt(255 * color / vArr[4]);
|
||||
color = colorpicker_rgb2hex(color,color,color);
|
||||
} else if( mode == 'HUE' ) {
|
||||
var h = params[0] / vArr[4];
|
||||
var s = 1;
|
||||
var v = 1;
|
||||
var color = colorpicker_hsv2rgb(h,s,v);
|
||||
}
|
||||
|
||||
var newEl = $('<div informID="###" style="width:32px;height:19px;border:1px solid #fff;border-radius:8px;background-color:#'+color+'" >').get(0);
|
||||
$(newEl).click(function(arg) { cmd(params[0]) });
|
||||
return newEl;
|
||||
}
|
||||
|
||||
function value2hsv(value) {
|
||||
var hsv = [];
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user