Skip to content

Commit

Permalink
Merge branch 'main' into list-option-groups
Browse files Browse the repository at this point in the history
  • Loading branch information
@atmgrifter00
atmgrifter00 authored Jun 3, 2024
2 parents 5efa298 + decce3d commit 4b087fc
Show file tree
Hide file tree
Showing 25 changed files with 744 additions and 1,084 deletions.
7 changes: 7 additions & 0 deletions change/@ni-nimble-components-2fd7a846-f023-4377-8d09-96c6b0d96f2a.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "Refactored experimental structure and update strategy for wafer map component",
"packageName": "@ni/nimble-components",
"email": "[email protected]",
"dependentChangeType": "patch"
}
6 changes: 6 additions & 0 deletions packages/nimble-components/build/generate-workers/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,15 @@ function writeFile(filePath: string, content: string): void {
}

const renderModuleName: string = '../bundle/matrix-renderer.js';
const workerTypes: string = '../esm/source/types.d.ts';
const workersDirectory: string = path.resolve('./src/wafer-map/workers');

prepareDirectory(workersDirectory);

const modulePath: string = resolveModulePath(renderModuleName);
const sourceCode: string = fs.readFileSync(modulePath, 'utf-8');
const workerTypesPath: string = resolveModulePath(workerTypes);
const typesCode: string = fs.readFileSync(workerTypesPath, 'utf-8');

const fileContent: string = `// eslint-disable-next-line no-template-curly-in-string
export const workerCode = ${JSON.stringify(sourceCode)};
Expand All @@ -39,4 +42,7 @@ const renderFilePath: string = path.resolve(
'matrix-renderer.ts'
);

const workersFilePath: string = path.resolve(workersDirectory, 'types.ts');

writeFile(renderFilePath, fileContent);
writeFile(workersFilePath, typesCode);
216 changes: 91 additions & 125 deletions packages/nimble-components/build/generate-workers/source/matrix-renderer.ts
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import { expose } from 'comlink';
import type {
Dimensions,
Transform,
WaferMapMatrix,
WaferMapTypedMatrix
} from './types';
import type { Dimensions, RenderConfig, TransformConfig } from './types';

/**
* MatrixRenderer class is meant to be used within a Web Worker context,
Expand All @@ -14,141 +9,118 @@ import type {
* This setup is used in the wafer-map component to perform heavy computational duties
*/
export class MatrixRenderer {
public columnIndexes = Int32Array.from([]);
public rowIndexes = Int32Array.from([]);
public values = Float64Array.from([]);
public scaledColumnIndex = Float64Array.from([]);
public scaledRowIndex = Float64Array.from([]);
public columnIndexPositions = Int32Array.from([]);
public scaledColumnIndices = Float64Array.from([]);
public scaledRowIndices = Float64Array.from([]);
public columnIndicesPositions = Int32Array.from([]);
public canvas!: OffscreenCanvas;
public context!: OffscreenCanvasRenderingContext2D;
private scaleX: number = 1;
private scaleY: number = 1;
private baseX: number = 1;
private baseY: number = 1;
private dieDimensions: Dimensions = { width: 1, height: 1 };
private transform: Transform = { k: 1, x: 0, y: 0 };
private topLeftCanvasCorner!: { x: number; y: number };
private bottomRightCanvasCorner!: { x: number; y: number };
private readonly smallestMarginPossible: number = 20;
private margin: {
top: number;
right: number;
bottom: number;
left: number;
} = {
top: this.smallestMarginPossible,
right: this.smallestMarginPossible,
bottom: this.smallestMarginPossible,
left: this.smallestMarginPossible
};
private renderConfig: RenderConfig = {
dieDimensions: {
width: 0,
height: 0
},
margin: {
top: 0,
right: 0,
bottom: 0,
left: 0
},
verticalCoefficient: 1,
horizontalCoefficient: 1,
horizontalConstant: 0,
verticalConstant: 0,
labelsFontSize: 0,
colorScale: []
};

private transformConfig: TransformConfig = {
transform: {
k: 1,
x: 0,
y: 0
},
topLeftCanvasCorner: {
x: 0,
y: 0
},
bottomRightCanvasCorner: {
x: 0,
y: 0
}
};

public calculateXScaledIndex(columnIndex: number): number {
return this.scaleX * columnIndex + this.baseX + this.margin.left;
private calculateHorizontalScaledIndices(columnIndex: number): number {
return (
this.renderConfig.horizontalCoefficient! * columnIndex
+ this.renderConfig.horizontalConstant!
+ this.renderConfig.margin!.left
);
}

public calculateYScaledIndex(rowIndex: number): number {
return this.scaleY * rowIndex + this.baseY + this.margin.top;
private calculateVerticalScaledIndices(rowIndex: number): number {
return (
this.renderConfig.verticalCoefficient! * rowIndex
+ this.renderConfig.verticalConstant!
+ this.renderConfig.margin!.top
);
}

public setColumnIndexes(columnIndexes: Int32Array): void {
this.columnIndexes = columnIndexes;
if (columnIndexes.length === 0 || this.columnIndexes[0] === undefined) {
public setColumnIndices(columnIndices: Int32Array): void {
if (columnIndices.length === 0 || columnIndices[0] === undefined) {
return;
}
const scaledColumnIndex = [
this.calculateXScaledIndex(this.columnIndexes[0])
this.calculateHorizontalScaledIndices(columnIndices[0])
];
const columnPositions = [0];
let prev = this.columnIndexes[0];
for (let i = 1; i < this.columnIndexes.length; i++) {
const xIndex = this.columnIndexes[i];
let prev = columnIndices[0];
for (let i = 1; i < columnIndices.length; i++) {
const xIndex = columnIndices[i];
if (xIndex && xIndex !== prev) {
const scaledX = this.calculateXScaledIndex(
this.columnIndexes[i]!
const scaledX = this.calculateHorizontalScaledIndices(
columnIndices[i]!
);
scaledColumnIndex.push(scaledX);
columnPositions.push(i);
prev = xIndex;
}
}
this.scaledColumnIndex = Float64Array.from(scaledColumnIndex);
this.columnIndexPositions = Int32Array.from(columnPositions);
this.scaledColumnIndices = Float64Array.from(scaledColumnIndex);
this.columnIndicesPositions = Int32Array.from(columnPositions);
}

public setRowIndexes(rowIndexesBuffer: Int32Array): void {
this.rowIndexes = rowIndexesBuffer;
this.scaledRowIndex = new Float64Array(this.rowIndexes.length);
for (let i = 0; i < this.rowIndexes.length; i++) {
this.scaledRowIndex[i] = this.calculateYScaledIndex(
this.rowIndexes[i]!
public setRowIndices(rowIndices: Int32Array): void {
this.scaledRowIndices = new Float64Array(rowIndices.length);
for (let i = 0; i < rowIndices.length; i++) {
this.scaledRowIndices[i] = this.calculateVerticalScaledIndices(
rowIndices[i]!
);
}
}

public setMargin(margin: {
top: number;
right: number;
bottom: number;
left: number;
}): void {
this.margin = margin;
}

public setCanvasCorners(
topLeft: { x: number; y: number },
bottomRight: { x: number; y: number }
): void {
this.topLeftCanvasCorner = topLeft;
this.bottomRightCanvasCorner = bottomRight;
}

public setDiesDimensions(data: Dimensions): void {
this.dieDimensions = { width: data.width, height: data.height };
}

public setScaling(scaleX: number, scaleY: number): void {
this.scaleX = scaleX;
this.scaleY = scaleY;
}

public setBases(baseX: number, baseY: number): void {
this.baseX = baseX;
this.baseY = baseY;
public setRenderConfig(renderConfig: RenderConfig): void {
this.renderConfig = renderConfig;
}

public setTransform(transform: Transform): void {
this.transform = transform;
public setTransformConfig(transformData: TransformConfig): void {
this.transformConfig = transformData;
}

public setCanvas(canvas: OffscreenCanvas): void {
this.canvas = canvas;
this.context = canvas.getContext('2d')!;
}

public getMatrix(): WaferMapTypedMatrix {
return {
columnIndexes: this.columnIndexes,
rowIndexes: this.rowIndexes,
values: this.values
};
}

public emptyMatrix(): void {
this.columnIndexes = Int32Array.from([]);
this.rowIndexes = Int32Array.from([]);
this.values = Float64Array.from([]);
}

public scaleCanvas(): void {
this.context.translate(this.transform.x, this.transform.y);
this.context.scale(this.transform.k, this.transform.k);
}

public updateMatrix(data: WaferMapMatrix): void {
this.columnIndexes = Int32Array.from(data.columnIndexes);
this.rowIndexes = Int32Array.from(data.rowIndexes);
this.values = Float64Array.from(data.values);
this.context.translate(
this.transformConfig.transform.x,
this.transformConfig.transform.y
);
this.context.scale(
this.transformConfig.transform.k,
this.transformConfig.transform.k
);
}

public setCanvasDimensions(data: Dimensions): void {
Expand All @@ -172,39 +144,33 @@ export class MatrixRenderer {
this.context.save();
this.clearCanvas();
this.scaleCanvas();
if (
this.topLeftCanvasCorner === undefined
|| this.bottomRightCanvasCorner === undefined
) {
throw new Error('Canvas corners are not set');
}
for (let i = 0; i < this.scaledColumnIndex.length; i++) {
const scaledX = this.scaledColumnIndex[i]!;
for (let i = 0; i < this.scaledColumnIndices.length; i++) {
const scaledX = this.scaledColumnIndices[i]!;
if (
!(
scaledX >= this.topLeftCanvasCorner.x
&& scaledX < this.bottomRightCanvasCorner.x
scaledX >= this.transformConfig.topLeftCanvasCorner.x
&& scaledX < this.transformConfig.bottomRightCanvasCorner.x
)
) {
continue;
}

// columnIndexPositions is used to get chunks to determine the start and end index of the column, it looks something like [0, 1, 4, 9, 12]
// This means that the first column has a start index of 0 and an end index of 1, the second column has a start index of 1 and an end index of 4, and so on
// scaledRowIndex is used when we reach the end of the columnIndexPositions, when columnIndexPositions is [0, 1, 4, 9, 12], scaledRowIndex is 13
const columnEndIndex = this.columnIndexPositions[i + 1] !== undefined
? this.columnIndexPositions[i + 1]!
: this.scaledRowIndex.length;
// scaledRowIndices is used when we reach the end of the columnIndexPositions, when columnIndexPositions is [0, 1, 4, 9, 12], scaledRowIndices is 13
const columnEndIndex = this.columnIndicesPositions[i + 1] !== undefined
? this.columnIndicesPositions[i + 1]!
: this.scaledRowIndices.length;
for (
let columnStartIndex = this.columnIndexPositions[i]!;
let columnStartIndex = this.columnIndicesPositions[i]!;
columnStartIndex < columnEndIndex;
columnStartIndex++
) {
const scaledY = this.scaledRowIndex[columnStartIndex]!;
const scaledY = this.scaledRowIndices[columnStartIndex]!;
if (
!(
scaledY >= this.topLeftCanvasCorner.y
&& scaledY < this.bottomRightCanvasCorner.y
scaledY >= this.transformConfig.topLeftCanvasCorner.y
&& scaledY < this.transformConfig.bottomRightCanvasCorner.y
)
) {
continue;
Expand All @@ -214,8 +180,8 @@ export class MatrixRenderer {
this.context.fillRect(
scaledX,
scaledY,
this.dieDimensions.width,
this.dieDimensions.height
this.renderConfig.dieDimensions.width,
this.renderConfig.dieDimensions.height
);
}
}
Expand Down
Loading

0 comments on commit 4b087fc

Please sign in to comment.