@reekon-tools/boldr-utils 1.6.2 → 1.6.4

package/dist/index.d.ts

@@ -5,4 +5,4 @@ export { parseMeasurement } from './utils/parseMeasurement.js';
 export { useParseMeasurement } from './hooks/useParseMeasurement.js';
 export * from './types/firestore.js';
 export * from './types/layout.js';
-export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, type ToleranceThreshold, type ToleranceConfig, } from './utils/tolerance.js';
+export { getToleranceColor, getToleranceSecondaryColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, DEFAULT_TOLERANCE_SECONDARY_COLORS, type ToleranceThreshold, type ToleranceConfig, } from './utils/tolerance.js';

package/dist/index.js

@@ -5,4 +5,4 @@ export { parseMeasurement } from './utils/parseMeasurement.js';
 export { useParseMeasurement } from './hooks/useParseMeasurement.js';
 export * from './types/firestore.js';
 export * from './types/layout.js';
-export { getToleranceColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, } from './utils/tolerance.js';
+export { getToleranceColor, getToleranceSecondaryColor, calculateDeviationPercentage, isWithinTolerance, generateToleranceGradient, createDefaultToleranceThresholds, DEFAULT_TOLERANCE_COLORS, DEFAULT_TOLERANCE_SECONDARY_COLORS, } from './utils/tolerance.js';

package/dist/utils/micrometersToUnit.d.ts

@@ -1,4 +1,5 @@
 import { DecimalTolerance, FractionalTolerance, Units } from '../types/firestore.js';
+export declare const roundToT1Values: (value: number, u: Units) => number;
 export declare const convertMicrometers: (micrometers: number | null | undefined, unit: Units, fractionalTolerance: FractionalTolerance, decimalTolerance: DecimalTolerance) => {
     value: string;
     unit: string;

package/dist/utils/micrometersToUnit.js

@@ -1,12 +1,35 @@
 import { Units, convertUnitsToReadable, } from '../types/firestore.js';
 import { create, all } from 'mathjs';
 const math = create(all);
+// The T1 rounds differently depending on the selected measurement unit.
+// This function mirrors the rounding behavior implemented on the firmware.
+// The value being rounded is in microns.
+export const roundToT1Values = (value, u) => {
+    switch (u) {
+        case Units.Millimeters:
+        case Units.Centimeters:
+            return Math.round(value / 500) * 500;
+        case Units.Meters:
+            return Math.round(value / 1000) * 1000;
+        case Units.Inches:
+            return Math.round(value / 508) * 508;
+        case Units.Feet:
+            return Math.round(value / 304.8) * 304.8;
+        case Units.FeetInchesDecimal:
+            return Math.round(value / 508) * 508;
+        case Units.FractionalInches:
+        case Units.FeetInchesFractional:
+            return value;
+        default:
+            return Math.round(value / 500) * 500;
+    }
+};
 export const convertMicrometers = (micrometers, unit, fractionalTolerance, decimalTolerance) => {
     if (micrometers == null || isNaN(micrometers)) {
         return { value: 'NaN', unit: '' };
     }
     try {
-        const converted = math.unit(micrometers, 'um');
+        const converted = math.unit(roundToT1Values(micrometers, unit), 'um');
         let value = 0;
         let displayUnit = '';
         switch (unit) {

package/dist/utils/tolerance.d.ts

@@ -16,6 +16,10 @@ export declare const DEFAULT_TOLERANCE_COLORS: {
     readonly IN_TOLERANCE: "#22c55e";
     readonly OUT_OF_TOLERANCE: "#ef4444";
 };
+export declare const DEFAULT_TOLERANCE_SECONDARY_COLORS: {
+    readonly IN_TOLERANCE: "#268F0A";
+    readonly OUT_OF_TOLERANCE: "#A91507";
+};
 /**
  * Calculates the appropriate color for a measurement based on tolerance thresholds
  *
@@ -27,6 +31,17 @@ export declare const DEFAULT_TOLERANCE_COLORS: {
  * @returns The color hex string to use for the measurement
  */
 export declare function getToleranceColor(actualValue: number, target: number, min: number, max: number, toleranceConfig?: ToleranceConfig | null): string;
+/**
+ * Calculates the appropriate color for a measurement based on tolerance thresholds
+ *
+ * @param actualValue - The measured value
+ * @param target - The target/nominal value
+ * @param min - The minimum acceptable value (used as negative tolerance from target)
+ * @param max - The maximum acceptable value (used as positive tolerance from target)
+ * @param toleranceConfig - Optional tolerance configuration with custom thresholds
+ * @returns The color hex string to use for the measurement
+ */
+export declare function getToleranceSecondaryColor(actualValue: number, target: number, min: number, max: number, toleranceConfig?: ToleranceConfig | null): string;
 /**
  * Calculates the deviation percentage of a measurement from its target
  *

package/dist/utils/tolerance.js

@@ -5,6 +5,10 @@ export const DEFAULT_TOLERANCE_COLORS = {
     IN_TOLERANCE: '#22c55e', // Green
     OUT_OF_TOLERANCE: '#ef4444', // Red
 };
+export const DEFAULT_TOLERANCE_SECONDARY_COLORS = {
+    IN_TOLERANCE: '#268F0A', // Green
+    OUT_OF_TOLERANCE: '#A91507', // Red
+};
 /**
  * Calculates the appropriate color for a measurement based on tolerance thresholds
  *
@@ -42,6 +46,43 @@ export function getToleranceColor(actualValue, target, min, max, toleranceConfig
     }
     return applicableColor;
 }
+/**
+ * Calculates the appropriate color for a measurement based on tolerance thresholds
+ *
+ * @param actualValue - The measured value
+ * @param target - The target/nominal value
+ * @param min - The minimum acceptable value (used as negative tolerance from target)
+ * @param max - The maximum acceptable value (used as positive tolerance from target)
+ * @param toleranceConfig - Optional tolerance configuration with custom thresholds
+ * @returns The color hex string to use for the measurement
+ */
+export function getToleranceSecondaryColor(actualValue, target, min, max, toleranceConfig) {
+    // If no tolerance config provided, use simple green/red logic
+    if (!toleranceConfig?.thresholds || toleranceConfig.thresholds.length === 0) {
+        const isWithinTolerance = actualValue >= target - min && actualValue <= target + max;
+        return isWithinTolerance
+            ? DEFAULT_TOLERANCE_SECONDARY_COLORS.IN_TOLERANCE
+            : DEFAULT_TOLERANCE_SECONDARY_COLORS.OUT_OF_TOLERANCE;
+    }
+    // Calculate deviation percentage
+    const deviation = Math.abs(actualValue - target);
+    const toleranceRange = max + min; // Fixed: total tolerance range
+    const deviationPercentage = toleranceRange > 0 ? (deviation / toleranceRange) * 100 : 0;
+    // Sort thresholds by percentage to ensure correct evaluation order
+    const sortedThresholds = toleranceConfig.thresholds.sort((a, b) => a.percentage - b.percentage);
+    // If deviation is below the first threshold, it's in tolerance (green)
+    if (deviationPercentage < sortedThresholds[0].percentage) {
+        return DEFAULT_TOLERANCE_SECONDARY_COLORS.IN_TOLERANCE;
+    }
+    // Find the highest threshold that the deviation exceeds
+    let applicableColor = sortedThresholds[0].color;
+    for (const threshold of sortedThresholds) {
+        if (deviationPercentage >= threshold.percentage) {
+            applicableColor = threshold.color;
+        }
+    }
+    return applicableColor;
+}
 /**
  * Calculates the deviation percentage of a measurement from its target
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reekon-tools/boldr-utils",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "Shared utilities for formulas and measurement conversion used in Reekon apps",
   "author": "REEKON Tools",
   "license": "MIT",