wip

rubenthoms · Jun 7, 2024 · 2307c52 · 2307c52
1 parent 9eaf356
commit 2307c52
Show file tree

Hide file tree

Showing 41 changed files with 208 additions and 114 deletions.
diff --git a/frontend/src/framework/WorkbenchServices.ts b/frontend/src/framework/WorkbenchServices.ts
@@ -1,6 +1,6 @@
 import React from "react";
 
-import { Viewport } from "@modules/_shared/components/EsvIntersection/esvIntersection";
+import { Viewport } from "@framework/components/EsvIntersection/esvIntersection";
 
 import { isEqual } from "lodash";
 

diff --git a/...nents/EsvIntersection/esvIntersection.tsx → ...nents/EsvIntersection/esvIntersection.tsx b/...nents/EsvIntersection/esvIntersection.tsx → ...nents/EsvIntersection/esvIntersection.tsx
@@ -431,7 +431,7 @@ export function EsvIntersection(props: EsvIntersectionProps): React.ReactNode {
                     const cy = dy0 + displ / event.zFactor / event.viewportRatio / 2;
 
                     setCurrentViewport([cx, cy, displ]);
-                    timeout = setTimeout(() => onViewportChange([cx, cy, displ]), 100);
+                    onViewportChange([cx, cy, displ]);
                 }
                 automaticChanges.current = false;
                 oldOnRescaleFunction(event);
@@ -492,9 +492,6 @@ export function EsvIntersection(props: EsvIntersectionProps): React.ReactNode {
                 newEsvController.removeAllLayers();
                 newEsvController.destroy();
                 newInteractionHandler.destroy();
-                if (timeout) {
-                    clearTimeout(timeout);
-                }
             };
         },
         [onReadout, onViewportChange, props.intersectionThreshold]

diff --git a/...hared/components/EsvIntersection/index.ts → ...ework/components/EsvIntersection/index.ts b/...hared/components/EsvIntersection/index.ts → ...ework/components/EsvIntersection/index.ts
diff --git a/...Intersection/interaction/BoundingBox2D.ts → ...Intersection/interaction/BoundingBox2D.ts b/...Intersection/interaction/BoundingBox2D.ts → ...Intersection/interaction/BoundingBox2D.ts
diff --git a/...ersection/interaction/BoundingSphere2D.ts → ...ersection/interaction/BoundingSphere2D.ts b/...ersection/interaction/BoundingSphere2D.ts → ...ersection/interaction/BoundingSphere2D.ts
diff --git a/...raction/FanchartIntersectionCalculator.ts → ...raction/FanchartIntersectionCalculator.ts b/...raction/FanchartIntersectionCalculator.ts → ...raction/FanchartIntersectionCalculator.ts
diff --git a/...ersection/interaction/HighlightOverlay.ts → ...ersection/interaction/HighlightOverlay.ts b/...ersection/interaction/HighlightOverlay.ts → ...ersection/interaction/HighlightOverlay.ts
diff --git a/...section/interaction/InteractionHandler.ts → ...section/interaction/InteractionHandler.ts b/...section/interaction/InteractionHandler.ts → ...section/interaction/InteractionHandler.ts
diff --git a/...ection/interaction/IntersectionHandler.ts → ...ection/interaction/IntersectionHandler.ts b/...ection/interaction/IntersectionHandler.ts → ...ection/interaction/IntersectionHandler.ts
diff --git a/...interaction/LineIntersectionCalculator.ts → ...interaction/LineIntersectionCalculator.ts b/...interaction/LineIntersectionCalculator.ts → ...interaction/LineIntersectionCalculator.ts
diff --git a/...eraction/LineSetIntersectionCalculator.ts → ...eraction/LineSetIntersectionCalculator.ts b/...eraction/LineSetIntersectionCalculator.ts → ...eraction/LineSetIntersectionCalculator.ts
diff --git a/...nteraction/PointIntersectionCalculator.ts → ...nteraction/PointIntersectionCalculator.ts b/...nteraction/PointIntersectionCalculator.ts → ...nteraction/PointIntersectionCalculator.ts
diff --git a/...eraction/PolygonIntersectionCalculator.ts → ...eraction/PolygonIntersectionCalculator.ts b/...eraction/PolygonIntersectionCalculator.ts → ...eraction/PolygonIntersectionCalculator.ts
diff --git a/...raction/PolygonsIntersectionCalculator.ts → ...raction/PolygonsIntersectionCalculator.ts b/...raction/PolygonsIntersectionCalculator.ts → ...raction/PolygonsIntersectionCalculator.ts
diff --git a/...action/RectangleIntersectionCalculator.ts → ...action/RectangleIntersectionCalculator.ts b/...action/RectangleIntersectionCalculator.ts → ...action/RectangleIntersectionCalculator.ts
diff --git a/...ion/WellborePathIntersectionCalculator.ts → ...ion/WellborePathIntersectionCalculator.ts b/...ion/WellborePathIntersectionCalculator.ts → ...ion/WellborePathIntersectionCalculator.ts
diff --git a/...ction/layers/PolylineIntersectionLayer.ts → ...ction/layers/PolylineIntersectionLayer.ts b/...ction/layers/PolylineIntersectionLayer.ts → ...ction/layers/PolylineIntersectionLayer.ts
diff --git a/...ts/EsvIntersection/layers/SeismicLayer.ts → ...ts/EsvIntersection/layers/SeismicLayer.ts b/...ts/EsvIntersection/layers/SeismicLayer.ts → ...ts/EsvIntersection/layers/SeismicLayer.ts
diff --git a/.../SurfaceStatisticalFanchartCanvasLayer.ts → .../SurfaceStatisticalFanchartCanvasLayer.ts b/.../SurfaceStatisticalFanchartCanvasLayer.ts → .../SurfaceStatisticalFanchartCanvasLayer.ts
diff --git a/...components/EsvIntersection/types/index.ts → ...components/EsvIntersection/types/index.ts b/...components/EsvIntersection/types/index.ts → ...components/EsvIntersection/types/index.ts
diff --git a/...components/EsvIntersection/types/types.ts → ...components/EsvIntersection/types/types.ts b/...components/EsvIntersection/types/types.ts → ...components/EsvIntersection/types/types.ts
diff --git a/...rsection/utilityComponents/ReadoutBox.tsx → ...rsection/utilityComponents/ReadoutBox.tsx b/...rsection/utilityComponents/ReadoutBox.tsx → ...rsection/utilityComponents/ReadoutBox.tsx
diff --git a/...ntersection/utilityComponents/Toolbar.tsx → ...ntersection/utilityComponents/Toolbar.tsx b/...ntersection/utilityComponents/Toolbar.tsx → ...ntersection/utilityComponents/Toolbar.tsx
diff --git a/...ponents/EsvIntersection/utils/geometry.ts → ...ponents/EsvIntersection/utils/geometry.ts b/...ponents/EsvIntersection/utils/geometry.ts → ...ponents/EsvIntersection/utils/geometry.ts
diff --git a/...ersection/utils/intersectionConversion.ts → ...ersection/utils/intersectionConversion.ts b/...ersection/utils/intersectionConversion.ts → ...ersection/utils/intersectionConversion.ts
diff --git a/...Intersection/utils/intersectionResults.ts → ...Intersection/utils/intersectionResults.ts b/...Intersection/utils/intersectionResults.ts → ...Intersection/utils/intersectionResults.ts
diff --git a/...s/EsvIntersection/utils/layerDataItems.ts → ...s/EsvIntersection/utils/layerDataItems.ts b/...s/EsvIntersection/utils/layerDataItems.ts → ...s/EsvIntersection/utils/layerDataItems.ts
diff --git a/...omponents/EsvIntersection/utils/layers.ts → ...omponents/EsvIntersection/utils/layers.ts b/...omponents/EsvIntersection/utils/layers.ts → ...omponents/EsvIntersection/utils/layers.ts
diff --git a/...svIntersection/utils/readoutItemUtils.tsx → ...svIntersection/utils/readoutItemUtils.tsx b/...svIntersection/utils/readoutItemUtils.tsx → ...svIntersection/utils/readoutItemUtils.tsx
diff --git a/...tion/utils/surfaceStatisticalFancharts.ts → ...tion/utils/surfaceStatisticalFancharts.ts b/...tion/utils/surfaceStatisticalFancharts.ts → ...tion/utils/surfaceStatisticalFancharts.ts
diff --git a/frontend/src/modules/3DViewer/registerModule.ts b/frontend/src/modules/3DViewer/registerModule.ts
@@ -15,7 +15,7 @@ ModuleRegistry.registerModule<State, SettingsToViewInterface>({
     moduleName: MODULE_NAME,
     defaultTitle: "3D Viewer",
     category: ModuleCategory.MAIN,
-    devState: ModuleDevState.DEPRECATED,
+    devState: ModuleDevState.DEV,
     dataTagIds: [ModuleDataTagId.GRID3D, ModuleDataTagId.DRILLED_WELLS],
     description,
     preview,

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/seismicLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/seismicLayer.tsx
@@ -8,6 +8,7 @@ import { WorkbenchSettings } from "@framework/WorkbenchSettings";
 import { EnsembleDropdown } from "@framework/components/EnsembleDropdown";
 import { isIsoStringInterval } from "@framework/utils/timestampUtils";
 import { Dropdown, DropdownOption } from "@lib/components/Dropdown";
+import { Input } from "@lib/components/Input";
 import { PendingWrapper } from "@lib/components/PendingWrapper";
 import { RadioGroup } from "@lib/components/RadioGroup";
 import { SelectOption } from "@lib/components/Select";
@@ -165,6 +166,10 @@ export const SeismicLayerSettingsComponent: React.FC<SeismicLayerSettingsProps>
         props.layer.maybeUpdateSettings({ dateOrInterval: selected });
     }
 
+    function handleResolutionChange(e: React.ChangeEvent<HTMLInputElement>) {
+        props.layer.maybeUpdateSettings({ resolution: parseFloat(e.target.value) });
+    }
+
     function handleColorScaleChange(newColorScale: ColorScale, areBoundariesUserDefined: boolean) {
         props.layer.setColorScale(newColorScale);
         props.layer.setUseCustomColorScaleBoundaries(areBoundariesUserDefined);
@@ -269,6 +274,19 @@ export const SeismicLayerSettingsComponent: React.FC<SeismicLayerSettingsProps>
                     </PendingWrapper>
                 </div>
             </div>
+            <div className="table-row">
+                <div className="table-cell align-middle">Sample resolution</div>
+                <div className="table-cell">
+                    <Input
+                        value={settings.resolution}
+                        onChange={handleResolutionChange}
+                        debounceTimeMs={600}
+                        endAdornment="m"
+                        type="number"
+                        min={1}
+                    />
+                </div>
+            </div>
             <div className="table-row">
                 <div className="table-cell align-top">Color scale</div>
                 <div className="table-cell">

diff --git a/frontend/src/modules/Intersection/settings/components/layerSettings/surfaceLayer.tsx b/frontend/src/modules/Intersection/settings/components/layerSettings/surfaceLayer.tsx
@@ -190,7 +190,7 @@ export const SurfaceLayerSettingsComponent: React.FC<SurfaceLayerSettingsCompone
                 </div>
             </div>
             <div className="table-row">
-                <div className="table-cell align-middle">Resolution</div>
+                <div className="table-cell align-middle">Sample resolution</div>
                 <div className="table-cell">
                     <Input
                         value={settings.resolution}

diff --git a/frontend/src/modules/Intersection/settings/components/layers.tsx b/frontend/src/modules/Intersection/settings/components/layers.tsx
@@ -37,6 +37,7 @@ import {
     Error,
     ExpandLess,
     ExpandMore,
+    HourglassEmpty,
     Settings,
     Visibility,
     VisibilityOff,
@@ -426,13 +427,6 @@ function LayerItem(props: LayerItemProps): React.ReactNode {
                 </div>
             );
         }
-        if (status === LayerStatus.IDLE) {
-            return (
-                <div title="Loading">
-                    <CircularProgress size="extra-small" />
-                </div>
-            );
-        }
         if (status === LayerStatus.ERROR) {
             return (
                 <div title="Error while loading">

diff --git a/frontend/src/modules/Intersection/utils/layers/GridLayer.ts b/frontend/src/modules/Intersection/utils/layers/GridLayer.ts
@@ -77,7 +77,7 @@ export class GridLayer extends BaseLayer<GridLayerSettings, AdjustedPolylineInte
         this._colorScalesParameterMap.set(this._settings.parameterName ?? "", colorScale);
     }
 
-    makeBoundingBox(): void {
+    private makeBoundingBox(): void {
         if (!this._data || !this._settings.extensionLength) {
             return;
         }