ilia.gurielidze/scada_device_layout
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix DPM/button bindings and strip _PB from tag paths

Browse Source 
DPM: only elements[1] gets fill.paint binding (black triangle),
elements[0] and [2] keep their static colors.

Buttons (JR, S, SS, EN): no elements[0].fill.paint binding —
background rect keeps static color. Only text gets contrast binding.

Tag paths: strip _PB/_SPB/_STPB suffixes from button labels to
match PLC naming (UL17_19_S1 not UL17_19_S1_PB).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
igurielidze 2026-04-01 18:49:25 +04:00
parent 1f46c89479
commit c72d0cceee
2 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
svelte-app/src/lib/export.ts
View File

@ -136,11 +136,16 @@ const TAG_PATH_RULES: Array<{ pattern: RegExp; path: string }> = [
/** Build Ignition tag path from device label and MCM name. /** Build Ignition tag path from device label and MCM name.
* Format: System/{MCM}/{Category}/{SubCategory}/{Label} * Format: System/{MCM}/{Category}/{SubCategory}/{Label}
* Mappings derived from Excel device manifest suffixes. */ * Mappings derived from Excel device manifest suffixes. */
/** Strip _PB/_SPB/_STPB suffixes from button labels — PLC uses S1, JR1, SS1 not S1_PB */
function stripButtonSuffix(label: string): string {
return label.replace(/_S?T?PB$/i, '');
}
function getIgnitionTagPath(label: string, mcm: string): string | null { function getIgnitionTagPath(label: string, mcm: string): string | null {
if (!label) return null; if (!label) return null;
if (/^MCM\d*/i.test(label)) return null; if (/^MCM\d*/i.test(label)) return null;
for (const rule of TAG_PATH_RULES) { for (const rule of TAG_PATH_RULES) {
if (rule.pattern.test(label)) return `System/${mcm}/${rule.path}/${label}`; if (rule.pattern.test(label)) return `System/${mcm}/${rule.path}/${stripButtonSuffix(label)}`;
} }
return null; return null;
} }

36
svelte-app/src/lib/ignition-view.ts
View File

@ -311,15 +311,35 @@ function generateElementBindings(elements: SvgElement[]): Record<string, any> {
propConfig[`${prefix}.state`] = stateBinding(n); propConfig[`${prefix}.state`] = stateBinding(n);
propConfig[`${prefix}.priority`] = priorityBinding(n); propConfig[`${prefix}.priority`] = priorityBinding(n);
// Sub-element fill bindings // Sub-element fill bindings — varies by device type
const isButton = /_(?:JR|S|SS|EN)\d/i.test(elName);
const isDpm = /_DPM\d*/i.test(elName);
if (el.elements && el.elements.length > 0) { if (el.elements && el.elements.length > 0) {
for (let m = 0; m < el.elements.length; m++) { if (isDpm) {
const sub = el.elements[m]; // DPM: only elements[1] gets color binding (the black triangle)
if (sub.type === 'text') { // elements[0] stays as-is, elements[2] is transparent
propConfig[`${prefix}.elements[${m}].fill.paint`] = textFillBinding(n); if (el.elements.length > 1) {
} else { propConfig[`${prefix}.elements[1].fill.paint`] = fillPaintBinding(n);
// rect, path, etc. — background fill }
propConfig[`${prefix}.elements[${m}].fill.paint`] = fillPaintBinding(n); } else if (isButton) {
// Buttons: NO fill binding on elements[0] (background rect keeps static color)
// Only text elements get contrast color binding
for (let m = 0; m < el.elements.length; m++) {
const sub = el.elements[m];
if (sub.type === 'text') {
propConfig[`${prefix}.elements[${m}].fill.paint`] = textFillBinding(n);
}
}
} else {
// Default: background gets color, text gets contrast
for (let m = 0; m < el.elements.length; m++) {
const sub = el.elements[m];
if (sub.type === 'text') {
propConfig[`${prefix}.elements[${m}].fill.paint`] = textFillBinding(n);
} else {
propConfig[`${prefix}.elements[${m}].fill.paint`] = fillPaintBinding(n);
}
} }
} }
} }