feat: plotknoppen centreren en tekeningen apart bewaren
Objecten kunnen één voor één getekend worden, instellingen blijven staan en een tekening gaat in een .tdrw-bestand. SVG's met een Adobe-DOCTYPE laden nu ook.
@@ -76,8 +76,9 @@ function readSettings ()
76
76
penDownZ: Number($("pen-down").value),
77
77
dwellMs: Number($("dwell").value),
78
78
origin: $("origin").value,
79
returnHome: $("return-home").checked,
80
allowOutside: $("allow-outside").checked,
79
perObject: $("per-object").checked,
80
showTravel: $("show-travel").checked,
81
jogStep: Number($("jog-step").value),
81
82
};
82
83
}
83
84
@@ -347,9 +348,47 @@ function draw ()
347
348
if (current) drawHandles(current);
348
349
}
349
350
351
const SETTINGS_KEY = "timdraw-settings";
352
350
353
function persist ()
351
354
{
352
localStorage.setItem("timdraw-doc", JSON.stringify({ objects, defaults, settings: readSettings() }));
355
const state = {
356
settings: readSettings(),
357
defaults,
358
composer: {
359
text: $("new-text").value,
360
font: $("new-font").value,
361
size: Number($("new-size").value),
362
},
363
view: { zoom, panX, panY },
364
};
365
localStorage.setItem(SETTINGS_KEY, JSON.stringify(state));
366
}
367
368
function applySaved (saved)
369
{
370
if (!saved) return;
371
Object.assign(defaults, saved.defaults || {});
372
const settings = saved.settings || {};
373
if (settings.drawSpeed) $("draw-speed").value = settings.drawSpeed;
374
if (settings.travelSpeed) $("travel-speed").value = settings.travelSpeed;
375
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;
376
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;
377
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;
378
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;
379
else $("origin").value = "top-left";
380
localStorage.setItem("timdraw-origin-v2", "1");
381
$("per-object").checked = !!settings.perObject;
382
$("show-travel").checked = !!settings.showTravel;
383
if (settings.jogStep) $("jog-step").value = String(settings.jogStep);
384
const composer = saved.composer || {};
385
if (composer.text != null) $("new-text").value = composer.text;
386
if (composer.font) $("new-font").value = composer.font;
387
if (composer.size) $("new-size").value = composer.size;
388
const view = saved.view || {};
389
if (view.zoom) zoom = view.zoom;
390
if (view.panX) panX = view.panX;
391
if (view.panY) panY = view.panY;
353
392
}
354
393
355
394
function schedulePreview ()
@@ -373,7 +412,6 @@ async function refreshPreview ()
373
412
? `${stats.drawMm || 0} mm tekenen · ${stats.travelMm || 0} mm reizen · ongeveer ${minutes} min ${seconds} s`
374
413
: "";
375
414
if (data.warnings && data.warnings.length) toast(data.warnings[0]);
376
$("btn-plot").disabled = !!stats.blocked;
377
415
} catch (error)
378
416
{
379
417
toast(error.message);
@@ -422,7 +460,6 @@ function fillForm ()
422
460
$("prop-dark").value = obj.spacingMin;
423
461
$("prop-light").value = obj.spacingMax;
424
462
$("gray-props").hidden = !obj.grayscale;
425
$("defaults-hint").hidden = !!selected();
426
463
const isText = selected() && selected().kind === "text";
427
464
$("text-props").hidden = !isText;
428
465
if (isText)
@@ -632,6 +669,7 @@ canvas.addEventListener("pointermove", (event) =>
632
669
function endDrag ()
633
670
{
634
671
if (drag && drag.type !== "pan") schedulePreview();
672
else if (drag && drag.type === "pan") persist();
635
673
drag = null;
636
674
interacting = false;
637
675
}
@@ -643,6 +681,7 @@ canvas.addEventListener("wheel", (event) =>
643
681
event.preventDefault();
644
682
zoom = Math.max(0.35, Math.min(8, zoom * (event.deltaY < 0 ? 1.08 : 0.92)));
645
683
draw();
684
persist();
646
685
}, { passive: false });
647
686
648
687
window.addEventListener("keydown", (event) =>
@@ -720,6 +759,8 @@ $("prop-font").addEventListener("change", queueTextRebuild);
720
759
$("prop-size").addEventListener("input", queueTextRebuild);
721
760
722
761
$("btn-import").onclick = () => $("file").click();
762
$("btn-open").onclick = () => $("open-file").click();
763
$("btn-save").onclick = saveSheet;
723
764
$("file").onchange = async () =>
724
765
{
725
766
const file = $("file").files[0];
@@ -734,6 +775,44 @@ $("file").onchange = async () =>
734
775
}
735
776
};
736
777
778
function saveSheet ()
779
{
780
const payload = { format: "timdraw", version: 1, objects };
781
const blob = new Blob([JSON.stringify(payload)], { type: "application/json" });
782
const link = document.createElement("a");
783
const raw = (objects[0] && objects[0].name) || "tekening";
784
link.href = URL.createObjectURL(blob);
785
link.download = `${raw.replace(/[^\w.-]+/g, "_").slice(0, 40) || "tekening"}.tdrw`;
786
link.click();
787
setTimeout(() => URL.revokeObjectURL(link.href), 1000);
788
}
789
790
function loadSheet (data)
791
{
792
if (!data || data.format !== "timdraw" || !Array.isArray(data.objects))
793
throw new Error("Dit is geen Timdraw-bestand.");
794
objects = data.objects.map((obj) => ({ ...obj, id: obj.id || crypto.randomUUID() }));
795
selectedId = null;
796
clipboard = null;
797
renderList();
798
fillForm();
799
schedulePreview();
800
}
801
802
$("open-file").onchange = async () =>
803
{
804
const file = $("open-file").files[0];
805
$("open-file").value = "";
806
if (!file) return;
807
try
808
{
809
loadSheet(JSON.parse(await file.text()));
810
} catch (error)
811
{
812
toast(error instanceof SyntaxError ? "Dit is geen Timdraw-bestand." : error.message);
813
}
814
};
815
737
816
$("demos").onchange = async () =>
738
817
{
739
818
const name = $("demos").value;
@@ -804,10 +883,15 @@ function moveLayer (dir)
804
883
schedulePreview();
805
884
}
806
885
807
$("btn-fit").onclick = () => { zoom = 1; panX = 0; panY = 0; draw(); };
808
$("show-travel").onchange = draw;
886
$("btn-fit").onclick = () => { zoom = 1; panX = 0; panY = 0; draw(); persist(); };
887
$("show-travel").onchange = () => { draw(); persist(); };
888
$("per-object").addEventListener("change", schedulePreview);
889
$("jog-step").addEventListener("change", persist);
890
$("new-text").addEventListener("input", persist);
891
$("new-font").addEventListener("change", persist);
892
$("new-size").addEventListener("change", persist);
809
893
810
["draw-speed", "travel-speed", "pen-up", "pen-down", "dwell", "origin", "return-home", "allow-outside"].forEach((id) =>
894
["draw-speed", "travel-speed", "pen-up", "pen-down", "dwell", "origin"].forEach((id) =>
811
895
{
812
896
$(id).addEventListener("change", schedulePreview);
813
897
});
@@ -1011,23 +1095,9 @@ async function boot ()
1011
1095
{
1012
1096
try
1013
1097
{
1014
const saved = JSON.parse(localStorage.getItem("timdraw-doc") || "null");
1015
if (saved)
1016
{
1017
objects = saved.objects || [];
1018
Object.assign(defaults, saved.defaults || {});
1019
const settings = saved.settings || {};
1020
if (settings.drawSpeed) $("draw-speed").value = settings.drawSpeed;
1021
if (settings.travelSpeed) $("travel-speed").value = settings.travelSpeed;
1022
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;
1023
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;
1024
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;
1025
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;
1026
else $("origin").value = "top-left";
1027
localStorage.setItem("timdraw-origin-v2", "1");
1028
$("return-home").checked = settings.returnHome !== false;
1029
$("allow-outside").checked = !!settings.allowOutside;
1030
}
1098
const saved = JSON.parse(localStorage.getItem(SETTINGS_KEY) || "null")
1099
|| JSON.parse(localStorage.getItem("timdraw-doc") || "null");
1100
applySaved(saved);
1031
1101
} catch { /* lege start */ }
1032
1102
fillForm();
1033
1103
renderList();
@@ -76,8 +76,9 @@ function readSettings ()76
penDownZ: Number($("pen-down").value),76
penDownZ: Number($("pen-down").value),77
dwellMs: Number($("dwell").value),77
dwellMs: Number($("dwell").value),78
origin: $("origin").value,78
origin: $("origin").value,79
returnHome: $("return-home").checked,79
perObject: $("per-object").checked,80
allowOutside: $("allow-outside").checked,80
showTravel: $("show-travel").checked,81
jogStep: Number($("jog-step").value),81
};82
};82
}83
}83
84
@@ -347,9 +348,47 @@ function draw ()347
if (current) drawHandles(current);348
if (current) drawHandles(current);348
}349
}349
350
351
const SETTINGS_KEY = "timdraw-settings";352
350
function persist ()353
function persist ()351
{354
{352
localStorage.setItem("timdraw-doc", JSON.stringify({ objects, defaults, settings: readSettings() }));355
const state = {356
settings: readSettings(),357
defaults,358
composer: {359
text: $("new-text").value,360
font: $("new-font").value,361
size: Number($("new-size").value),362
},363
view: { zoom, panX, panY },364
};365
localStorage.setItem(SETTINGS_KEY, JSON.stringify(state));366
}367
368
function applySaved (saved)369
{370
if (!saved) return;371
Object.assign(defaults, saved.defaults || {});372
const settings = saved.settings || {};373
if (settings.drawSpeed) $("draw-speed").value = settings.drawSpeed;374
if (settings.travelSpeed) $("travel-speed").value = settings.travelSpeed;375
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;376
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;377
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;378
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;379
else $("origin").value = "top-left";380
localStorage.setItem("timdraw-origin-v2", "1");381
$("per-object").checked = !!settings.perObject;382
$("show-travel").checked = !!settings.showTravel;383
if (settings.jogStep) $("jog-step").value = String(settings.jogStep);384
const composer = saved.composer || {};385
if (composer.text != null) $("new-text").value = composer.text;386
if (composer.font) $("new-font").value = composer.font;387
if (composer.size) $("new-size").value = composer.size;388
const view = saved.view || {};389
if (view.zoom) zoom = view.zoom;390
if (view.panX) panX = view.panX;391
if (view.panY) panY = view.panY;353
}392
}354
393
355
function schedulePreview ()394
function schedulePreview ()@@ -373,7 +412,6 @@ async function refreshPreview ()373
? `${stats.drawMm || 0} mm tekenen · ${stats.travelMm || 0} mm reizen · ongeveer ${minutes} min ${seconds} s`412
? `${stats.drawMm || 0} mm tekenen · ${stats.travelMm || 0} mm reizen · ongeveer ${minutes} min ${seconds} s`374
: "";413
: "";375
if (data.warnings && data.warnings.length) toast(data.warnings[0]);414
if (data.warnings && data.warnings.length) toast(data.warnings[0]);376
$("btn-plot").disabled = !!stats.blocked;377
} catch (error)415
} catch (error)378
{416
{379
toast(error.message);417
toast(error.message);@@ -422,7 +460,6 @@ function fillForm ()422
$("prop-dark").value = obj.spacingMin;460
$("prop-dark").value = obj.spacingMin;423
$("prop-light").value = obj.spacingMax;461
$("prop-light").value = obj.spacingMax;424
$("gray-props").hidden = !obj.grayscale;462
$("gray-props").hidden = !obj.grayscale;425
$("defaults-hint").hidden = !!selected();426
const isText = selected() && selected().kind === "text";463
const isText = selected() && selected().kind === "text";427
$("text-props").hidden = !isText;464
$("text-props").hidden = !isText;428
if (isText)465
if (isText)@@ -632,6 +669,7 @@ canvas.addEventListener("pointermove", (event) =>632
function endDrag ()669
function endDrag ()633
{670
{634
if (drag && drag.type !== "pan") schedulePreview();671
if (drag && drag.type !== "pan") schedulePreview();672
else if (drag && drag.type === "pan") persist();635
drag = null;673
drag = null;636
interacting = false;674
interacting = false;637
}675
}@@ -643,6 +681,7 @@ canvas.addEventListener("wheel", (event) =>643
event.preventDefault();681
event.preventDefault();644
zoom = Math.max(0.35, Math.min(8, zoom * (event.deltaY < 0 ? 1.08 : 0.92)));682
zoom = Math.max(0.35, Math.min(8, zoom * (event.deltaY < 0 ? 1.08 : 0.92)));645
draw();683
draw();684
persist();646
}, { passive: false });685
}, { passive: false });647
686
648
window.addEventListener("keydown", (event) =>687
window.addEventListener("keydown", (event) =>@@ -720,6 +759,8 @@ $("prop-font").addEventListener("change", queueTextRebuild);720
$("prop-size").addEventListener("input", queueTextRebuild);759
$("prop-size").addEventListener("input", queueTextRebuild);721
760
722
$("btn-import").onclick = () => $("file").click();761
$("btn-import").onclick = () => $("file").click();762
$("btn-open").onclick = () => $("open-file").click();763
$("btn-save").onclick = saveSheet;723
$("file").onchange = async () =>764
$("file").onchange = async () =>724
{765
{725
const file = $("file").files[0];766
const file = $("file").files[0];@@ -734,6 +775,44 @@ $("file").onchange = async () =>734
}775
}735
};776
};736
777
778
function saveSheet ()779
{780
const payload = { format: "timdraw", version: 1, objects };781
const blob = new Blob([JSON.stringify(payload)], { type: "application/json" });782
const link = document.createElement("a");783
const raw = (objects[0] && objects[0].name) || "tekening";784
link.href = URL.createObjectURL(blob);785
link.download = `${raw.replace(/[^\w.-]+/g, "_").slice(0, 40) || "tekening"}.tdrw`;786
link.click();787
setTimeout(() => URL.revokeObjectURL(link.href), 1000);788
}789
790
function loadSheet (data)791
{792
if (!data || data.format !== "timdraw" || !Array.isArray(data.objects))793
throw new Error("Dit is geen Timdraw-bestand.");794
objects = data.objects.map((obj) => ({ ...obj, id: obj.id || crypto.randomUUID() }));795
selectedId = null;796
clipboard = null;797
renderList();798
fillForm();799
schedulePreview();800
}801
802
$("open-file").onchange = async () =>803
{804
const file = $("open-file").files[0];805
$("open-file").value = "";806
if (!file) return;807
try808
{809
loadSheet(JSON.parse(await file.text()));810
} catch (error)811
{812
toast(error instanceof SyntaxError ? "Dit is geen Timdraw-bestand." : error.message);813
}814
};815
737
$("demos").onchange = async () =>816
$("demos").onchange = async () =>738
{817
{739
const name = $("demos").value;818
const name = $("demos").value;@@ -804,10 +883,15 @@ function moveLayer (dir)804
schedulePreview();883
schedulePreview();805
}884
}806
885
807
$("btn-fit").onclick = () => { zoom = 1; panX = 0; panY = 0; draw(); };886
$("btn-fit").onclick = () => { zoom = 1; panX = 0; panY = 0; draw(); persist(); };808
$("show-travel").onchange = draw;887
$("show-travel").onchange = () => { draw(); persist(); };888
$("per-object").addEventListener("change", schedulePreview);889
$("jog-step").addEventListener("change", persist);890
$("new-text").addEventListener("input", persist);891
$("new-font").addEventListener("change", persist);892
$("new-size").addEventListener("change", persist);809
893
810
["draw-speed", "travel-speed", "pen-up", "pen-down", "dwell", "origin", "return-home", "allow-outside"].forEach((id) =>894
["draw-speed", "travel-speed", "pen-up", "pen-down", "dwell", "origin"].forEach((id) =>811
{895
{812
$(id).addEventListener("change", schedulePreview);896
$(id).addEventListener("change", schedulePreview);813
});897
});@@ -1011,23 +1095,9 @@ async function boot ()1011
{1095
{1012
try1096
try1013
{1097
{1014
const saved = JSON.parse(localStorage.getItem("timdraw-doc") || "null");1098
const saved = JSON.parse(localStorage.getItem(SETTINGS_KEY) || "null")1015
if (saved)1099
|| JSON.parse(localStorage.getItem("timdraw-doc") || "null");1016
{1100
applySaved(saved);1017
objects = saved.objects || [];1018
Object.assign(defaults, saved.defaults || {});1019
const settings = saved.settings || {};1020
if (settings.drawSpeed) $("draw-speed").value = settings.drawSpeed;1021
if (settings.travelSpeed) $("travel-speed").value = settings.travelSpeed;1022
if (settings.penUpZ != null) $("pen-up").value = settings.penUpZ;1023
if (settings.penDownZ != null) $("pen-down").value = settings.penDownZ;1024
if (settings.dwellMs != null) $("dwell").value = settings.dwellMs;1025
if (localStorage.getItem("timdraw-origin-v2") && settings.origin) $("origin").value = settings.origin;1026
else $("origin").value = "top-left";1027
localStorage.setItem("timdraw-origin-v2", "1");1028
$("return-home").checked = settings.returnHome !== false;1029
$("allow-outside").checked = !!settings.allowOutside;1030
}1031
} catch { /* lege start */ }1101
} catch { /* lege start */ }1032
fillForm();1102
fillForm();1033
renderList();1103
renderList();@@ -18,8 +18,14 @@
18
18
</button>
19
19
<a id="local-url" href="http://127.0.0.1:8765/">127.0.0.1:8765</a>
20
20
</div>
21
<p id="toast" class="toast" hidden></p>
21
<div class="plot-actions">
22
<button id="btn-plot" type="button" class="primary">Teken</button>
23
<button id="btn-pause" type="button">Pauze</button>
24
<button id="btn-trace" type="button">Voorbeeld</button>
25
<button id="btn-stop" type="button">Stop</button>
26
</div>
22
27
<div class="header-actions">
28
<p id="toast" class="toast" hidden></p>
23
29
<button id="btn-fit" type="button">Passend</button>
24
30
<label class="check"><input id="show-travel" type="checkbox"> Verplaatsingen</label>
25
31
</div>
@@ -28,9 +34,12 @@
28
34
<aside class="panel left">
29
35
<section>
30
36
<h2>Tekening</h2>
31
<div class="row">
37
<div class="row wrap">
32
38
<button id="btn-import" type="button" class="primary">Importeer SVG</button>
39
<button id="btn-open" type="button">Open</button>
40
<button id="btn-save" type="button">Opslaan</button>
33
41
<input id="file" type="file" accept=".svg,image/svg+xml" hidden>
42
<input id="open-file" type="file" accept=".tdrw,application/json" hidden>
34
43
</div>
35
44
<label class="field">Voorbeeld uit Bachin
36
45
<select id="demos">
@@ -66,6 +75,7 @@
66
75
<button id="btn-back" type="button">Achter</button>
67
76
<button id="btn-front" type="button">Voor</button>
68
77
</div>
78
<label class="check"><input id="per-object" type="checkbox"> Objecten individueel tekenen</label>
69
79
<p class="hint">Slepen verplaatst. Hoeken schalen. Het handvat boven het kader draait. Delete wist, Ctrl+C /
70
80
Ctrl+V kopieert.</p>
71
81
</section>
@@ -97,8 +107,6 @@
97
107
<label class="check"><input id="prop-line" type="checkbox" checked> Lijn</label>
98
108
<label class="check"><input id="prop-fill" type="checkbox"> Vulling</label>
99
109
</div>
100
<p class="hint">Lijn tekent de paden zelf. Vulling zet er een arcering in. Allebei aan tekent de contour en de
101
arcering.</p>
102
110
<div class="split">
103
111
<label class="field">Hoek °
104
112
<input id="prop-angle" type="number" min="-180" max="180" step="1" value="45">
@@ -127,8 +135,6 @@
127
135
<p class="hint">Donkerder wordt krapper gearceerd. Lichter krijgt meer afstand. Bijna-wit slaat Timdraw over.
128
136
</p>
129
137
</div>
130
<p id="defaults-hint" class="hint">Zonder selectie gelden deze waarden voor het volgende import- of tekstobject.
131
</p>
132
138
</section>
133
139
<section>
134
140
<h2>Machine</h2>
@@ -179,22 +185,10 @@
179
185
<option value="bottom-left">Linksonder</option>
180
186
</select>
181
187
</label>
182
<label class="check"><input id="return-home" type="checkbox" checked> Terug naar nulpunt</label>
183
<label class="check"><input id="allow-outside" type="checkbox"> Toch buiten A4 sturen</label>
184
188
<p id="stats" class="hint"></p>
185
189
<div class="progress">
186
190
<div id="bar"></div>
187
191
</div>
188
<div class="row">
189
<button id="btn-plot" type="button" class="primary">Teken</button>
190
<button id="btn-pause" type="button">Pauze</button>
191
<button id="btn-stop" type="button">Stop</button>
192
<button id="btn-trace" type="button">Voorbeeld</button>
193
</div>
194
<p class="hint">Na homing ligt het nulpunt linksboven. X loopt naar rechts tot 200 mm. Y omhoog is positief,
195
dus het blad loopt naar beneden tot −297 mm. Pen omhoog is Z 0, pen omlaag Z 5. Verplaatsingen gaan met G1,
196
zodat de snelheid echt geldt.
197
</p>
198
192
</section>
199
193
</aside>
200
194
</div>
@@ -18,8 +18,14 @@18
</button>18
</button>19
<a id="local-url" href="http://127.0.0.1:8765/">127.0.0.1:8765</a>19
<a id="local-url" href="http://127.0.0.1:8765/">127.0.0.1:8765</a>20
</div>20
</div>21
<p id="toast" class="toast" hidden></p>21
<div class="plot-actions">22
<button id="btn-plot" type="button" class="primary">Teken</button>23
<button id="btn-pause" type="button">Pauze</button>24
<button id="btn-trace" type="button">Voorbeeld</button>25
<button id="btn-stop" type="button">Stop</button>26
</div>22
<div class="header-actions">27
<div class="header-actions">28
<p id="toast" class="toast" hidden></p>23
<button id="btn-fit" type="button">Passend</button>29
<button id="btn-fit" type="button">Passend</button>24
<label class="check"><input id="show-travel" type="checkbox"> Verplaatsingen</label>30
<label class="check"><input id="show-travel" type="checkbox"> Verplaatsingen</label>25
</div>31
</div>@@ -28,9 +34,12 @@28
<aside class="panel left">34
<aside class="panel left">29
<section>35
<section>30
<h2>Tekening</h2>36
<h2>Tekening</h2>31
<div class="row">37
<div class="row wrap">32
<button id="btn-import" type="button" class="primary">Importeer SVG</button>38
<button id="btn-import" type="button" class="primary">Importeer SVG</button>39
<button id="btn-open" type="button">Open</button>40
<button id="btn-save" type="button">Opslaan</button>33
<input id="file" type="file" accept=".svg,image/svg+xml" hidden>41
<input id="file" type="file" accept=".svg,image/svg+xml" hidden>42
<input id="open-file" type="file" accept=".tdrw,application/json" hidden>34
</div>43
</div>35
<label class="field">Voorbeeld uit Bachin44
<label class="field">Voorbeeld uit Bachin36
<select id="demos">45
<select id="demos">@@ -66,6 +75,7 @@66
<button id="btn-back" type="button">Achter</button>75
<button id="btn-back" type="button">Achter</button>67
<button id="btn-front" type="button">Voor</button>76
<button id="btn-front" type="button">Voor</button>68
</div>77
</div>78
<label class="check"><input id="per-object" type="checkbox"> Objecten individueel tekenen</label>69
<p class="hint">Slepen verplaatst. Hoeken schalen. Het handvat boven het kader draait. Delete wist, Ctrl+C /79
<p class="hint">Slepen verplaatst. Hoeken schalen. Het handvat boven het kader draait. Delete wist, Ctrl+C /70
Ctrl+V kopieert.</p>80
Ctrl+V kopieert.</p>71
</section>81
</section>@@ -97,8 +107,6 @@97
<label class="check"><input id="prop-line" type="checkbox" checked> Lijn</label>107
<label class="check"><input id="prop-line" type="checkbox" checked> Lijn</label>98
<label class="check"><input id="prop-fill" type="checkbox"> Vulling</label>108
<label class="check"><input id="prop-fill" type="checkbox"> Vulling</label>99
</div>109
</div>100
<p class="hint">Lijn tekent de paden zelf. Vulling zet er een arcering in. Allebei aan tekent de contour en de101
arcering.</p>102
<div class="split">110
<div class="split">103
<label class="field">Hoek °111
<label class="field">Hoek °104
<input id="prop-angle" type="number" min="-180" max="180" step="1" value="45">112
<input id="prop-angle" type="number" min="-180" max="180" step="1" value="45">@@ -127,8 +135,6 @@127
<p class="hint">Donkerder wordt krapper gearceerd. Lichter krijgt meer afstand. Bijna-wit slaat Timdraw over.135
<p class="hint">Donkerder wordt krapper gearceerd. Lichter krijgt meer afstand. Bijna-wit slaat Timdraw over.128
</p>136
</p>129
</div>137
</div>130
<p id="defaults-hint" class="hint">Zonder selectie gelden deze waarden voor het volgende import- of tekstobject.131
</p>132
</section>138
</section>133
<section>139
<section>134
<h2>Machine</h2>140
<h2>Machine</h2>@@ -179,22 +185,10 @@179
<option value="bottom-left">Linksonder</option>185
<option value="bottom-left">Linksonder</option>180
</select>186
</select>181
</label>187
</label>182
<label class="check"><input id="return-home" type="checkbox" checked> Terug naar nulpunt</label>183
<label class="check"><input id="allow-outside" type="checkbox"> Toch buiten A4 sturen</label>184
<p id="stats" class="hint"></p>188
<p id="stats" class="hint"></p>185
<div class="progress">189
<div class="progress">186
<div id="bar"></div>190
<div id="bar"></div>187
</div>191
</div>188
<div class="row">189
<button id="btn-plot" type="button" class="primary">Teken</button>190
<button id="btn-pause" type="button">Pauze</button>191
<button id="btn-stop" type="button">Stop</button>192
<button id="btn-trace" type="button">Voorbeeld</button>193
</div>194
<p class="hint">Na homing ligt het nulpunt linksboven. X loopt naar rechts tot 200 mm. Y omhoog is positief,195
dus het blad loopt naar beneden tot −297 mm. Pen omhoog is Z 0, pen omlaag Z 5. Verplaatsingen gaan met G1,196
zodat de snelheid echt geldt.197
</p>198
</section>192
</section>199
</aside>193
</aside>200
</div>194
</div>@@ -76,13 +76,20 @@ textarea {
76
76
}
77
77
78
78
header {
79
display: flex;
79
display: grid;
80
grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);
80
81
align-items: center;
81
gap: 1rem;
82
gap: 0.8rem;
82
83
padding: 0.65rem 1rem;
83
84
border-bottom: 1px solid var(--line);
84
85
}
85
86
87
.plot-actions {
88
display: flex;
89
gap: 0.4rem;
90
justify-self: center;
91
}
92
86
93
.brand {
87
94
display: flex;
88
95
flex-direction: column;
@@ -142,7 +149,7 @@ header {
142
149
}
143
150
144
151
.header-actions {
145
margin-left: auto;
152
justify-self: end;
146
153
display: flex;
147
154
gap: 0.8rem;
148
155
align-items: center;
@@ -355,6 +362,16 @@ canvas {
355
362
}
356
363
357
364
@media (max-width: 860px) {
365
header {
366
grid-template-columns: 1fr auto;
367
}
368
369
.plot-actions {
370
grid-column: 1 / -1;
371
grid-row: 2;
372
justify-self: center;
373
}
374
358
375
body {
359
376
height: auto;
360
377
min-height: 100%;
@@ -76,13 +76,20 @@ textarea {76
}76
}77
77
78
header {78
header {79
display: flex;79
display: grid;80
grid-template-columns: minmax(0, 1fr) auto minmax(0, 1fr);80
align-items: center;81
align-items: center;81
gap: 1rem;82
gap: 0.8rem;82
padding: 0.65rem 1rem;83
padding: 0.65rem 1rem;83
border-bottom: 1px solid var(--line);84
border-bottom: 1px solid var(--line);84
}85
}85
86
87
.plot-actions {88
display: flex;89
gap: 0.4rem;90
justify-self: center;91
}92
86
.brand {93
.brand {87
display: flex;94
display: flex;88
flex-direction: column;95
flex-direction: column;@@ -142,7 +149,7 @@ header {142
}149
}143
150
144
.header-actions {151
.header-actions {145
margin-left: auto;152
justify-self: end;146
display: flex;153
display: flex;147
gap: 0.8rem;154
gap: 0.8rem;148
align-items: center;155
align-items: center;@@ -355,6 +362,16 @@ canvas {355
}362
}356
363
357
@media (max-width: 860px) {364
@media (max-width: 860px) {365
header {366
grid-template-columns: 1fr auto;367
}368
369
.plot-actions {370
grid-column: 1 / -1;371
grid-row: 2;372
justify-self: center;373
}374
358
body {375
body {359
height: auto;376
height: auto;360
min-height: 100%;377
min-height: 100%;@@ -153,11 +153,10 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
153
153
pen_down = _clamp(float(settings.get("penDownZ", 5)), 0, 12)
154
154
dwell = _clamp(float(settings.get("dwellMs", 120)), 0, 2000) / 1000.0
155
155
origin_top = settings.get("origin") == "top-left"
156
return_home = bool(settings.get("returnHome", True))
157
allow_outside = bool(settings.get("allowOutside", False))
158
156
trace = bool(settings.get("trace"))
157
per_object = bool(settings.get("perObject"))
159
158
160
draw: list[Polyline] = []
159
groups: list[list[Polyline]] = []
161
160
warnings: list[str] = []
162
161
for obj in objects:
163
162
if obj.get("hidden"):
@@ -178,17 +177,20 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
178
177
def mapped(pts: Polyline) -> Polyline:
179
178
return [transform_point(x, y, obj) for x, y in pts]
180
179
180
bucket: list[Polyline] = []
181
181
182
if trace:
182
183
for pts in _outer_paths(strokes, fills):
183
184
if len(pts) >= 2:
184
draw.append(mapped(pts))
185
bucket.append(mapped(pts))
186
groups.append(bucket)
185
187
continue
186
188
187
189
def add_hatch(rings: list[Polyline], gap: float, rule: str) -> None:
188
190
lines = hatch(rings, angle, gap, rule)
189
191
if cross:
190
192
lines += hatch(rings, angle + 90, gap, rule)
191
draw.extend(lines)
193
bucket.extend(lines)
192
194
193
195
if want_fill and fills:
194
196
for fill in fills:
@@ -204,7 +206,7 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
204
206
from_fill = bool(stroke.get("fromFill")) if isinstance(stroke, dict) else False
205
207
if from_fill or closed or len(pts) < 2:
206
208
continue
207
draw.append(mapped(pts))
209
bucket.append(mapped(pts))
208
210
elif want_fill:
209
211
for stroke in strokes:
210
212
pts = _stroke_points(stroke)
@@ -214,28 +216,31 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
214
216
if closed:
215
217
add_hatch([mapped(pts)], spacing, "evenodd")
216
218
elif not want_line:
217
draw.append(mapped(pts))
219
bucket.append(mapped(pts))
218
220
warnings.append("Open lijnen blijven een lijn, ook als alleen vulling aan staat.")
219
221
if want_line:
220
222
for stroke in strokes:
221
223
pts = _stroke_points(stroke)
222
224
if len(pts) >= 2:
223
draw.append(mapped(pts))
225
bucket.append(mapped(pts))
226
groups.append(bucket)
224
227
225
228
# Dubbele waarschuwing maar één keer.
226
229
warnings = list(dict.fromkeys(warnings))
227
draw = [pts for pts in draw if length_of(pts) >= 0.15]
228
230
start = (0.0, A4_H if origin_top else 0.0)
229
draw = _order_paths(draw, start)
230
outside = []
231
for pts in draw:
232
for x, y in pts:
233
if x < -0.2 or y < -0.2 or x > A4_W + 0.2 or y > A4_H + 0.2:
234
outside.append((x, y))
235
break
236
if outside and not allow_outside:
237
warnings.append("Een deel valt buiten A4. Zet het op het blad of vink 'toch buiten A4' aan.")
238
231
draw: list[Polyline] = []
232
pos = start
233
if per_object:
234
for group in groups:
235
chunk = [pts for pts in group if length_of(pts) >= 0.15]
236
if not chunk:
237
continue
238
chunk = _order_paths(chunk, pos)
239
draw.extend(chunk)
240
pos = chunk[-1][-1]
241
else:
242
flat = [pts for group in groups for pts in group if length_of(pts) >= 0.15]
243
draw = _order_paths(flat, start)
239
244
travel: list[Polyline] = []
240
245
gcode = ["; Timdraw", "G21", "G90", "G94"]
241
246
pen_down_state = True
@@ -304,19 +309,12 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
304
309
page_at = pts[-1]
305
310
if not trace:
306
311
pen(False)
307
home = (0.0, A4_H if origin_top else 0.0)
308
if return_home and page_at is not None and dist(page_at, home) > 0.05:
309
hx, hy = machine_point(home[0], home[1])
310
gcode.append(f"G1 X{hx:.3f} Y{hy:.3f}{set_feed(travel_speed)}")
311
travel.append([page_at, home])
312
travel_mm += dist(page_at, home)
313
312
gcode.append("G4 P0.1")
314
313
315
314
if clipped:
316
315
warnings.append("Een deel ligt buiten het bereik van de wagen, 200 bij 297 mm, en blijft op de rand.")
317
316
pen_lifts = sum(1 for line in gcode if line.startswith("G1 Z"))
318
317
seconds = draw_mm / draw_speed * 60 + travel_mm / travel_speed * 60 + pen_lifts * (dwell + 0.15)
319
blocked = bool(outside) and not allow_outside
320
318
return {
321
319
"draw": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in draw],
322
320
"travel": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in travel],
@@ -326,8 +324,7 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:
326
324
"drawMm": round(draw_mm, 1),
327
325
"travelMm": round(travel_mm, 1),
328
326
"seconds": round(seconds, 1),
329
"outside": bool(outside),
330
"blocked": blocked,
327
"outside": clipped,
331
328
"lines": len(gcode),
332
329
},
333
330
}
@@ -153,11 +153,10 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:153
pen_down = _clamp(float(settings.get("penDownZ", 5)), 0, 12)153
pen_down = _clamp(float(settings.get("penDownZ", 5)), 0, 12)154
dwell = _clamp(float(settings.get("dwellMs", 120)), 0, 2000) / 1000.0154
dwell = _clamp(float(settings.get("dwellMs", 120)), 0, 2000) / 1000.0155
origin_top = settings.get("origin") == "top-left"155
origin_top = settings.get("origin") == "top-left"156
return_home = bool(settings.get("returnHome", True))157
allow_outside = bool(settings.get("allowOutside", False))158
trace = bool(settings.get("trace"))156
trace = bool(settings.get("trace"))157
per_object = bool(settings.get("perObject"))159
158
160
draw: list[Polyline] = []159
groups: list[list[Polyline]] = []161
warnings: list[str] = []160
warnings: list[str] = []162
for obj in objects:161
for obj in objects:163
if obj.get("hidden"):162
if obj.get("hidden"):@@ -178,17 +177,20 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:178
def mapped(pts: Polyline) -> Polyline:177
def mapped(pts: Polyline) -> Polyline:179
return [transform_point(x, y, obj) for x, y in pts]178
return [transform_point(x, y, obj) for x, y in pts]180
179
180
bucket: list[Polyline] = []181
181
if trace:182
if trace:182
for pts in _outer_paths(strokes, fills):183
for pts in _outer_paths(strokes, fills):183
if len(pts) >= 2:184
if len(pts) >= 2:184
draw.append(mapped(pts))185
bucket.append(mapped(pts))186
groups.append(bucket)185
continue187
continue186
188
187
def add_hatch(rings: list[Polyline], gap: float, rule: str) -> None:189
def add_hatch(rings: list[Polyline], gap: float, rule: str) -> None:188
lines = hatch(rings, angle, gap, rule)190
lines = hatch(rings, angle, gap, rule)189
if cross:191
if cross:190
lines += hatch(rings, angle + 90, gap, rule)192
lines += hatch(rings, angle + 90, gap, rule)191
draw.extend(lines)193
bucket.extend(lines)192
194
193
if want_fill and fills:195
if want_fill and fills:194
for fill in fills:196
for fill in fills:@@ -204,7 +206,7 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:204
from_fill = bool(stroke.get("fromFill")) if isinstance(stroke, dict) else False206
from_fill = bool(stroke.get("fromFill")) if isinstance(stroke, dict) else False205
if from_fill or closed or len(pts) < 2:207
if from_fill or closed or len(pts) < 2:206
continue208
continue207
draw.append(mapped(pts))209
bucket.append(mapped(pts))208
elif want_fill:210
elif want_fill:209
for stroke in strokes:211
for stroke in strokes:210
pts = _stroke_points(stroke)212
pts = _stroke_points(stroke)@@ -214,28 +216,31 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:214
if closed:216
if closed:215
add_hatch([mapped(pts)], spacing, "evenodd")217
add_hatch([mapped(pts)], spacing, "evenodd")216
elif not want_line:218
elif not want_line:217
draw.append(mapped(pts))219
bucket.append(mapped(pts))218
warnings.append("Open lijnen blijven een lijn, ook als alleen vulling aan staat.")220
warnings.append("Open lijnen blijven een lijn, ook als alleen vulling aan staat.")219
if want_line:221
if want_line:220
for stroke in strokes:222
for stroke in strokes:221
pts = _stroke_points(stroke)223
pts = _stroke_points(stroke)222
if len(pts) >= 2:224
if len(pts) >= 2:223
draw.append(mapped(pts))225
bucket.append(mapped(pts))226
groups.append(bucket)224
227
225
# Dubbele waarschuwing maar één keer.228
# Dubbele waarschuwing maar één keer.226
warnings = list(dict.fromkeys(warnings))229
warnings = list(dict.fromkeys(warnings))227
draw = [pts for pts in draw if length_of(pts) >= 0.15]228
start = (0.0, A4_H if origin_top else 0.0)230
start = (0.0, A4_H if origin_top else 0.0)229
draw = _order_paths(draw, start)231
draw: list[Polyline] = []230
outside = []232
pos = start231
for pts in draw:233
if per_object:232
for x, y in pts:234
for group in groups:233
if x < -0.2 or y < -0.2 or x > A4_W + 0.2 or y > A4_H + 0.2:235
chunk = [pts for pts in group if length_of(pts) >= 0.15]234
outside.append((x, y))236
if not chunk:235
break237
continue236
if outside and not allow_outside:238
chunk = _order_paths(chunk, pos)237
warnings.append("Een deel valt buiten A4. Zet het op het blad of vink 'toch buiten A4' aan.")239
draw.extend(chunk)238
240
pos = chunk[-1][-1]241
else:242
flat = [pts for group in groups for pts in group if length_of(pts) >= 0.15]243
draw = _order_paths(flat, start)239
travel: list[Polyline] = []244
travel: list[Polyline] = []240
gcode = ["; Timdraw", "G21", "G90", "G94"]245
gcode = ["; Timdraw", "G21", "G90", "G94"]241
pen_down_state = True246
pen_down_state = True@@ -304,19 +309,12 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:304
page_at = pts[-1]309
page_at = pts[-1]305
if not trace:310
if not trace:306
pen(False)311
pen(False)307
home = (0.0, A4_H if origin_top else 0.0)308
if return_home and page_at is not None and dist(page_at, home) > 0.05:309
hx, hy = machine_point(home[0], home[1])310
gcode.append(f"G1 X{hx:.3f} Y{hy:.3f}{set_feed(travel_speed)}")311
travel.append([page_at, home])312
travel_mm += dist(page_at, home)313
gcode.append("G4 P0.1")312
gcode.append("G4 P0.1")314
313
315
if clipped:314
if clipped:316
warnings.append("Een deel ligt buiten het bereik van de wagen, 200 bij 297 mm, en blijft op de rand.")315
warnings.append("Een deel ligt buiten het bereik van de wagen, 200 bij 297 mm, en blijft op de rand.")317
pen_lifts = sum(1 for line in gcode if line.startswith("G1 Z"))316
pen_lifts = sum(1 for line in gcode if line.startswith("G1 Z"))318
seconds = draw_mm / draw_speed * 60 + travel_mm / travel_speed * 60 + pen_lifts * (dwell + 0.15)317
seconds = draw_mm / draw_speed * 60 + travel_mm / travel_speed * 60 + pen_lifts * (dwell + 0.15)319
blocked = bool(outside) and not allow_outside320
return {318
return {321
"draw": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in draw],319
"draw": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in draw],322
"travel": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in travel],320
"travel": [[[round(x, 3), round(y, 3)] for x, y in pts] for pts in travel],@@ -326,8 +324,7 @@ def plan(objects: list[dict], settings: dict | None = None) -> dict:326
"drawMm": round(draw_mm, 1),324
"drawMm": round(draw_mm, 1),327
"travelMm": round(travel_mm, 1),325
"travelMm": round(travel_mm, 1),328
"seconds": round(seconds, 1),326
"seconds": round(seconds, 1),329
"outside": bool(outside),327
"outside": clipped,330
"blocked": blocked,331
"lines": len(gcode),328
"lines": len(gcode),332
},329
},333
}330
}@@ -60,7 +60,8 @@ def test_text_and_gcode() -> None:
60
60
both["drawFill"] = True
61
61
both_plan = plan([both], {"drawSpeed": 2500, "travelSpeed": 4000})
62
62
check("lijn en vulling samen", both_plan["stats"]["drawMm"] > planned["stats"]["drawMm"], str(both_plan["stats"]["drawMm"]))
63
check("niet geblokkeerd", not planned["stats"]["blocked"], str(planned["warnings"]))
63
flower = import_svg((DEMO / "SVG2.svg").read_text(encoding="utf-8", errors="replace"))
64
check("SVG2.svg heeft paden", len(flower["strokes"]) > 0, f"{len(flower['strokes'])} paden")
64
65
dolphin = import_svg((DEMO / "Dolphin.svg").read_text(encoding="utf-8", errors="replace"))
65
66
grays = sorted({fill["gray"] for fill in dolphin["fills"]})
66
67
check("dolfijn houdt kleurverschil", len(grays) >= 1 and grays[0] < 0.5, str(grays))
@@ -74,7 +75,7 @@ def test_text_and_gcode() -> None:
74
75
corner = plan([{
75
76
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
76
77
"strokes": [{"pts": [(0, 297), (20, 277)]}],
77
}], {"origin": "top-left", "returnHome": True})
78
}], {"origin": "top-left"})
78
79
check("homehoek blijft X0 Y0", "X0.000 Y0.000" in corner["gcode"], corner["gcode"])
79
80
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])
80
81
check("pen gebruikt verplaatsingssnelheid", "G1 Z5.000 F4000" in planned["gcode"])
@@ -93,6 +94,22 @@ def test_text_and_gcode() -> None:
93
94
check("aansluitende lijn direct daarna", "X10.000 Y-10.000" in moves[2], " | ".join(moves[:4]))
94
95
pen_ups = [line for line in linked["gcode"].splitlines() if line.startswith("G1 Z0")]
95
96
check("geen pen omhoog tussen aansluitende lijnen", len(pen_ups) == 3, str(pen_ups))
97
grouped = plan([
98
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
99
"strokes": [{"pts": [(100, 100), (120, 100)]}]},
100
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
101
"strokes": [{"pts": [(0, 297), (20, 297)]}]},
102
], {"origin": "top-left", "perObject": True, "returnHome": False, "travelSpeed": 4000})
103
grouped_moves = [line for line in grouped["gcode"].splitlines() if line.startswith("G1 X")]
104
check("eerst het eerste object", "X100.000" in grouped_moves[0], " | ".join(grouped_moves[:3]))
105
mixed = plan([
106
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
107
"strokes": [{"pts": [(100, 100), (120, 100)]}]},
108
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,
109
"strokes": [{"pts": [(0, 297), (20, 297)]}]},
110
], {"origin": "top-left", "returnHome": False, "travelSpeed": 4000})
111
mixed_moves = [line for line in mixed["gcode"].splitlines() if line.startswith("G1 X")]
112
check("zonder groeperen de dichtstbijzijnde", mixed_moves[0].startswith("G1 X0.000 Y0.000"), " | ".join(mixed_moves[:2]))
96
113
step_x, step_y, note = limit_step(0, -287, 0, -50)
97
114
check("vanaf -287 nog 10 mm omlaag", abs(step_y + 10) < 0.01 and abs(step_x) < 0.01, note or "")
98
115
check("limiettoast", note == "10 van 50 mm bewogen, daarna limiet bereikt", note or "")
@@ -60,7 +60,8 @@ def test_text_and_gcode() -> None:60
both["drawFill"] = True60
both["drawFill"] = True61
both_plan = plan([both], {"drawSpeed": 2500, "travelSpeed": 4000})61
both_plan = plan([both], {"drawSpeed": 2500, "travelSpeed": 4000})62
check("lijn en vulling samen", both_plan["stats"]["drawMm"] > planned["stats"]["drawMm"], str(both_plan["stats"]["drawMm"]))62
check("lijn en vulling samen", both_plan["stats"]["drawMm"] > planned["stats"]["drawMm"], str(both_plan["stats"]["drawMm"]))63
check("niet geblokkeerd", not planned["stats"]["blocked"], str(planned["warnings"]))63
flower = import_svg((DEMO / "SVG2.svg").read_text(encoding="utf-8", errors="replace"))64
check("SVG2.svg heeft paden", len(flower["strokes"]) > 0, f"{len(flower['strokes'])} paden")64
dolphin = import_svg((DEMO / "Dolphin.svg").read_text(encoding="utf-8", errors="replace"))65
dolphin = import_svg((DEMO / "Dolphin.svg").read_text(encoding="utf-8", errors="replace"))65
grays = sorted({fill["gray"] for fill in dolphin["fills"]})66
grays = sorted({fill["gray"] for fill in dolphin["fills"]})66
check("dolfijn houdt kleurverschil", len(grays) >= 1 and grays[0] < 0.5, str(grays))67
check("dolfijn houdt kleurverschil", len(grays) >= 1 and grays[0] < 0.5, str(grays))@@ -74,7 +75,7 @@ def test_text_and_gcode() -> None:74
corner = plan([{75
corner = plan([{75
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,76
"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,76
"strokes": [{"pts": [(0, 297), (20, 277)]}],77
"strokes": [{"pts": [(0, 297), (20, 277)]}],77
}], {"origin": "top-left", "returnHome": True})78
}], {"origin": "top-left"})78
check("homehoek blijft X0 Y0", "X0.000 Y0.000" in corner["gcode"], corner["gcode"])79
check("homehoek blijft X0 Y0", "X0.000 Y0.000" in corner["gcode"], corner["gcode"])79
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])80
check("blad ligt rechts en onder het nulpunt", "X20.000 Y-20.000" in corner["gcode"])80
check("pen gebruikt verplaatsingssnelheid", "G1 Z5.000 F4000" in planned["gcode"])81
check("pen gebruikt verplaatsingssnelheid", "G1 Z5.000 F4000" in planned["gcode"])@@ -93,6 +94,22 @@ def test_text_and_gcode() -> None:93
check("aansluitende lijn direct daarna", "X10.000 Y-10.000" in moves[2], " | ".join(moves[:4]))94
check("aansluitende lijn direct daarna", "X10.000 Y-10.000" in moves[2], " | ".join(moves[:4]))94
pen_ups = [line for line in linked["gcode"].splitlines() if line.startswith("G1 Z0")]95
pen_ups = [line for line in linked["gcode"].splitlines() if line.startswith("G1 Z0")]95
check("geen pen omhoog tussen aansluitende lijnen", len(pen_ups) == 3, str(pen_ups))96
check("geen pen omhoog tussen aansluitende lijnen", len(pen_ups) == 3, str(pen_ups))97
grouped = plan([98
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,99
"strokes": [{"pts": [(100, 100), (120, 100)]}]},100
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,101
"strokes": [{"pts": [(0, 297), (20, 297)]}]},102
], {"origin": "top-left", "perObject": True, "returnHome": False, "travelSpeed": 4000})103
grouped_moves = [line for line in grouped["gcode"].splitlines() if line.startswith("G1 X")]104
check("eerst het eerste object", "X100.000" in grouped_moves[0], " | ".join(grouped_moves[:3]))105
mixed = plan([106
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,107
"strokes": [{"pts": [(100, 100), (120, 100)]}]},108
{"x": 0, "y": 0, "scale": 1, "rotation": 0, "drawLine": True, "drawFill": False,109
"strokes": [{"pts": [(0, 297), (20, 297)]}]},110
], {"origin": "top-left", "returnHome": False, "travelSpeed": 4000})111
mixed_moves = [line for line in mixed["gcode"].splitlines() if line.startswith("G1 X")]112
check("zonder groeperen de dichtstbijzijnde", mixed_moves[0].startswith("G1 X0.000 Y0.000"), " | ".join(mixed_moves[:2]))96
step_x, step_y, note = limit_step(0, -287, 0, -50)113
step_x, step_y, note = limit_step(0, -287, 0, -50)97
check("vanaf -287 nog 10 mm omlaag", abs(step_y + 10) < 0.01 and abs(step_x) < 0.01, note or "")114
check("vanaf -287 nog 10 mm omlaag", abs(step_y + 10) < 0.01 and abs(step_x) < 0.01, note or "")98
check("limiettoast", note == "10 van 50 mm bewogen, daarna limiet bereikt", note or "")115
check("limiettoast", note == "10 van 50 mm bewogen, daarna limiet bereikt", note or "")@@ -134,9 +134,6 @@ class Handler(BaseHTTPRequestHandler):
134
134
return
135
135
if path == "/api/plot":
136
136
planned = plan(data.get("objects") or [], data.get("settings") or {})
137
if planned["stats"]["blocked"]:
138
self._error(planned["warnings"][0] if planned["warnings"] else "Buiten A4", 400)
139
return
140
137
MACHINE.start_job(planned["gcode"])
141
138
self._json({"ok": True, "stats": planned["stats"]})
142
139
return
@@ -178,9 +175,6 @@ class Handler(BaseHTTPRequestHandler):
178
175
if not planned["draw"]:
179
176
self._error("Er is niets om te volgen.", 400)
180
177
return
181
if planned["stats"]["blocked"]:
182
self._error(planned["warnings"][0] if planned["warnings"] else "Buiten A4", 400)
183
return
184
178
MACHINE.start_job(planned["gcode"])
185
179
self._json({"ok": True, "stats": planned["stats"]})
186
180
return
@@ -134,9 +134,6 @@ class Handler(BaseHTTPRequestHandler):134
return134
return135
if path == "/api/plot":135
if path == "/api/plot":136
planned = plan(data.get("objects") or [], data.get("settings") or {})136
planned = plan(data.get("objects") or [], data.get("settings") or {})137
if planned["stats"]["blocked"]:138
self._error(planned["warnings"][0] if planned["warnings"] else "Buiten A4", 400)139
return140
MACHINE.start_job(planned["gcode"])137
MACHINE.start_job(planned["gcode"])141
self._json({"ok": True, "stats": planned["stats"]})138
self._json({"ok": True, "stats": planned["stats"]})142
return139
return@@ -178,9 +175,6 @@ class Handler(BaseHTTPRequestHandler):178
if not planned["draw"]:175
if not planned["draw"]:179
self._error("Er is niets om te volgen.", 400)176
self._error("Er is niets om te volgen.", 400)180
return177
return181
if planned["stats"]["blocked"]:182
self._error(planned["warnings"][0] if planned["warnings"] else "Buiten A4", 400)183
return184
MACHINE.start_job(planned["gcode"])178
MACHINE.start_job(planned["gcode"])185
self._json({"ok": True, "stats": planned["stats"]})179
self._json({"ok": True, "stats": planned["stats"]})186
return180
return@@ -427,10 +427,20 @@ def _ellipse(cx: float, cy: float, rx: float, ry: float, tol: float) -> Polyline
427
427
]
428
428
429
429
430
def import_svg(text: str, curve_tol: float = 0.08) -> dict:
430
def _prepare_xml(text: str) -> str:
431
431
text = text.lstrip("\ufeff")
432
text = re.sub(r"<!DOCTYPE[^>]*>", "", text, count=1, flags=re.I)
433
root = ET.fromstring(text)
432
match = re.search(r"<!DOCTYPE\s+[^>[]*\[(.*?)\]\s*>", text, flags=re.I | re.S)
433
if match:
434
entities = dict(re.findall(r'<!ENTITY\s+(\w+)\s+"([^"]*)"\s*>', match.group(1)))
435
text = text[: match.start()] + text[match.end() :]
436
for name, value in entities.items():
437
text = text.replace(f"&{name};", value)
438
return text
439
return re.sub(r"<!DOCTYPE[^>]*>", "", text, count=1, flags=re.I)
440
441
442
def import_svg(text: str, curve_tol: float = 0.08) -> dict:
443
root = ET.fromstring(_prepare_xml(text))
434
444
css: dict[str, dict[str, str]] = {}
435
445
warnings: list[str] = []
436
446
@@ -427,10 +427,20 @@ def _ellipse(cx: float, cy: float, rx: float, ry: float, tol: float) -> Polyline427
]427
]428
428
429
429
430
def import_svg(text: str, curve_tol: float = 0.08) -> dict:430
def _prepare_xml(text: str) -> str:431
text = text.lstrip("\ufeff")431
text = text.lstrip("\ufeff")432
text = re.sub(r"<!DOCTYPE[^>]*>", "", text, count=1, flags=re.I)432
match = re.search(r"<!DOCTYPE\s+[^>[]*\[(.*?)\]\s*>", text, flags=re.I | re.S)433
root = ET.fromstring(text)433
if match:434
entities = dict(re.findall(r'<!ENTITY\s+(\w+)\s+"([^"]*)"\s*>', match.group(1)))435
text = text[: match.start()] + text[match.end() :]436
for name, value in entities.items():437
text = text.replace(f"&{name};", value)438
return text439
return re.sub(r"<!DOCTYPE[^>]*>", "", text, count=1, flags=re.I)440
441
442
def import_svg(text: str, curve_tol: float = 0.08) -> dict:443
root = ET.fromstring(_prepare_xml(text))434
css: dict[str, dict[str, str]] = {}444
css: dict[str, dict[str, str]] = {}435
warnings: list[str] = []445
warnings: list[str] = []436
446