altium-toolkit 1.1.2 → 1.1.22

package/src/ui/SchematicShapeRenderer.mjs

@@ -157,7 +157,7 @@ export class SchematicShapeRenderer {
             pie.startAngle,
             pie.endAngle
         )
-        const sweep = delta >= 0 ? 0 : 1
+        const sweep = SchematicShapeRenderer.#resolvePieSweep(delta)
         const center = {
             x: Number(pie.x) || 0,
             y: projectSchematicY(sheetHeight, Number(pie.y) || 0)
@@ -226,11 +226,18 @@ export class SchematicShapeRenderer {
 
     /**
      * Builds one schematic rectangle primitive.
-     * @param {{ x: number, y: number, width: number, height: number, color: string, fill: string, isSolid: boolean, transparent: boolean, lineWidth: number, lineStyle?: number }} rectangle
+     * @param {{ x: number, y: number, width: number, height: number, color: string, fill: string, isSolid: boolean, transparent: boolean, lineWidth: number, lineStyle?: number, ownerIndex?: string }} rectangle
      * @param {number} sheetHeight
      * @returns {string}
      */
     static buildRectangleMarkup(rectangle, sheetHeight) {
+        const preserveSourceColors =
+            SchematicShapeRenderer.#isOwnerColorStrip(rectangle)
+        const fill = SchematicShapeRenderer.#resolveSchematicRectangleFill(
+            rectangle,
+            preserveSourceColors
+        )
+
         return (
             '<rect class="schematic-rectangle" x="' +
             formatNumber(rectangle.x) +
@@ -244,19 +251,27 @@ export class SchematicShapeRenderer {
             formatNumber(rectangle.height) +
             '" fill="' +
             escapeHtml(
-                SchematicColorResolver.resolveFill(
-                    SchematicShapeRenderer.#resolveSchematicRectangleFill(
-                        rectangle
-                    ),
-                    '--schematic-fill-color'
-                )
+                preserveSourceColors
+                    ? SchematicColorResolver.resolveMutedSourceFill(
+                          fill,
+                          '--schematic-fill-color'
+                      )
+                    : SchematicColorResolver.resolveFill(
+                          fill,
+                          '--schematic-fill-color'
+                      )
             ) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
-                    rectangle.color,
-                    '--schematic-default-ink-color'
-                )
+                preserveSourceColors
+                    ? SchematicColorResolver.resolveMutedSourceColor(
+                          rectangle.color,
+                          '--schematic-default-ink-color'
+                      )
+                    : SchematicColorResolver.resolveColor(
+                          rectangle.color,
+                          '--schematic-default-ink-color'
+                      )
             ) +
             '" stroke-width="' +
             formatNumber(Math.max(rectangle.lineWidth || 1, 0.8)) +
@@ -271,12 +286,18 @@ export class SchematicShapeRenderer {
 
     /**
      * Builds one schematic rounded-rectangle primitive.
-     * @param {{ x: number, y: number, width: number, height: number, radius?: number, color: string, fill: string, isSolid: boolean, transparent: boolean, lineWidth: number, lineStyle?: number }} rectangle
+     * @param {{ x: number, y: number, width: number, height: number, radius?: number, color: string, fill: string, isSolid: boolean, transparent: boolean, lineWidth: number, lineStyle?: number, ownerIndex?: string }} rectangle
      * @param {number} sheetHeight
      * @returns {string}
      */
     static buildRoundedRectangleMarkup(rectangle, sheetHeight) {
         const radius = Math.max(Number(rectangle.radius || 0), 0)
+        const preserveSourceColors =
+            SchematicShapeRenderer.#isOwnerColorStrip(rectangle)
+        const fill = SchematicShapeRenderer.#resolveSchematicRectangleFill(
+            rectangle,
+            preserveSourceColors
+        )
 
         return (
             '<rect class="schematic-rounded-rectangle" x="' +
@@ -295,19 +316,27 @@ export class SchematicShapeRenderer {
             formatNumber(radius) +
             '" fill="' +
             escapeHtml(
-                SchematicColorResolver.resolveFill(
-                    SchematicShapeRenderer.#resolveSchematicRectangleFill(
-                        rectangle
-                    ),
-                    '--schematic-fill-color'
-                )
+                preserveSourceColors
+                    ? SchematicColorResolver.resolveMutedSourceFill(
+                          fill,
+                          '--schematic-fill-color'
+                      )
+                    : SchematicColorResolver.resolveFill(
+                          fill,
+                          '--schematic-fill-color'
+                      )
             ) +
             '" stroke="' +
             escapeHtml(
-                SchematicColorResolver.resolveColor(
-                    rectangle.color,
-                    '--schematic-default-ink-color'
-                )
+                preserveSourceColors
+                    ? SchematicColorResolver.resolveMutedSourceColor(
+                          rectangle.color,
+                          '--schematic-default-ink-color'
+                      )
+                    : SchematicColorResolver.resolveColor(
+                          rectangle.color,
+                          '--schematic-default-ink-color'
+                      )
             ) +
             '" stroke-width="' +
             formatNumber(Math.max(rectangle.lineWidth || 1, 0.8)) +
@@ -445,16 +474,57 @@ export class SchematicShapeRenderer {
     /**
      * Resolves the visible fill for one schematic rectangle primitive.
      * @param {{ fill: string, isSolid: boolean, transparent: boolean }} rectangle
+     * @param {boolean} preserveSourceFill
      * @returns {string}
      */
-    static #resolveSchematicRectangleFill(rectangle) {
+    static #resolveSchematicRectangleFill(rectangle, preserveSourceFill) {
         if (rectangle.transparent || !rectangle.isSolid) {
+            if (
+                preserveSourceFill &&
+                SchematicShapeRenderer.#hasVisibleSourceFill(rectangle)
+            ) {
+                return rectangle.fill
+            }
+
             return 'none'
         }
 
         return rectangle.fill || 'none'
     }
 
+    /**
+     * Returns true when a transparent owner color strip still carries an
+     * authored fill color that encodes symbol-side rail intent.
+     * @param {{ fill?: string }} rectangle
+     * @returns {boolean}
+     */
+    static #hasVisibleSourceFill(rectangle) {
+        const fill = String(rectangle?.fill || '')
+            .trim()
+            .toLowerCase()
+
+        return Boolean(fill) && fill !== 'none' && fill !== 'transparent'
+    }
+
+    /**
+     * Returns true for narrow symbol-owned color swatches such as per-section
+     * strips that carry source palette meaning.
+     * @param {{ width: number, height: number, ownerIndex?: string }} rectangle
+     * @returns {boolean}
+     */
+    static #isOwnerColorStrip(rectangle) {
+        if (!rectangle?.ownerIndex) {
+            return false
+        }
+
+        const width = Math.abs(Number(rectangle.width || 0))
+        const height = Math.abs(Number(rectangle.height || 0))
+        const shortSide = Math.min(width, height)
+        const longSide = Math.max(width, height)
+
+        return shortSide > 0 && shortSide <= 8 && longSide >= 20
+    }
+
     /**
      * Resolves the visible fill for one schematic ellipse primitive.
      * @param {{ fill: string, isSolid: boolean, transparent: boolean }} ellipse
@@ -766,4 +836,19 @@ export class SchematicShapeRenderer {
 
         return delta
     }
+
+    /**
+     * Resolves SVG sweep direction for filled Altium pie primitives.
+     * @param {number} delta Normalized source angle delta.
+     * @returns {number}
+     */
+    static #resolvePieSweep(delta) {
+        const magnitude = Math.abs(Number(delta) || 0)
+
+        if (Math.abs(magnitude - 180) <= 0.001) {
+            return 0
+        }
+
+        return delta >= 0 ? 0 : 1
+    }
 }