change handling of flipped axes: now outside of TiledHeatmapMesh

silx-kit · May 10, 2022 · 89cc188 · 89cc188
1 parent 7a3edbf
commit 89cc188
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/apps/storybook/src/TiledHeatmapMesh.stories.tsx b/apps/storybook/src/TiledHeatmapMesh.stories.tsx
@@ -147,7 +147,11 @@ const Template: Story<TiledHeatmapStoryProps> = (args) => {
       <Zoom />
       <SelectToZoom keepRatio modifierKey="Control" />
       <ResetZoomButton />
-      <TiledHeatmapMesh api={api} {...tiledHeatmapProps} />
+      <group
+        scale={[abscissaConfig.flip ? -1 : 1, ordinateConfig.flip ? -1 : 1, 1]}
+      >
+        <TiledHeatmapMesh api={api} {...tiledHeatmapProps} />
+      </group>
     </VisCanvas>
   );
 };
@@ -223,16 +227,25 @@ function LinearAxesGroup(props: { children: ReactNode }) {
   const { visSize, abscissaConfig, ordinateConfig } = useAxisSystemContext();
   const { width, height } = visSize;
   const sx =
-    width / (abscissaConfig.visDomain[1] - abscissaConfig.visDomain[0]);
+    ((abscissaConfig.flip ? -1 : 1) * width) /
+    (abscissaConfig.visDomain[1] - abscissaConfig.visDomain[0]);
   const sy =
-    height / (ordinateConfig.visDomain[1] - ordinateConfig.visDomain[0]);
+    ((ordinateConfig.flip ? -1 : 1) * height) /
+    (ordinateConfig.visDomain[1] - ordinateConfig.visDomain[0]);
+  const x = 0.5 * (abscissaConfig.visDomain[0] + abscissaConfig.visDomain[1]);
+  const y = 0.5 * (ordinateConfig.visDomain[0] + ordinateConfig.visDomain[1]);
 
-  return <group scale={[sx, sy, 1]}>{children}</group>;
+  return (
+    <group scale={[sx, sy, 1]} position={[-x * sx, -y * sy, 0]}>
+      {children}
+    </group>
+  );
 }
 
 export const WithTransforms: Story<TiledHeatmapStoryProps> = (args) => {
   const { abscissaConfig, api, ordinateConfig, ...tiledHeatmapProps } = args;
-  const size = { width: 1, height: 1 };
+  const { baseLayerSize } = api;
+  const size = { width: 1, height: baseLayerSize.height / baseLayerSize.width };
 
   return (
     <VisCanvas
@@ -248,7 +261,7 @@ export const WithTransforms: Story<TiledHeatmapStoryProps> = (args) => {
       <SelectToZoom keepRatio modifierKey="Control" />
       <ResetZoomButton />
       <LinearAxesGroup>
-        <group rotation={[0, 0, Math.PI / 4]} position={[1, -1, 0]}>
+        <group position={[1, 1, 0]} rotation={[0, 0, Math.PI / 4]}>
           <TiledHeatmapMesh api={api} {...tiledHeatmapProps} size={size} />
         </group>
         <group position={[-1, 1, 0]} scale={[2, 2, 1]}>
@@ -259,16 +272,18 @@ export const WithTransforms: Story<TiledHeatmapStoryProps> = (args) => {
   );
 };
 WithTransforms.args = {
-  api: defaultApi,
+  api: halfMandelbrotApi,
   abscissaConfig: {
-    visDomain: [-2, 2],
+    visDomain: [-2, 1.5],
     isIndexAxis: true,
     showGrid: false,
+    flip: false,
   },
   ordinateConfig: {
-    visDomain: [-2, 2],
+    visDomain: [0, 2],
     isIndexAxis: true,
     showGrid: false,
+    flip: true,
   },
 };
 

diff --git a/packages/lib/src/vis/tiles/TiledLayer.tsx b/packages/lib/src/vis/tiles/TiledLayer.tsx
@@ -27,7 +27,6 @@ function TiledLayer(props: Props) {
   const layerSize = api.layerSizes[layer];
 
   const groupRef = useRef<Group>(null);
-  const { abscissaConfig, ordinateConfig } = useAxisSystemContext();
   const box = useCameraState(
     (...args) => getScaledVisibleBox(...args, meshSize, layerSize, groupRef),
     [meshSize, layerSize, groupRef]
@@ -42,11 +41,8 @@ function TiledLayer(props: Props) {
   }
 
   return (
-    // Transforms to handle axes flip and use level of details layer array coordinates
-    <group
-      ref={groupRef}
-      scale={[abscissaConfig.flip ? -1 : 1, ordinateConfig.flip ? -1 : 1, 1]}
-    >
+    // Transforms to use level of details layer array coordinates
+    <group ref={groupRef}>
       <group
         position={[
           -meshSize.width / 2,