Merge remote-tracking branch 'origin/main' into 68-soundings-in-plot

Author: Peter9192

apps/class-solid/package.json

@@ -1,7 +1,7 @@
 {
   "name": "class-solid",
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "type": "module",
   "scripts": {
     "dev": "vinxi dev",

apps/class-solid/src/components/plots/ChartContainer.tsx

@@ -8,7 +8,7 @@ import {
 } from "solid-js";
 import { type SetStoreFunction, createStore } from "solid-js/store";
 
-type SupportedScaleTypes =
+export type SupportedScaleTypes =
   | d3.ScaleLinear<number, number, never>
   | d3.ScaleLogarithmic<number, number, never>;
 const supportedScales = {
@@ -34,6 +34,7 @@ interface Chart {
   scaleY: SupportedScaleTypes;
   formatX: (value: number) => string;
   formatY: (value: number) => string;
+  transformX?: (x: number, y: number, scaleY: SupportedScaleTypes) => number;
 }
 type SetChart = SetStoreFunction<Chart>;
 const ChartContext = createContext<[Chart, SetChart]>();
@@ -95,6 +96,7 @@ export function Chart(props: {
   title?: string;
   formatX?: (value: number) => string;
   formatY?: (value: number) => string;
+  transformX?: (x: number, y: number, scaleY: SupportedScaleTypes) => number;
 }) {
   const [hovering, setHovering] = createSignal(false);
   const [coords, setCoords] = createSignal<[number, number]>([0, 0]);
@@ -108,12 +110,20 @@ export function Chart(props: {
   if (props.formatY) {
     updateChart("formatY", () => props.formatY);
   }
+  if (props.transformX) {
+    updateChart("transformX", () => props.transformX);
+  }
+
+  const onMouseMove = (e: MouseEvent) => {
+    let x = e.offsetX - marginLeft;
+    const y = e.offsetY - marginTop;
+
+    if (chart.transformX) {
+      x = chart.transformX(x, y, chart.scaleY);
+    }
 
-  const onMouseMove = (e: MouseEvent) =>
-    setCoords([
-      chart.scaleX.invert(e.offsetX - marginLeft),
-      chart.scaleY.invert(e.offsetY - marginTop),
-    ]);
+    setCoords([chart.scaleX.invert(x), chart.scaleY.invert(y)]);
+  };
 
   const renderXCoord = () =>
     hovering() ? `x: ${chart.formatX(coords()[0])}` : "";

apps/class-solid/src/components/plots/skewTlogP.tsx

@@ -2,10 +2,9 @@
 import * as d3 from "d3";
 import { For, createSignal } from "solid-js";
 import { AxisBottom, AxisLeft } from "./Axes";
-import type { ChartData } from "./ChartContainer";
+import type { ChartData, SupportedScaleTypes } from "./ChartContainer";
 import { Chart, ChartContainer, useChartContext } from "./ChartContainer";
 import { Legend } from "./Legend";
-
 interface SoundingRecord {
   p: number;
   T: number;
@@ -17,6 +16,10 @@ const tan = Math.tan(55 * deg2rad);
 const basep = 1050;
 const topPressure = 100;
 
+function getTempAtCursor(x: number, y: number, scaleY: SupportedScaleTypes) {
+  return x + 0.5 - (scaleY(basep) - y) / tan;
+}
+
 function ClipPath() {
   const [chart, updateChart] = useChartContext();
 
@@ -152,6 +155,7 @@ export function SkewTPlot({
         title="Thermodynamic diagram"
         formatX={d3.format(".0d")}
         formatY={d3.format(".0d")}
+        transformX={getTempAtCursor}
       >
         <AxisBottom
           domain={() => [-45, 50]}

package.json

@@ -1,6 +1,6 @@
 {
   "private": true,
-  "version": "0.1.2",
+  "version": "0.1.3",
   "scripts": {
     "build": "turbo build",
     "dev": "turbo dev",

packages/class/package.json

@@ -2,7 +2,7 @@
   "name": "@classmodel/class",
   "description": "Chemistry Land-surface Atmosphere Soil Slab (CLASS) model",
   "type": "module",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "exports": {
     "./package.json": "./package.json",
     "./class": {

packages/form/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@classmodel/form",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Generate form from JSON schema with Solid UI components",
   "type": "module",
   "repository": {