Generated iBOM.

This commit is contained in:
David Žaitlík committed 2022-02-20 10:58:23 +01:00
1 parent 2a491090e6
commit be3024747f
2 files changed
+304 -166

No files matched your search

@@ -11,8 +11,12 @@
--pad-color: #878787; --pad-color: #878787;
--pad-hole-color: #CCCCCC; --pad-hole-color: #CCCCCC;
--pad-color-highlight: #D04040; --pad-color-highlight: #D04040;
--pad-color-highlight-both: #D0D040;
--pad-color-highlight-marked: #44a344;
--pin1-outline-color: #ffb629; --pin1-outline-color: #ffb629;
--pin1-outline-color-highlight: #b4ff03; --pin1-outline-color-highlight: #ffb629;
--pin1-outline-color-highlight-both: #fcbb39;
--pin1-outline-color-highlight-marked: #fdbe41;
--silkscreen-edge-color: #aa4; --silkscreen-edge-color: #aa4;
--silkscreen-polygon-color: #4aa; --silkscreen-polygon-color: #4aa;
--silkscreen-text-color: #4aa; --silkscreen-text-color: #4aa;
@@ -198,6 +202,7 @@ canvas:active {
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
margin-top: 1px; margin-top: 1px;
position: relative;
} }
.bom th, .bom th,
@@ -240,11 +245,11 @@ canvas:active {
} }
.bom tr.checked { .bom tr.checked {
color: #aaa; color: #1cb53d;
} }
.dark .bom tr.checked { .dark .bom tr.checked {
color: #666; color: #2cce54;
} }
.bom tr { .bom tr {
@@ -772,6 +777,30 @@ a {
filter: invert(1); filter: invert(1);
} }
.column-spacer {
top: 0;
left: 0;
width: calc(100% - 4px);
position: absolute;
cursor: pointer;
user-select: none;
height: 100%;
}
.column-width-handle {
top: 0;
right: 0;
width: 4px;
position: absolute;
cursor: col-resize;
user-select: none;
height: 100%;
}
.column-width-handle:hover {
background-color: #4f99bd;
}
</style> </style>
<script type="text/javascript" > <script type="text/javascript" >
@@ -846,11 +875,11 @@ var d={x:c.clientX,y:c.clientY};b.push(d);var e=function(a,b){var c=a.indexOf(b)
/////////////////////////////////////////////// ///////////////////////////////////////////////
/////////////////////////////////////////////// ///////////////////////////////////////////////
var config = {"dark_mode": true, "show_pads": true, "show_fabrication": false, "show_silkscreen": true, "highlight_pin1": false, "redraw_on_drag": true, "board_rotation": 0, "checkboxes": "Placed", "bom_view": "left-right", "layer_view": "F", "extra_fields": [], "fields": ["References", "Value", "Footprint", "Quantity"]} var config = {"dark_mode": true, "show_pads": true, "show_fabrication": false, "show_silkscreen": true, "highlight_pin1": false, "redraw_on_drag": true, "board_rotation": 0, "checkboxes": "Placed", "bom_view": "left-right", "layer_view": "F", "fields": ["Value", "Footprint"]}
/////////////////////////////////////////////// ///////////////////////////////////////////////
/////////////////////////////////////////////// ///////////////////////////////////////////////
var pcbdata = JSON.parse(LZString.decompressFromBase64("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 truncated var pcbdata = JSON.parse(LZString.decompressFromBase64("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 truncated
/////////////////////////////////////////////// ///////////////////////////////////////////////
/////////////////////////////////////////////// ///////////////////////////////////////////////
@@ -1033,9 +1062,11 @@ function initUtils() {
"([GgMmKkUuNnPp])?" + "([GgMmKkUuNnPp])?" +
"([0-9]*)" + "([0-9]*)" +
"(\\b.*)?$", ""); "(\\b.*)?$", "");
for (var bom_type of ["both", "F", "B"]) { if (config.fields.includes("Value")) {
for (var row of pcbdata.bom[bom_type]) { var index = config.fields.indexOf("Value");
row.push(parseValue(row[1], row[3][0][0])); pcbdata.bom["parsedValues"] = {};
for (var id in pcbdata.bom.fields) {
pcbdata.bom.parsedValues[id] = parseValue(pcbdata.bom.fields[id][index])
} }
} }
} }
@@ -1242,7 +1273,7 @@ function overwriteSettings(newSettings) {
for (var checkbox of settings.checkboxes) { for (var checkbox of settings.checkboxes) {
writeStorage("checkbox_" + checkbox, settings.checkboxStoredRefs[checkbox]); writeStorage("checkbox_" + checkbox, settings.checkboxStoredRefs[checkbox]);
} }
writeStorage("darkenWhenChecked", settings.darkenWhenChecked); writeStorage("markWhenChecked", settings.markWhenChecked);
padsVisible(settings.renderPads); padsVisible(settings.renderPads);
document.getElementById("padsCheckbox").checked = settings.renderPads; document.getElementById("padsCheckbox").checked = settings.renderPads;
fabricationVisible(settings.renderFabrication); fabricationVisible(settings.renderFabrication);
@@ -1314,6 +1345,8 @@ var settings = {
renderDnpOutline: false, renderDnpOutline: false,
renderTracks: true, renderTracks: true,
renderZones: true, renderZones: true,
columnOrder: [],
hiddenColumns: [],
} }
function initDefaults() { function initDefaults() {
@@ -1342,8 +1375,8 @@ function initDefaults() {
settings.checkboxes = bomCheckboxes.split(",").filter((e) => e); settings.checkboxes = bomCheckboxes.split(",").filter((e) => e);
document.getElementById("bomCheckboxes").value = bomCheckboxes; document.getElementById("bomCheckboxes").value = bomCheckboxes;
settings.darkenWhenChecked = readStorage("darkenWhenChecked") || ""; settings.markWhenChecked = readStorage("markWhenChecked") || "";
populateDarkenWhenCheckedOptions(); populateMarkWhenCheckedOptions();
function initBooleanSetting(storageString, def, elementId, func) { function initBooleanSetting(storageString, def, elementId, func) {
var b = readStorage(storageString); var b = readStorage(storageString);
@@ -1374,7 +1407,7 @@ function initDefaults() {
initBooleanSetting("darkmode", config.dark_mode, "darkmodeCheckbox", setDarkMode); initBooleanSetting("darkmode", config.dark_mode, "darkmodeCheckbox", setDarkMode);
initBooleanSetting("highlightpin1", config.highlight_pin1, "highlightpin1Checkbox", setHighlightPin1); initBooleanSetting("highlightpin1", config.highlight_pin1, "highlightpin1Checkbox", setHighlightPin1);
var fields = ["checkboxes"].concat(config.fields); var fields = ["checkboxes", "References"].concat(config.fields).concat(["Quantity"]);
var hcols = JSON.parse(readStorage("hiddenColumns")); var hcols = JSON.parse(readStorage("hiddenColumns"));
if (hcols === null) { if (hcols === null) {
hcols = []; hcols = [];
@@ -1549,6 +1582,7 @@ function drawText(ctx, text, color) {
function drawedge(ctx, scalefactor, edge, color) { function drawedge(ctx, scalefactor, edge, color) {
ctx.strokeStyle = color; ctx.strokeStyle = color;
ctx.fillStyle = color;
ctx.lineWidth = Math.max(1 / scalefactor, edge.width); ctx.lineWidth = Math.max(1 / scalefactor, edge.width);
ctx.lineCap = "round"; ctx.lineCap = "round";
ctx.lineJoin = "round"; ctx.lineJoin = "round";
@@ -1585,6 +1619,9 @@ function drawedge(ctx, scalefactor, edge, color) {
ctx.moveTo(...edge.start); ctx.moveTo(...edge.start);
ctx.bezierCurveTo(...edge.cpa, ...edge.cpb, ...edge.end); ctx.bezierCurveTo(...edge.cpa, ...edge.cpb, ...edge.end);
} }
if("filled" in edge && edge.filled)
ctx.fill();
else
ctx.stroke(); ctx.stroke();
} }
} }
@@ -1654,14 +1691,22 @@ function getPolygonsPath(shape) {
return shape.path2d; return shape.path2d;
} }
function drawPolygonShape(ctx, shape, color) { function drawPolygonShape(ctx, scalefactor, shape, color) {
ctx.save(); ctx.save();
ctx.fillStyle = color;
if (!("svgpath" in shape)) { if (!("svgpath" in shape)) {
ctx.translate(...shape.pos); ctx.translate(...shape.pos);
ctx.rotate(deg2rad(-shape.angle)); ctx.rotate(deg2rad(-shape.angle));
} }
if("filled" in shape && !shape.filled) {
ctx.strokeStyle = color;
ctx.lineWidth = Math.max(1 / scalefactor, shape.width);
ctx.lineCap = "round";
ctx.lineJoin = "round";
ctx.stroke(getPolygonsPath(shape));
} else {
ctx.fillStyle = color;
ctx.fill(getPolygonsPath(shape)); ctx.fill(getPolygonsPath(shape));
}
ctx.restore(); ctx.restore();
} }
@@ -1669,7 +1714,7 @@ function drawDrawing(ctx, scalefactor, drawing, color) {
if (["segment", "arc", "circle", "curve", "rect"].includes(drawing.type)) { if (["segment", "arc", "circle", "curve", "rect"].includes(drawing.type)) {
drawedge(ctx, scalefactor, drawing, color); drawedge(ctx, scalefactor, drawing, color);
} else if (drawing.type == "polygon") { } else if (drawing.type == "polygon") {
drawPolygonShape(ctx, drawing, color); drawPolygonShape(ctx, scalefactor, drawing, color);
} else { } else {
drawText(ctx, drawing, color); drawText(ctx, drawing, color);
} }
@@ -1735,7 +1780,7 @@ function drawPadHole(ctx, pad, padHoleColor) {
ctx.restore(); ctx.restore();
} }
function drawFootprint(ctx, layer, scalefactor, footprint, padColor, padHoleColor, outlineColor, highlight, outline) { function drawFootprint(ctx, layer, scalefactor, footprint, colors, highlight, outline) {
if (highlight) { if (highlight) {
// draw bounding box // draw bounding box
if (footprint.layer == layer) { if (footprint.layer == layer) {
@@ -1744,10 +1789,10 @@ function drawFootprint(ctx, layer, scalefactor, footprint, padColor, padHoleColo
ctx.translate(...footprint.bbox.pos); ctx.translate(...footprint.bbox.pos);
ctx.rotate(deg2rad(-footprint.bbox.angle)); ctx.rotate(deg2rad(-footprint.bbox.angle));
ctx.translate(...footprint.bbox.relpos); ctx.translate(...footprint.bbox.relpos);
ctx.fillStyle = padColor; ctx.fillStyle = colors.pad;
ctx.fillRect(0, 0, ...footprint.bbox.size); ctx.fillRect(0, 0, ...footprint.bbox.size);
ctx.globalAlpha = 1; ctx.globalAlpha = 1;
ctx.strokeStyle = padColor; ctx.strokeStyle = colors.pad;
ctx.strokeRect(0, 0, ...footprint.bbox.size); ctx.strokeRect(0, 0, ...footprint.bbox.size);
ctx.restore(); ctx.restore();
} }
@@ -1755,21 +1800,21 @@ function drawFootprint(ctx, layer, scalefactor, footprint, padColor, padHoleColo
// draw drawings // draw drawings
for (var drawing of footprint.drawings) { for (var drawing of footprint.drawings) {
if (drawing.layer == layer) { if (drawing.layer == layer) {
drawDrawing(ctx, scalefactor, drawing.drawing, padColor); drawDrawing(ctx, scalefactor, drawing.drawing, colors.pad);
} }
} }
// draw pads // draw pads
if (settings.renderPads) { if (settings.renderPads) {
for (var pad of footprint.pads) { for (var pad of footprint.pads) {
if (pad.layers.includes(layer)) { if (pad.layers.includes(layer)) {
drawPad(ctx, pad, padColor, outline); drawPad(ctx, pad, colors.pad, outline);
if (pad.pin1 && settings.highlightpin1) { if (pad.pin1 && settings.highlightpin1) {
drawPad(ctx, pad, outlineColor, true); drawPad(ctx, pad, colors.outline, true);
} }
} }
} }
for (var pad of footprint.pads) { for (var pad of footprint.pads) {
drawPadHole(ctx, pad, padHoleColor); drawPadHole(ctx, pad, colors.padHole);
} }
} }
} }
@@ -1778,7 +1823,7 @@ function drawEdgeCuts(canvas, scalefactor) {
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
var edgecolor = getComputedStyle(topmostdiv).getPropertyValue('--pcb-edge-color'); var edgecolor = getComputedStyle(topmostdiv).getPropertyValue('--pcb-edge-color');
for (var edge of pcbdata.edges) { for (var edge of pcbdata.edges) {
drawedge(ctx, scalefactor, edge, edgecolor); drawDrawing(ctx, scalefactor, edge, edgecolor);
} }
} }
@@ -1786,18 +1831,32 @@ function drawFootprints(canvas, layer, scalefactor, highlight) {
var ctx = canvas.getContext("2d"); var ctx = canvas.getContext("2d");
ctx.lineWidth = 3 / scalefactor; ctx.lineWidth = 3 / scalefactor;
var style = getComputedStyle(topmostdiv); var style = getComputedStyle(topmostdiv);
var padColor = style.getPropertyValue('--pad-color');
var padHoleColor = style.getPropertyValue('--pad-hole-color'); var colors = {
var outlineColor = style.getPropertyValue('--pin1-outline-color'); pad: style.getPropertyValue('--pad-color'),
if (highlight) { padHole: style.getPropertyValue('--pad-hole-color'),
padColor = style.getPropertyValue('--pad-color-highlight'); outline: style.getPropertyValue('--pin1-outline-color'),
outlineColor = style.getPropertyValue('--pin1-outline-color-highlight');
} }
for (var i = 0; i < pcbdata.footprints.length; i++) { for (var i = 0; i < pcbdata.footprints.length; i++) {
var mod = pcbdata.footprints[i]; var mod = pcbdata.footprints[i];
var outline = settings.renderDnpOutline && pcbdata.bom.skipped.includes(i); var outline = settings.renderDnpOutline && pcbdata.bom.skipped.includes(i);
if (!highlight || highlightedFootprints.includes(i)) { var h = highlightedFootprints.includes(i);
drawFootprint(ctx, layer, scalefactor, mod, padColor, padHoleColor, outlineColor, highlight, outline); var d = markedFootprints.has(i);
if (highlight) {
if(h && d) {
colors.pad = style.getPropertyValue('--pad-color-highlight-both');
colors.outline = style.getPropertyValue('--pin1-outline-color-highlight-both');
} else if (h) {
colors.pad = style.getPropertyValue('--pad-color-highlight');
colors.outline = style.getPropertyValue('--pin1-outline-color-highlight');
} else if (d) {
colors.pad = style.getPropertyValue('--pad-color-highlight-marked');
colors.outline = style.getPropertyValue('--pin1-outline-color-highlight-marked');
}
}
if( h || d || !highlight) {
drawFootprint(ctx, layer, scalefactor, mod, colors, highlight, outline);
} }
} }
} }
@@ -1808,7 +1867,7 @@ function drawBgLayer(layername, canvas, layer, scalefactor, edgeColor, polygonCo
if (["segment", "arc", "circle", "curve", "rect"].includes(d.type)) { if (["segment", "arc", "circle", "curve", "rect"].includes(d.type)) {
drawedge(ctx, scalefactor, d, edgeColor); drawedge(ctx, scalefactor, d, edgeColor);
} else if (d.type == "polygon") { } else if (d.type == "polygon") {
drawPolygonShape(ctx, d, polygonColor); drawPolygonShape(ctx, scalefactor, d, polygonColor);
} else { } else {
drawText(ctx, d, textColor); drawText(ctx, d, textColor);
} }
@@ -1907,7 +1966,7 @@ function drawHighlightsOnLayer(canvasdict, clear = true) {
if (clear) { if (clear) {
clearCanvas(canvasdict.highlight); clearCanvas(canvasdict.highlight);
} }
if (highlightedFootprints.length > 0) { if (markedFootprints.size > 0 || highlightedFootprints.length > 0) {
drawFootprints(canvasdict.highlight, canvasdict.layer, drawFootprints(canvasdict.highlight, canvasdict.layer,
canvasdict.transform.s * canvasdict.transform.zoom, true); canvasdict.transform.s * canvasdict.transform.zoom, true);
} }
@@ -1932,7 +1991,7 @@ function drawBackground(canvasdict, clear = true) {
drawFootprints(canvasdict.bg, canvasdict.layer, drawFootprints(canvasdict.bg, canvasdict.layer,
canvasdict.transform.s * canvasdict.transform.zoom, false); canvasdict.transform.s * canvasdict.transform.zoom, false);
drawEdgeCuts(canvasdict.bg, canvasdict.transform.s); drawEdgeCuts(canvasdict.bg, canvasdict.transform.s * canvasdict.transform.zoom);
var style = getComputedStyle(topmostdiv); var style = getComputedStyle(topmostdiv);
var edgeColor = style.getPropertyValue('--silkscreen-edge-color'); var edgeColor = style.getPropertyValue('--silkscreen-edge-color');
@@ -2475,11 +2534,7 @@ function setBomHandlers() {
if (wasDragged) { if (wasDragged) {
// Redraw whole BOM // Redraw whole BOM
populateBomTable(); populateBomTable();
} else {
// The element wasn't dragged -> simulate click
e.target.click();
} }
} }
const mouseMoveHandler = function(e) { const mouseMoveHandler = function(e) {
@@ -2592,9 +2647,9 @@ function setBomHandlers() {
} }
const mouseDownHandler = function(e) { const mouseDownHandler = function(e) {
// The sortmark shouldn't be draggable var target = e.target;
if (e.target.classList.contains("sortmark")) if (target.tagName.toLowerCase() != "td")
return; target = target.parentElement;
// Used to check if a dragging has ever happened // Used to check if a dragging has ever happened
wasDragged = false; wasDragged = false;
@@ -2604,6 +2659,7 @@ function setBomHandlers() {
draggingElement.classList.add("dragging"); draggingElement.classList.add("dragging");
draggingElement.style.display = "none"; draggingElement.style.display = "none";
draggingElement.style.position = "absolute"; draggingElement.style.position = "absolute";
draggingElement.style.overflow = "hidden";
// Get bomhead and bombody elements // Get bomhead and bombody elements
const bh = document.getElementById("bomhead"); const bh = document.getElementById("bomhead");
@@ -2611,10 +2667,10 @@ function setBomHandlers() {
// Get all compound headers for the current column // Get all compound headers for the current column
var compoundHeaders; var compoundHeaders;
if (e.target.classList.contains("bom-checkbox")) { if (target.classList.contains("bom-checkbox")) {
compoundHeaders = Array.from(bh.querySelectorAll("th.bom-checkbox")); compoundHeaders = Array.from(bh.querySelectorAll("th.bom-checkbox"));
} else { } else {
compoundHeaders = [e.target]; compoundHeaders = [target];
} }
// Create new table which will display the column // Create new table which will display the column
@@ -2673,7 +2729,7 @@ function setBomHandlers() {
yOffset = e.screenY - compoundHeaders[0].offsetTop; yOffset = e.screenY - compoundHeaders[0].offsetTop;
// Get name for the column in settings.columnOrder // Get name for the column in settings.columnOrder
dragName = getColumnOrderName(e.target); dragName = getColumnOrderName(target);
// Change text and class for placeholder elements // Change text and class for placeholder elements
placeHolderElements = placeHolderElements.map(function(e) { placeHolderElements = placeHolderElements.map(function(e) {
@@ -2727,10 +2783,8 @@ function getBoundingClientRectFromMultiple(elements) {
function cloneElementWithDimensions(elem) { function cloneElementWithDimensions(elem) {
var newElem = elem.cloneNode(true); var newElem = elem.cloneNode(true);
newElem.style.height = window.getComputedStyle(elem) newElem.style.height = window.getComputedStyle(elem).height;
.height; newElem.style.width = window.getComputedStyle(elem).width;
newElem.style.width = window.getComputedStyle(elem)
.width;
return newElem; return newElem;
} }
@@ -2748,6 +2802,79 @@ function getColumnOrderName(elem) {
return cname; return cname;
} }
function resizableGrid(tablehead) {
var cols = tablehead.firstElementChild.children;
var rowWidth = tablehead.offsetWidth;
for (var i = 1; i < cols.length; i++) {
if (cols[i].classList.contains("bom-checkbox"))
continue;
cols[i].style.width = ((cols[i].clientWidth - paddingDiff(cols[i])) * 100 / rowWidth) + '%';
}
for (var i = 1; i < cols.length - 1; i++) {
var div = document.createElement('div');
div.className = "column-width-handle";
cols[i].appendChild(div);
setListeners(div);
}
function setListeners(div) {
var startX, curCol, nxtCol, curColWidth, nxtColWidth, rowWidth;
div.addEventListener('mousedown', function(e) {
e.preventDefault();
e.stopPropagation();
curCol = e.target.parentElement;
nxtCol = curCol.nextElementSibling;
startX = e.pageX;
var padding = paddingDiff(curCol);
rowWidth = curCol.parentElement.offsetWidth;
curColWidth = curCol.clientWidth - padding;
nxtColWidth = nxtCol.clientWidth - padding;
});
document.addEventListener('mousemove', function(e) {
if (startX) {
var diffX = e.pageX - startX;
diffX = -Math.min(-diffX, curColWidth - 20);
diffX = Math.min(diffX, nxtColWidth - 20);
curCol.style.width = ((curColWidth + diffX) * 100 / rowWidth) + '%';
nxtCol.style.width = ((nxtColWidth - diffX) * 100 / rowWidth) + '%';
console.log(`${curColWidth + nxtColWidth} ${(curColWidth + diffX) * 100 / rowWidth + (nxtColWidth - diffX) * 100 / rowWidth}`);
}
});
document.addEventListener('mouseup', function(e) {
curCol = undefined;
nxtCol = undefined;
startX = undefined;
nxtColWidth = undefined;
curColWidth = undefined
});
}
function paddingDiff(col) {
if (getStyleVal(col, 'box-sizing') == 'border-box') {
return 0;
}
var padLeft = getStyleVal(col, 'padding-left');
var padRight = getStyleVal(col, 'padding-right');
return (parseInt(padLeft) + parseInt(padRight));
}
function getStyleVal(elm, css) {
return (window.getComputedStyle(elm, null).getPropertyValue(css))
}
}
/////////////////////////////////////////////// ///////////////////////////////////////////////
/////////////////////////////////////////////// ///////////////////////////////////////////////
@@ -2763,6 +2890,7 @@ var currentHighlightedRowId;
var highlightHandlers = []; var highlightHandlers = [];
var footprintIndexToHandler = {}; var footprintIndexToHandler = {};
var netsToHandler = {}; var netsToHandler = {};
var markedFootprints = new Set();
var highlightedFootprints = []; var highlightedFootprints = [];
var highlightedNet = null; var highlightedNet = null;
var lastClicked; var lastClicked;
@@ -2936,7 +3064,7 @@ function setBomCheckboxState(checkbox, element, references) {
function createCheckboxChangeHandler(checkbox, references, row) { function createCheckboxChangeHandler(checkbox, references, row) {
return function () { return function () {
refsSet = getStoredCheckboxRefs(checkbox); refsSet = getStoredCheckboxRefs(checkbox);
var darkenWhenChecked = settings.darkenWhenChecked == checkbox; var markWhenChecked = settings.markWhenChecked == checkbox;
eventArgs = { eventArgs = {
checkbox: checkbox, checkbox: checkbox,
refs: references, refs: references,
@@ -2946,8 +3074,12 @@ function createCheckboxChangeHandler(checkbox, references, row) {
for (var ref of references) { for (var ref of references) {
refsSet.add(ref[1]); refsSet.add(ref[1]);
} }
if (darkenWhenChecked) { if (markWhenChecked) {
row.classList.add("checked"); row.classList.add("checked");
for (var ref of references) {
markedFootprints.add(ref[1]);
}
drawHighlights();
} }
eventArgs.state = 'checked'; eventArgs.state = 'checked';
} else { } else {
@@ -2955,8 +3087,12 @@ function createCheckboxChangeHandler(checkbox, references, row) {
for (var ref of references) { for (var ref of references) {
refsSet.delete(ref[1]); refsSet.delete(ref[1]);
} }
if (darkenWhenChecked) { if (markWhenChecked) {
row.classList.remove("checked"); row.classList.remove("checked");
for (var ref of references) {
markedFootprints.delete(ref[1]);
}
drawHighlights();
} }
eventArgs.state = 'unchecked'; eventArgs.state = 'unchecked';
} }
@@ -3005,37 +3141,28 @@ function entryMatches(entry) {
} }
// check refs // check refs
if (!settings.hiddenColumns.includes("references")) { if (!settings.hiddenColumns.includes("references")) {
for (var ref of entry[3]) { for (var ref of entry) {
if (ref[0].toLowerCase().indexOf(filter) >= 0) { if (ref[0].toLowerCase().indexOf(filter) >= 0) {
return true; return true;
} }
} }
} }
// check extra fields // check fields
if (!settings.hiddenColumns.includes("extrafields")) { for (var i in config.fields) {
for (var i in config.extra_fields) { var f = config.fields[i];
if (entry[4][i].toLowerCase().indexOf(filter) >= 0) { if (!settings.hiddenColumns.includes(f)) {
for (var ref of entry) {
if (pcbdata.bom.fields[ref[1]][i].toLowerCase().indexOf(filter) >= 0) {
return true; return true;
} }
} }
} }
// check value
if (!settings.hiddenColumns.includes("value")) {
if (entry[1].toLowerCase().indexOf(filter) >= 0) {
return true;
}
}
// check footprint
if (!settings.hiddenColumns.includes("footprint")) {
if (entry[2].toLowerCase().indexOf(filter) >= 0) {
return true;
}
} }
return false; return false;
} }
function findRefInEntry(entry) { function findRefInEntry(entry) {
return entry[3].filter(r => r[0].toLowerCase() == reflookup); return entry.filter(r => r[0].toLowerCase() == reflookup);
} }
function highlightFilter(s) { function highlightFilter(s) {
@@ -3098,20 +3225,22 @@ function createColumnHeader(name, cls, comparator, is_checkbox = false) {
th.setAttribute("col_name", "bom-checkbox"); th.setAttribute("col_name", "bom-checkbox");
else else
th.setAttribute("col_name", name); th.setAttribute("col_name", name);
th.style.cursor = "pointer";
var span = document.createElement("SPAN"); var span = document.createElement("SPAN");
span.classList.add("sortmark"); span.classList.add("sortmark");
span.classList.add("none"); span.classList.add("none");
th.appendChild(span); th.appendChild(span);
th.onclick = function() { var spacer = document.createElement("div");
if (currentSortColumn && this !== currentSortColumn) { spacer.className = "column-spacer";
th.appendChild(spacer);
spacer.onclick = function () {
if (currentSortColumn && th !== currentSortColumn) {
// Currently sorted by another column // Currently sorted by another column
currentSortColumn.childNodes[1].classList.remove(currentSortOrder); currentSortColumn.childNodes[1].classList.remove(currentSortOrder);
currentSortColumn.childNodes[1].classList.add("none"); currentSortColumn.childNodes[1].classList.add("none");
currentSortColumn = null; currentSortColumn = null;
currentSortOrder = null; currentSortOrder = null;
} }
if (currentSortColumn && this === currentSortColumn) { if (currentSortColumn && th === currentSortColumn) {
// Already sorted by this column // Already sorted by this column
if (currentSortOrder == "asc") { if (currentSortOrder == "asc") {
// Sort by this column, descending order // Sort by this column, descending order
@@ -3132,13 +3261,17 @@ function createColumnHeader(name, cls, comparator, is_checkbox = false) {
} else { } else {
// Sort by this column, ascending order // Sort by this column, ascending order
bomSortFunction = comparator; bomSortFunction = comparator;
currentSortColumn = this; currentSortColumn = th;
currentSortColumn.childNodes[1].classList.remove("none"); currentSortColumn.childNodes[1].classList.remove("none");
currentSortColumn.childNodes[1].classList.add("asc"); currentSortColumn.childNodes[1].classList.add("asc");
currentSortOrder = "asc"; currentSortOrder = "asc";
} }
populateBomBody(); populateBomBody();
} }
if (is_checkbox) {
spacer.onclick = fancyDblClickHandler(
spacer, spacer.onclick, checkboxSetUnsetAllHandler(name));
}
return th; return th;
} }
@@ -3201,13 +3334,38 @@ function populateBomHeader(placeHolderColumn = null, placeHolderElements = null)
var checkboxCompareClosure = function (checkbox) { var checkboxCompareClosure = function (checkbox) {
return (a, b) => { return (a, b) => {
var stateA = getCheckboxState(checkbox, a[3]); var stateA = getCheckboxState(checkbox, a);
var stateB = getCheckboxState(checkbox, b[3]); var stateB = getCheckboxState(checkbox, b);
if (stateA > stateB) return -1; if (stateA > stateB) return -1;
if (stateA < stateB) return 1; if (stateA < stateB) return 1;
return 0; return 0;
} }
} }
var stringFieldCompareClosure = function (fieldIndex) {
return (a, b) => {
var fa = pcbdata.bom.fields[a[0][1]][fieldIndex];
var fb = pcbdata.bom.fields[b[0][1]][fieldIndex];
if (fa != fb) return fa > fb ? 1 : -1;
else return 0;
}
}
var referenceRegex = /(?<prefix>[^0-9]+)(?<number>[0-9]+)/;
var compareRefs = (a, b) => {
var ra = referenceRegex.exec(a);
var rb = referenceRegex.exec(b);
if (ra === null || rb === null) {
if (a != b) return a > b ? 1 : -1;
return 0;
} else {
if (ra.groups.prefix != rb.groups.prefix) {
return ra.groups.prefix > rb.groups.prefix ? 1 : -1;
}
if (ra.groups.number != rb.groups.number) {
return parseInt(ra.groups.number) > parseInt(rb.groups.number) ? 1 : -1;
}
return 0;
}
}
if (settings.bommode == "netlist") { if (settings.bommode == "netlist") {
th = createColumnHeader("Net name", "bom-netname", (a, b) => { th = createColumnHeader("Net name", "bom-netname", (a, b) => {
if (a > b) return -1; if (a > b) return -1;
@@ -3218,6 +3376,8 @@ function populateBomHeader(placeHolderColumn = null, placeHolderElements = null)
} else { } else {
// Filter hidden columns // Filter hidden columns
var columns = settings.columnOrder.filter(e => !settings.hiddenColumns.includes(e)); var columns = settings.columnOrder.filter(e => !settings.hiddenColumns.includes(e));
var valueIndex = config.fields.indexOf("Value");
var footprintIndex = config.fields.indexOf("Footprint");
columns.forEach((column) => { columns.forEach((column) => {
if (column === placeHolderColumn) { if (column === placeHolderColumn) {
var n = 1; var n = 1;
@@ -3228,56 +3388,44 @@ function populateBomHeader(placeHolderColumn = null, placeHolderElements = null)
tr.appendChild(td); tr.appendChild(td);
} }
return; return;
} } else if (column === "checkboxes") {
if (column === "checkboxes") {
for (var checkbox of settings.checkboxes) { for (var checkbox of settings.checkboxes) {
th = createColumnHeader( th = createColumnHeader(
checkbox, "bom-checkbox", checkboxCompareClosure(checkbox), true); checkbox, "bom-checkbox", checkboxCompareClosure(checkbox), true);
th.onclick = fancyDblClickHandler(
th, th.onclick.bind(th), checkboxSetUnsetAllHandler(checkbox));
tr.appendChild(th); tr.appendChild(th);
} }
} } else if (column === "References") {
if (column === "References") {
tr.appendChild(createColumnHeader("References", "references", (a, b) => { tr.appendChild(createColumnHeader("References", "references", (a, b) => {
var i = 0; var i = 0;
while (i < a[3].length && i < b[3].length) { while (i < a.length && i < b.length) {
if (a[3][i] != b[3][i]) return a[3][i] > b[3][i] ? 1 : -1; if (a[i] != b[i]) return compareRefs(a[i][0], b[i][0]);
i++; i++;
} }
return a[3].length - b[3].length; return a.length - b.length;
})); }));
} } else if (column === "Value") {
if (column === "Value") {
tr.appendChild(createColumnHeader("Value", "value", (a, b) => { tr.appendChild(createColumnHeader("Value", "value", (a, b) => {
return valueCompare(a[5], b[5], a[1], b[1]); var ra = a[0][1], rb = b[0][1];
return valueCompare(
pcbdata.bom.parsedValues[ra], pcbdata.bom.parsedValues[rb],
pcbdata.bom.fields[ra][valueIndex], pcbdata.bom.fields[rb][valueIndex]);
})); }));
} return;
if (column === "Footprint") { } else if (column === "Footprint") {
tr.appendChild(createColumnHeader("Footprint", "footprint", (a, b) => { tr.appendChild(createColumnHeader(
if (a[2] != b[2]) return a[2] > b[2] ? 1 : -1; "Footprint", "footprint", stringFieldCompareClosure(footprintIndex)));
else return 0; } else if (column === "Quantity" && settings.bommode == "grouped") {
}));
}
if (column === "Quantity" && settings.bommode == "grouped") {
tr.appendChild(createColumnHeader("Quantity", "quantity", (a, b) => { tr.appendChild(createColumnHeader("Quantity", "quantity", (a, b) => {
return a[3].length - b[3].length; return a.length - b.length;
})); }));
} } else {
// Extra fields // Other fields
var extraFieldCompareClosure = function(fieldIndex) { var i = config.fields.indexOf(column);
return (a, b) => {
var fa = a[4][fieldIndex];
var fb = b[4][fieldIndex];
if (fa != fb) return fa > fb ? 1 : -1;
else return 0;
}
}
var i = config.extra_fields.indexOf(column);
if (i < 0) if (i < 0)
return; return;
tr.appendChild(createColumnHeader( tr.appendChild(createColumnHeader(
column, `extrafield${i+1}`, extraFieldCompareClosure(i))); column, `field${i + 1}`, stringFieldCompareClosure(i)));
}
}); });
} }
bomhead.appendChild(tr); bomhead.appendChild(tr);
@@ -3310,10 +3458,8 @@ function populateBomBody(placeholderColumn = null, placeHolderElements = null) {
// expand bom table // expand bom table
expandedTable = [] expandedTable = []
for (var bomentry of bomtable) { for (var bomentry of bomtable) {
for (var ref of bomentry[3]) { for (var ref of bomentry) {
expandedTable.push([1, bomentry[1], bomentry[2], expandedTable.push([ref]);
[ref], bomentry[4], bomentry[5]
]);
} }
} }
bomtable = expandedTable; bomtable = expandedTable;
@@ -3347,23 +3493,21 @@ function populateBomBody(placeholderColumn = null, placeHolderElements = null) {
continue; continue;
} }
} else { } else {
references = bomentry[3]; references = bomentry;
} }
// Filter hidden columns // Filter hidden columns
var columns = settings.columnOrder.filter(e => !settings.hiddenColumns.includes(e)); var columns = settings.columnOrder.filter(e => !settings.hiddenColumns.includes(e));
columns.forEach((column) => { columns.forEach((column) => {
if (column === placeholderColumn) { if (column === placeholderColumn) {
var n = 1; var n = 1;
if (column === "bom-checkbox") if (column === "checkboxes")
n = settings.checkboxes.length; n = settings.checkboxes.length;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
td = placeHolderElements.shift(); td = placeHolderElements.shift();
tr.appendChild(td); tr.appendChild(td);
} }
return; return;
} } else if (column === "checkboxes") {
// Checkboxes
if (column === "checkboxes") {
for (var checkbox of settings.checkboxes) { for (var checkbox of settings.checkboxes) {
if (checkbox) { if (checkbox) {
td = document.createElement("TD"); td = document.createElement("TD");
@@ -3371,45 +3515,33 @@ function populateBomBody(placeholderColumn = null, placeHolderElements = null) {
input.type = "checkbox"; input.type = "checkbox";
input.onchange = createCheckboxChangeHandler(checkbox, references, tr); input.onchange = createCheckboxChangeHandler(checkbox, references, tr);
setBomCheckboxState(checkbox, input, references); setBomCheckboxState(checkbox, input, references);
if (input.checked && settings.darkenWhenChecked == checkbox) { if (input.checked && settings.markWhenChecked == checkbox) {
tr.classList.add("checked"); tr.classList.add("checked");
} }
td.appendChild(input); td.appendChild(input);
tr.appendChild(td); tr.appendChild(td);
} }
} }
} } else if (column === "References") {
// References
if (column === "References") {
td = document.createElement("TD"); td = document.createElement("TD");
td.innerHTML = highlightFilter(references.map(r => r[0]).join(", ")); td.innerHTML = highlightFilter(references.map(r => r[0]).join(", "));
tr.appendChild(td); tr.appendChild(td);
} } else if (column === "Quantity" && settings.bommode == "grouped") {
// Value
if (column === "Value") {
td = document.createElement("TD");
td.innerHTML = highlightFilter(bomentry[1]);
tr.appendChild(td);
}
// Footprint
if (column === "Footprint") {
td = document.createElement("TD");
td.innerHTML = highlightFilter(bomentry[2]);
tr.appendChild(td);
}
if (column === "Quantity" && settings.bommode == "grouped") {
// Quantity // Quantity
td = document.createElement("TD"); td = document.createElement("TD");
td.textContent = bomentry[3].length; td.textContent = references.length;
tr.appendChild(td);
} else {
// All the other fields
var field_index = config.fields.indexOf(column)
if (field_index < 0)
return;
var valueSet = new Set();
references.map(r => r[1]).forEach((id) => valueSet.add(pcbdata.bom.fields[id][field_index]));
td = document.createElement("TD");
td.innerHTML = highlightFilter(Array.from(valueSet).join(", "));
tr.appendChild(td); tr.appendChild(td);
} }
// Extra fields
var i = config.extra_fields.indexOf(column)
if (i < 0)
return;
td = document.createElement("TD");
td.innerHTML = highlightFilter(bomentry[4][i]);
tr.appendChild(td);
}); });
} }
bom.appendChild(tr); bom.appendChild(tr);
@@ -3483,6 +3615,7 @@ function populateBomTable() {
populateBomHeader(); populateBomHeader();
populateBomBody(); populateBomBody();
setBomHandlers(); setBomHandlers();
resizableGrid(bomhead);
} }
function footprintsClicked(footprintIndexes) { function footprintsClicked(footprintIndexes) {
@@ -3748,16 +3881,21 @@ function checkBomCheckbox(bomrowid, checkboxname) {
function setBomCheckboxes(value) { function setBomCheckboxes(value) {
writeStorage("bomCheckboxes", value); writeStorage("bomCheckboxes", value);
settings.checkboxes = value.split(",").filter((e) => e); settings.checkboxes = value.split(",").map((e) => e.trim()).filter((e) => e);
prepCheckboxes(); prepCheckboxes();
populateBomTable(); populateMarkWhenCheckedOptions();
populateDarkenWhenCheckedOptions(); setMarkWhenChecked(settings.markWhenChecked);
} }
function setDarkenWhenChecked(value) { function setMarkWhenChecked(value) {
writeStorage("darkenWhenChecked", value); writeStorage("markWhenChecked", value);
settings.darkenWhenChecked = value; settings.markWhenChecked = value;
markedFootprints.clear();
for (var ref of (value ? getStoredCheckboxRefs(value) : [])) {
markedFootprints.add(ref);
}
populateBomTable(); populateBomTable();
drawHighlights();
} }
function prepCheckboxes() { function prepCheckboxes() {
@@ -3789,8 +3927,8 @@ function prepCheckboxes() {
} }
} }
function populateDarkenWhenCheckedOptions() { function populateMarkWhenCheckedOptions() {
var container = document.getElementById("darkenWhenCheckedContainer"); var container = document.getElementById("markWhenCheckedContainer");
if (settings.checkboxes.length == 0) { if (settings.checkboxes.length == 0) {
container.parentElement.style.display = "none"; container.parentElement.style.display = "none";
@@ -3801,21 +3939,21 @@ function populateDarkenWhenCheckedOptions() {
container.parentElement.style.display = "inline-block"; container.parentElement.style.display = "inline-block";
function createOption(name, displayName) { function createOption(name, displayName) {
var id = "darkenWhenChecked-" + name; var id = "markWhenChecked-" + name;
var div = document.createElement("div"); var div = document.createElement("div");
div.classList.add("radio-container"); div.classList.add("radio-container");
var input = document.createElement("input"); var input = document.createElement("input");
input.type = "radio"; input.type = "radio";
input.name = "darkenWhenChecked"; input.name = "markWhenChecked";
input.value = name; input.value = name;
input.id = id; input.id = id;
input.onchange = () => setDarkenWhenChecked(name); input.onchange = () => setMarkWhenChecked(name);
div.appendChild(input); div.appendChild(input);
// Preserve the selected element when the checkboxes change // Preserve the selected element when the checkboxes change
if (name == settings.darkenWhenChecked) { if (name == settings.markWhenChecked) {
input.checked = true; input.checked = true;
} }
@@ -3930,7 +4068,7 @@ window.onload = function(e) {
hideNetlistButton(); hideNetlistButton();
} }
initDone = true; initDone = true;
prepCheckboxes(); setBomCheckboxes(document.getElementById("bomCheckboxes").value);
// Triggers render // Triggers render
changeBomLayout(settings.bomlayout); changeBomLayout(settings.bomlayout);
@@ -4021,8 +4159,8 @@ window.matchMedia("print").addListener(resizeAll);
oninput="setBomCheckboxes(this.value)"> oninput="setBomCheckboxes(this.value)">
</label> </label>
<label class="menu-label"> <label class="menu-label">
<div style="margin-left: 5px">Darken when checked</div> <div style="margin-left: 5px">Mark when checked</div>
<div id="darkenWhenCheckedContainer"></div> <div id="markWhenCheckedContainer"></div>
</label> </label>
<label class="menu-label"> <label class="menu-label">
<span class="shameless-plug"> <span class="shameless-plug">
+8 -8
View File
@@ -7920,7 +7920,7 @@
(property "Datasheet" "https://www.yageo.com/upload/media/product/productsearch/datasheet/rchip/PYu-RC_Group_51_RoHS_L_11.pdf" (id 3) (at 127 153.67 0) (property "Datasheet" "https://www.yageo.com/upload/media/product/productsearch/datasheet/rchip/PYu-RC_Group_51_RoHS_L_11.pdf" (id 3) (at 127 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Resistance" "5k1" (id 4) (at 127 150.7236 90)) (property "Resistance" "4R7" (id 4) (at 127 150.7236 90))
(property "Power" "1/16W" (id 5) (at 128.27 161.29 0) (property "Power" "1/16W" (id 5) (at 128.27 161.29 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
@@ -7930,25 +7930,25 @@
(property "Manufacturer" "Yageo" (id 7) (at 116.84 153.67 0) (property "Manufacturer" "Yageo" (id 7) (at 116.84 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Code" "RC0402JR-075K1L" (id 8) (at 114.3 153.67 0) (property "Code" "RC0402JR-074R7L" (id 8) (at 114.3 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Alt_Manufacturer" "Bourns" (id 9) (at 116.84 173.99 0) (property "Alt_Manufacturer" "*" (id 9) (at 116.84 173.99 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Alt_Code" "CR0402-JW-512GLF" (id 10) (at 114.3 173.99 0) (property "Alt_Code" "*" (id 10) (at 114.3 173.99 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Digikey" "311-5.1KJRCT-ND" (id 11) (at 111.76 153.67 0) (property "Digikey" "311-4.7JRCT-ND" (id 11) (at 111.76 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Mouser" "603-RC0402JR-075K1L" (id 12) (at 109.22 153.67 0) (property "Mouser" "*" (id 12) (at 109.22 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "Farnell" "3495714" (id 13) (at 106.68 153.67 0) (property "Farnell" "*" (id 13) (at 106.68 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(property "TME" "SMD0402-5K1-1%" (id 14) (at 104.14 153.67 0) (property "TME" "*" (id 14) (at 104.14 153.67 0)
(effects (font (size 1.27 1.27)) hide) (effects (font (size 1.27 1.27)) hide)
) )
(pin "1" (uuid da583fd8-297c-45d1-a802-ffe1e43db9b6)) (pin "1" (uuid da583fd8-297c-45d1-a802-ffe1e43db9b6))