improve naive clip to gamut

mcnuttandrew · Jan 17, 2024 · 4c8fdf7 · 4c8fdf7
1 parent 42e0624
commit 4c8fdf7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/src/components/ColorScatterPlot.svelte b/src/components/ColorScatterPlot.svelte
@@ -492,7 +492,7 @@
                 class="pointer-events-none"
               />
             {/if}
-            {#if pickedColors.length}
+            {#if pickedColors.length && focusedColors.length > 1}
               <rect
                 x={5}
                 y={pos.zPos - 5}
@@ -515,7 +515,7 @@
     -moz-transition: r 0.2s ease-in-out;
   }
 
-  svg {
+  /* svg {
     overflow: visible;
-  }
+  } */
 </style>
diff --git a/src/components/ColorScatterPlotXYGuides.svelte b/src/components/ColorScatterPlotXYGuides.svelte
@@ -25,7 +25,7 @@
     centerTop: {
       x: (xScale.range()[1] - xScale.range()[0]) / 2,
       y: yScale.range()[0],
-      labelAdjust: { x: 0, y: -5 },
+      labelAdjust: { x: 0, y: -3 },
       anchor: "middle",
       label: `${config.yChannel}: ${axisFormatter(yScale.domain()[0])}`,
     },

diff --git a/src/components/ColorScatterPlotZGuide.svelte b/src/components/ColorScatterPlotZGuide.svelte
@@ -17,7 +17,7 @@
 
   $: zPoints = {
     top: {
-      y: zScale.range()[0] + 8,
+      y: zScale.range()[0] + 15,
       label: `${config.zChannel.toUpperCase()}: ${zScale
         .domain()[0]
         .toFixed(1)}`,

diff --git a/src/content-modules/contextual-tools/ClipToGamut.svelte b/src/content-modules/contextual-tools/ClipToGamut.svelte
@@ -5,10 +5,19 @@
 
   $: colors = $colorStore.currentPal.colors;
 
+  const clamp = (x: number, min: number, max: number) =>
+    Math.min(Math.max(x, min), max);
+
   function clipToGamut() {
     const newColors = colors.map((x) => {
       if (x.inGamut()) {
-        return x;
+        const channels = Object.entries(x.domains).map(([key, domain]) => {
+          const [min, max] = domain.sort();
+          return clamp(x.channels[key], min, max);
+        });
+        return x.fromChannels(channels as [number, number, number]);
+
+        // return x;
       } else {
         const newChannels = x
           .toColorIO()