lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Corrections and performance improvements

Browse Source
This commit is contained in:
Alerson Jorge 2023-06-16 20:21:59 -03:00
parent ea964124d6
commit 0d287283d4
2 changed files with 700 additions and 720 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

343
wled00/data/pxmagic/pxmagic.htm
View File

@ -1,17 +1,22 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="author" content="@ajotanc"> <meta name="author" content="@ajotanc" />
<title>Pixel Magic Tool</title> <title>Pixel Magic Tool</title>
<!-- <link
rel="shortcut icon"
href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAK9JREFUeNqUUssNwyAMJZWVUw4dhRHakZA6RqWMFEbwKDnk1FNBekEWxOBYQggL/D68yXXq+M7PtHkcefn89vrOw/UrP96w/NUFGiDLRz71GyY0QJa1Yn+nFa0ShqUNYCAF0QvoceOB4naEZif6UTNRapYaTyauRi4DEspr4Hbs5YKsbmtMyeJ0LxeESV4gB+hlSy4oO2txWysyus0a0+lO6vBjxcTMlG4mt2H6F2AAhU5NWu4dorQAAAAASUVORK5CYII=
" /> -->
<style> <style>
:root { :root {
--overlay: rgba(0, 0, 0, 0.5); --overlay: rgba(0, 0, 0, 0.5);
--background: #111; --background: #111;
--color: #bbb; --text: #bbb;
--gray-dark: #222; --gray-dark: #222;
--gray-medium: #333; --gray-medium: #333;
--gray-light: #eeeeee; --gray-light: #eeeeee;
@ -48,52 +53,38 @@
background: var(--background); background: var(--background);
} }
textarea,
form,
canvas { canvas {
width: 100%; width: 100%;
} }
form {
margin-bottom: 20px;
}
small { small {
display: block; display: block;
font-weight: 400; font-weight: 400;
margin: 2px 0 5px; margin: 2px 0 5px;
color: var(--color); color: var(--text);
font-size: 12px; font-size: 12px;
} }
footer { footer {
margin: 10px 5px 0; width: 100%;
margin: 0 auto 20px;
display: block;
text-align: center;
} }
a { a {
text-decoration: none; text-decoration: none;
color: var(--gray-light); color: var(--blue-light);
font-size: 12px; font-size: 12px;
font-weight: 600; font-weight: 600;
} }
a:hover, :is(a:hover, a:focus, a:active) {
a:focus, color: var(--blue-medium);
a:hide {
color: var(--gray-medium);
}
.container {
display: flex;
align-items: center;
justify-content: center;
}
.content {
width: 100%;
min-width: 540px;
max-width: 1024px;
margin: 20px;
}
.w-full {
flex-basis: 100% !important;
} }
.m-zero { .m-zero {
@ -108,15 +99,25 @@
margin-top: 10px !important; margin-top: 10px !important;
} }
.row { .container {
width: 100%;
display: flex; display: flex;
flex-wrap: wrap; align-items: center;
justify-content: space-between; justify-content: center;
margin: 20px 0 0; flex-direction: column;
} }
.row:nth-child(2) { .content {
margin: 0; width: calc(100% - 40px);
max-width: 768px;
margin: 20px;
}
.row {
display: flex;
flex-wrap: nowrap;
justify-content: space-between;
margin: 20px 0 0;
} }
.column { .column {
@ -125,11 +126,17 @@
padding: 0 5px; padding: 0 5px;
} }
.column-full {
flex-basis: 100%;
position: relative;
padding: 0 5px;
}
label { label {
display: block; display: block;
margin-bottom: 5px; margin-bottom: 5px;
font-weight: bold; font-weight: bold;
color: var(--color); color: var(--text);
} }
input[type="text"], input[type="text"],
@ -141,7 +148,6 @@
border-radius: 50px; border-radius: 50px;
background-color: var(--gray-medium); background-color: var(--gray-medium);
border: 1px solid var(--gray-medium); border: 1px solid var(--gray-medium);
display: inline-block;
outline: none; outline: none;
color: var(--gray-light); color: var(--gray-light);
font-size: 14px; font-size: 14px;
@ -162,50 +168,50 @@
} }
.input-group input:not([type="range"]) { .input-group input:not([type="range"]) {
border-radius: 5px 0 0 5px; border-radius: 8px 0 0 8px;
} }
.input-group .input-description { .input-group .input-description {
min-width: 40px; width: 38px;
height: 38px;
padding: 10px 0; padding: 10px 0;
color: #222; color: var(--gray-dark);
background: var(--color); background: var(--gray-light);
border-radius: 0px 5px 5px 0; border-radius: 0px 5px 5px 0;
border: 1px solid var(--color); border: 1px solid var(--gray-light);
border-left: 0; border-left: 0;
text-align: center; text-align: center;
font-size: 14px; font-size: 14px;
line-height: 16px; line-height: 16px;
height: 38px;
font-weight: 600; font-weight: 600;
} }
.input-group .square { .input-group .square {
border-radius: 5px; border-radius: 8px !important;
margin-left: 10px; margin-left: 10px;
} }
textarea { textarea {
resize: vertical; resize: vertical;
min-height: 200px; min-height: 200px;
margin: 0 0 10px; border-radius: 8px;
border-radius: 5px;
} }
.customSelect select { .custom-select {
position: relative;
}
.custom-select select {
appearance: none; appearance: none;
-webkit-appearance: none; -webkit-appearance: none;
-moz-appearance: none; -moz-appearance: none;
background-image: none; background-image: none;
padding-right: 20px; padding-right: 20px;
cursor: pointer; cursor: pointer;
display: flex;
position: relative;
} }
.customSelect::after { .custom-select label::after {
content: ""; content: "";
display: flex;
position: absolute; position: absolute;
top: calc(50% + 6px); top: calc(50% + 6px);
right: 16px; right: 16px;
@ -218,14 +224,14 @@
} }
.dropzone { .dropzone {
width: calc(100% - 10px); width: 100%;
border: 1px dashed var(--gray-light); border: 1px dashed var(--gray-light);
background-color: var(--gray-dark); background-color: var(--gray-dark);
color: var(--gray-light); color: var(--gray-light);
text-align: center; text-align: center;
padding: 40px 10px; padding: 40px 10px;
border-radius: 5px; border-radius: 8px;
margin: 20px 5px; margin: 20px 0 0;
transition: all 0.5s ease-in-out; transition: all 0.5s ease-in-out;
} }
@ -236,18 +242,13 @@
border-color: var(--gray-dark); border-color: var(--gray-dark);
} }
.dropzone p {
margin: 0;
padding: 0;
}
.dropzone.dragover { .dropzone.dragover {
background-color: var(--color); background-color: var(--gray-medium);
} }
.range-slider { .range-slider {
appearance: none; appearance: none;
background-color: var(--color); background-color: var(--gray-light);
height: 8px; height: 8px;
width: 100%; width: 100%;
border-radius: 10px; border-radius: 10px;
@ -323,11 +324,10 @@
.toast { .toast {
display: flex; display: flex;
align-items: center; align-items: center;
width: max-content; width: auto;
padding: 6px 12px; padding: 6px 12px;
margin: 10px 0 0; margin: 10px 0 0;
border-radius: 8px; border-radius: 8px;
color: var(--gray-light);
transform: translateY(30px); transform: translateY(30px);
opacity: 0; opacity: 0;
visibility: hidden; visibility: hidden;
@ -336,7 +336,7 @@
.toast .toast-body { .toast .toast-body {
padding: 8px 0; padding: 8px 0;
font-weight: 600; font-weight: 600;
color: var(--gray-light); color: var(--text);
letter-spacing: 0.5px; letter-spacing: 0.5px;
} }
@ -389,9 +389,9 @@
.header { .header {
display: flex; display: flex;
align-items: center;
padding: 0 0 40px;
flex-direction: column; flex-direction: column;
align-items: center;
padding: 0 0 20px;
} }
.header .brand { .header .brand {
@ -427,7 +427,7 @@
border: 0; border: 0;
padding: 10px 18px; padding: 10px 18px;
border-radius: 50px; border-radius: 50px;
color: var(--color); color: var(--text);
cursor: pointer; cursor: pointer;
margin: 0 0 10px; margin: 0 0 10px;
background: var(--gray-medium); background: var(--gray-medium);
@ -452,21 +452,6 @@
width: 100%; width: 100%;
} }
#preview {
width: 100%;
margin: 20px 0 10px;
border-radius: 8px;
}
#preview .buttons {
margin: 0 0 15px;
}
#recreatedImage {
margin: 0 5px;
width: calc(100% - 10px);
}
#overlay { #overlay {
position: fixed; position: fixed;
top: 0; top: 0;
@ -491,10 +476,12 @@
animation: spin 1s linear infinite; animation: spin 1s linear infinite;
} }
input.invalid, #recreatedImage {
select.invalid, margin: 20px 0;
textarea.invalid { }
border: 1px solid var(--error-dark);
.invalid {
border: 1px solid var(--error-dark) !important;
} }
.error-message { .error-message {
@ -505,48 +492,25 @@
font-size: 12px; font-size: 12px;
} }
.slide-container {
width: 100%;
display: flex;
overflow-x: auto;
scroll-snap-type: x mandatory;
}
.slide {
scroll-snap-align: center;
}
@media (max-width: 767px) { @media (max-width: 767px) {
.m-top {
margin: 20px 0 !important;
}
.content {
min-width: 360px;
}
.header { .header {
padding-bottom: 0; padding-bottom: 0;
} }
.row { .row {
flex-wrap: wrap;
flex-direction: column; flex-direction: column;
margin: 0; margin: 0;
} }
.column { .column,
.column-full {
flex-basis: 100%; flex-basis: 100%;
margin: 20px 0 0; margin: 20px 0 0;
padding: 0; padding: 0;
} }
} }
@media (min-width: 768px) {
.row {
flex-wrap: nowrap;
}
}
@keyframes spin { @keyframes spin {
to { to {
transform: rotate(360deg); transform: rotate(360deg);
@ -658,8 +622,8 @@
</div> </div>
<div class="row"> <div class="row">
<div class="column" validate> <div class="column" validate>
<label for="pattern">Pattern</label> <div class="custom-select">
<div class="customSelect"> <label for="pattern">Pattern</label>
<select name="pattern" id="pattern" required> <select name="pattern" id="pattern" required>
<option value="">Select a choice</option> <option value="">Select a choice</option>
<option value="1" title="['ffffff']" selected> <option value="1" title="['ffffff']" selected>
@ -671,8 +635,8 @@
</div> </div>
</div> </div>
<div class="column" validate> <div class="column" validate>
<label for="output">Output</label> <div class="custom-select">
<div class="customSelect"> <label for="output">Output</label>
<select name="output" id="output" required> <select name="output" id="output" required>
<option value="">Select a choice</option> <option value="">Select a choice</option>
<option value="json" selected>WLED JSON</option> <option value="json" selected>WLED JSON</option>
@ -702,8 +666,8 @@
</div> </div>
<div class="row"> <div class="row">
<div class="column" validate> <div class="column" validate>
<label for="segments">Segment Id</label> <div class="custom-select">
<div class="customSelect"> <label for="segments">Segment Id</label>
<select name="segments" id="segments"> <select name="segments" id="segments">
<option value="0" data-width="16" data-height="16"> <option value="0" data-width="16" data-height="16">
Segment 0 Segment 0
@ -722,9 +686,11 @@
max="255" max="255"
value="128" value="128"
class="range-slider" /> class="range-slider" />
<div id="brightnessValue" class="input-description square"> <input
128 type="text"
</div> id="brightnessValue"
class="input-description square"
value="128" />
</div> </div>
</div> </div>
</div> </div>
@ -801,7 +767,7 @@
</div> </div>
</div> </div>
<div class="row transparentImage" style="display: none"> <div class="row transparentImage" style="display: none">
<div class="column w-full" validate> <div class="column-full" validate>
<label for="color">Choose a color</label> <label for="color">Choose a color</label>
<small> <small>
Color that will replace the Color that will replace the
@ -811,18 +777,14 @@
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="column w-full" validate> <div class="column-full" validate>
<label for="images">Images</label> <div class="custom-select">
<div class="customSelect"> <label for="images">Images</label>
<select name="images" id="images" required> <select name="images" id="images" required>
<option value="">Select a choice</option> <option value="">Select a choice</option>
<option value="upload">Upload</option> <option value="upload">Upload</option>
</select> </select>
</div> </div>
</div>
</div>
<div class="row m-zero">
<div class="column w-full">
<small> <small>
Images uploaded to Images uploaded to
<a id="wledEdit" href="http://[wled-ip]/edit" target="_blank"> <a id="wledEdit" href="http://[wled-ip]/edit" target="_blank">
@ -844,7 +806,7 @@
style="display: none" /> style="display: none" />
</div> </div>
<div class="row"> <div class="row">
<div class="column w-full"> <div class="column-full">
<button type="button" class="button" id="btnGenerate"> <button type="button" class="button" id="btnGenerate">
Generate Generate
</button> </button>
@ -852,16 +814,11 @@
</div> </div>
</form> </form>
<div id="preview" style="display: none"> <div id="preview" style="display: none">
<div class="row m-zero"> <div id="recreatedImage"></div>
<div class="column w-full"> <textarea name="response" id="response" readonly="readonly">
<textarea </textarea>
name="response"
id="response"
readonly="readonly"></textarea>
</div>
</div>
<div class="buttons"> <div class="buttons">
<div class="row m-zero"> <div class="row">
<div class="column"> <div class="column">
<button type="button" class="button" id="btnCopyToClipboard"> <button type="button" class="button" id="btnCopyToClipboard">
Copy to Clipboard Copy to Clipboard
@ -876,22 +833,21 @@
</button> </button>
</div> </div>
</div> </div>
<div class="row m-zero" id="simulate" style="display: none"> <div class="row" id="simulate" style="display: none">
<div class="column w-full m-top"> <div class="column-full">
<button type="button" class="button" id="btnSimulatePreset"> <button type="button" class="button" id="btnSimulatePreset">
Simulate Simulate
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div id="recreatedImage"></div>
</div> </div>
<footer>
<a href="https://github.com/ajotanc/PixelMagicTool" target="_blank"
>Github &copy; Pixel Magic Tool</a
>
</footer>
</div> </div>
<footer>
<a href="https://github.com/ajotanc/PixelMagicTool" target="_blank">
Github &copy; Pixel Magic Tool
</a>
</footer>
</div> </div>
<div id="toast-container"></div> <div id="toast-container"></div>
<div id="overlay"></div> <div id="overlay"></div>
@ -899,12 +855,11 @@
<script> <script>
const d = document; const d = document;
const params = new URLSearchParams(window.location.search); const params = new URLSearchParams(window.location.search);
const host = const host = params.get("hn")
params.get("mode") === "dev" ? params.get("hn")
? params.get("hn") : window.location.host
: window.location.host ? window.location.host
? window.location.host : "0.0.0.0";
: "0.0.0.0";
const protocol = const protocol =
window.location.protocol === "file:" ? "http:" : window.location.protocol; window.location.protocol === "file:" ? "http:" : window.location.protocol;
@ -1302,11 +1257,21 @@
}); });
}); });
element("brightness").addEventListener("change", (e) => { element("brightnessValue").addEventListener("input", (e) => {
const brightness = element("brightness");
const { value } = e.target; const { value } = e.target;
const brightnessValue = element("brightnessValue");
brightnessValue.textContent = value; let bri = value <= 255 ? value : 255;
brightness.value = bri;
e.target.value = bri;
});
element("brightness").addEventListener("input", (e) => {
const brightnessValue = element("brightnessValue");
const { value } = e.target;
brightnessValue.value = value;
}); });
element("images").addEventListener("change", (e) => { element("images").addEventListener("change", (e) => {
@ -1559,32 +1524,37 @@
const { value: pattern } = element("pattern"); const { value: pattern } = element("pattern");
const { value: segmentId } = element("segments"); const { value: segmentId } = element("segments");
const { value: brightness } = element("brightness"); const { value: brightness } = element("brightness");
const { value: resizeWidth } = element("width"); const { value: inputWidth } = element("width");
const { value: resizeHeight } = element("height"); const { value: inputHeight } = element("height");
const { checked: resizeImage } = element("resizeImage"); const { checked: resizeImage } = element("resizeImage");
const resizeWidth = parseInt(inputWidth);
const resizeHeight = parseInt(inputHeight);
const { width: dataWidth, height: dataHeight } =
element("segments").selectedOptions[0].dataset;
const segmentWidth = parseInt(dataWidth);
const segmentHeight = parseInt(dataHeight);
const imgWidth = image.naturalWidth; const imgWidth = image.naturalWidth;
const imgHeight = image.naturalHeight; const imgHeight = image.naturalHeight;
const width = resizeImage ? resizeWidth : imgWidth; const width = resizeImage ? resizeWidth : imgWidth;
const height = resizeImage ? resizeHeight : imgHeight; const height = resizeImage ? resizeHeight : imgHeight;
const { width: segmentWidth, height: segmentHeight } = const overallWidth = resizeImage ? segmentWidth : width;
element("segments").selectedOptions[0].dataset; const overallHeight = resizeImage ? segmentHeight : height;
const startX = Math.floor((segmentWidth - width) / 2);
const startY = Math.floor((segmentHeight - height) / 2);
const pixelsRef = 48; const pixelsRef = 48;
const fullWidth = resizeImage const canvasWidth = overallWidth * pixelsRef;
? segmentWidth * pixelsRef const canvasHeight = overallHeight * pixelsRef;
: imgWidth * pixelsRef;
const fullHeight = resizeImage
? segmentHeight * pixelsRef
: imgHeight * pixelsRef;
const fontSize = fullWidth <= 768 ? 14 : 18; const fontSize = canvasWidth <= 768 ? 14 : 18;
const segmentWidthFinal = resizeImage ? segmentWidth : width;
const segmentHeightFinal = resizeImage ? segmentHeight : height;
const colors = []; const colors = [];
@ -1595,20 +1565,32 @@
const imageData = reference.getImageData(0, 0, width, height); const imageData = reference.getImageData(0, 0, width, height);
const pixels = imageData.data; const pixels = imageData.data;
const { canvas, ctx } = createCanvas(fullWidth, fullHeight); const { canvas, ctx } = createCanvas(canvasWidth, canvasHeight);
ctx.fillStyle = "#000000"; ctx.fillStyle = "#000000";
ctx.fillRect(0, 0, fullWidth, fullHeight); ctx.fillRect(0, 0, canvasWidth, canvasHeight);
for (let y = 0; y < segmentHeightFinal; y++) { for (let h = 0; h < overallHeight; h++) {
for (let x = 0; x < segmentWidthFinal; x++) { for (let w = 0; w < overallWidth; w++) {
let coordinateX = x * pixelsRef; let pixelId = h * overallWidth + w + 1;
let coordinateY = y * pixelsRef;
let coordinateX = w * pixelsRef;
let coordinateY = h * pixelsRef;
let pixelX = w - startX;
let pixelY = h - startY;
let hex = "000000"; let hex = "000000";
if (x < width && y < height) { if (
let index = y * width + x; (resizeImage &&
pixelX >= 0 &&
pixelX < width &&
pixelY >= 0 &&
pixelY < height) ||
(!resizeImage && w < width && h < height)
) {
let index = resizeImage ? pixelY * width + pixelX : h * width + w;
let red = pixels[index * 4]; let red = pixels[index * 4];
let green = pixels[index * 4 + 1]; let green = pixels[index * 4 + 1];
@ -1630,12 +1612,11 @@
ctx.strokeStyle = "#111111"; ctx.strokeStyle = "#111111";
ctx.strokeRect(coordinateX, coordinateY, pixelsRef, pixelsRef); ctx.strokeRect(coordinateX, coordinateY, pixelsRef, pixelsRef);
let pixelId = y * segmentWidth + x + 1;
let offsetX = coordinateX + pixelsRef / 2; let offsetX = coordinateX + pixelsRef / 2;
let offsetY = coordinateY + pixelsRef / 2; let offsetY = coordinateY + pixelsRef / 2;
ctx.font = `${fontSize}px Arial`; ctx.font = `${fontSize}px Arial`;
ctx.fillStyle = hex === "ffffff" ? "#111111" : "#eeeeee"; ctx.fillStyle = hex === "000000" ? "#eeeeee" : "#111111";
ctx.textAlign = "center"; ctx.textAlign = "center";
ctx.textBaseline = "middle"; ctx.textBaseline = "middle";
ctx.fillText(pixelId, offsetX, offsetY); ctx.fillText(pixelId, offsetX, offsetY);

1077
wled00/html_pxmagic.h
View File

File diff suppressed because it is too large Load Diff