Skip to content

Refactor 3DViewer to use layer framework #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 108 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
b7f40ff
wip
rubenthoms Jan 15, 2025
65abe08
wip
rubenthoms Jan 15, 2025
d0700c2
wip
rubenthoms Jan 16, 2025
73990bd
wip
rubenthoms Jan 16, 2025
1230d86
wip
rubenthoms Jan 16, 2025
bce97a8
wip
rubenthoms Jan 16, 2025
bace0d3
wip
rubenthoms Jan 20, 2025
78f7a5e
wip
rubenthoms Jan 20, 2025
d1979fd
wip
rubenthoms Jan 20, 2025
401ed95
wip
rubenthoms Jan 20, 2025
b31ca5c
wip
rubenthoms Jan 21, 2025
2c97b71
wip
rubenthoms Jan 22, 2025
51f022a
wip
rubenthoms Jan 22, 2025
5e6815a
Removed icons
rubenthoms Jan 22, 2025
fdc6cfb
wip
rubenthoms Jan 22, 2025
67d3061
fix
rubenthoms Jan 22, 2025
c401f23
realization surface
HansKallekleiv Jan 23, 2025
770b71e
Add seismic inline/crossline
HansKallekleiv Jan 24, 2025
03012a6
fix seismic settings
HansKallekleiv Jan 24, 2025
a322c03
Add tvdmsl to well picks
HansKallekleiv Jan 24, 2025
953c025
Add seismic depth slice layer
HansKallekleiv Jan 24, 2025
ab4c70d
set inputs as number
HansKallekleiv Jan 25, 2025
32031f4
Use same attribute
HansKallekleiv Jan 27, 2025
ab51194
wip
rubenthoms Jan 28, 2025
eb5f8c6
wip
rubenthoms Jan 28, 2025
1716de4
wip
rubenthoms Jan 29, 2025
1be0610
wip
rubenthoms Jan 29, 2025
f787d2d
wip
rubenthoms Jan 29, 2025
77dcc03
wip
rubenthoms Jan 30, 2025
3e249bd
wip
rubenthoms Jan 31, 2025
342270d
wip
rubenthoms Feb 3, 2025
fa0cc01
wip
rubenthoms Feb 4, 2025
6a51142
wip
rubenthoms Feb 5, 2025
c276404
wip
rubenthoms Feb 6, 2025
1bee518
wip
rubenthoms Feb 6, 2025
51469fc
wip
rubenthoms Feb 6, 2025
3568bf5
wip
rubenthoms Feb 6, 2025
53c37c5
wip
rubenthoms Feb 6, 2025
3dc1a51
wip
rubenthoms Feb 6, 2025
181e3f9
wip
rubenthoms Feb 7, 2025
e3b26df
wip
rubenthoms Feb 10, 2025
9b872f9
wip
rubenthoms Feb 10, 2025
15557a5
wip
rubenthoms Feb 10, 2025
4eee5a3
wip
rubenthoms Feb 10, 2025
f739d12
wip
rubenthoms Feb 10, 2025
88b4a3b
wip
rubenthoms Feb 11, 2025
2d18805
wip
rubenthoms Feb 11, 2025
378f1eb
wip
rubenthoms Feb 11, 2025
4a59c74
wip
rubenthoms Feb 12, 2025
84e3b77
wip
rubenthoms Feb 12, 2025
8ebdb4d
wip
rubenthoms Feb 12, 2025
ccf4407
wip
rubenthoms Feb 13, 2025
9cc9fb5
wip
rubenthoms Feb 13, 2025
4ab54cb
Merge remote-tracking branch 'origin/main' into refactor-3dviewer-to-…
rubenthoms Feb 18, 2025
8ecf52e
wip
rubenthoms Feb 18, 2025
92ba2ee
Merge remote-tracking branch 'origin/main' into refactor-3dviewer-to-…
rubenthoms Feb 19, 2025
316135f
wip
rubenthoms Feb 19, 2025
050b52d
wip
rubenthoms Feb 20, 2025
9ec86b6
wip
rubenthoms Feb 20, 2025
3a2611a
wip
rubenthoms Feb 20, 2025
334cfc3
wip
rubenthoms Feb 21, 2025
114781e
wip
rubenthoms Feb 25, 2025
38d70fa
wip
rubenthoms Feb 25, 2025
31077bf
wip
rubenthoms Feb 25, 2025
3381510
wip
rubenthoms Feb 25, 2025
19b6d0e
wip
rubenthoms Feb 25, 2025
0a5e0da
wip
rubenthoms Feb 26, 2025
d390643
Merge remote-tracking branch 'equinor/main' into refactor-3dviewer-to…
rubenthoms Mar 26, 2025
18e81ff
wip
rubenthoms Mar 26, 2025
0f957ed
wip
rubenthoms Mar 27, 2025
acf24b4
wip
rubenthoms Mar 27, 2025
29c4821
wip
rubenthoms Mar 27, 2025
f6364a4
wip
rubenthoms Mar 27, 2025
76bae97
wip
rubenthoms Mar 28, 2025
8f65729
wip
rubenthoms Mar 31, 2025
9dcb541
wip
rubenthoms May 2, 2025
a685de9
fix: api
rubenthoms May 2, 2025
3b803cc
wip
rubenthoms May 2, 2025
84f1092
wip
rubenthoms May 2, 2025
2cc806e
Adjustments to api types
rubenthoms May 5, 2025
967772f
Minor fixes
rubenthoms May 5, 2025
6c826e0
fixes
rubenthoms May 6, 2025
dcf0e0b
fixes
rubenthoms May 7, 2025
ffbd84d
Immutability
rubenthoms May 7, 2025
ec56a6f
Added attribute dependencies to groups
rubenthoms May 7, 2025
38f4ba3
fix: import order
rubenthoms May 8, 2025
45bceb7
Merge remote-tracking branch 'equinor/main' into dpf-improve-dep-tree
rubenthoms May 8, 2025
69ee7b6
wip
rubenthoms May 8, 2025
6265dd9
wip
rubenthoms May 8, 2025
18acaf9
wip
rubenthoms May 8, 2025
b8e8ac0
wip
rubenthoms May 8, 2025
87fbedf
fix: committed by mistake
rubenthoms May 8, 2025
13e87cc
fix: color legend titles becoming invisible
rubenthoms May 8, 2025
14fd17b
Merge remote-tracking branch 'origin/dpf-improve-dep-tree' into refac…
rubenthoms May 8, 2025
a3f9b84
Fixes related to static settings and rerendering
rubenthoms May 9, 2025
506dfee
Removed immutability for now
rubenthoms May 9, 2025
9e7ff69
Merge branch 'main' into dpf-improve-dep-tree
rubenthoms May 9, 2025
039b1bd
wip
rubenthoms May 9, 2025
1605a0b
Merge branch 'dpf-improve-dep-tree' into refactor-3dviewer-to-layer-f…
rubenthoms May 9, 2025
88ce502
wip
rubenthoms May 9, 2025
e1c4a68
fix: resetting shared settings
rubenthoms May 9, 2025
6d6c405
Merge branch 'dpf-improve-dep-tree' into refactor-3dviewer-to-layer-f…
rubenthoms May 9, 2025
3fba319
Merge remote-tracking branch 'equinor/main' into refactor-3dviewer-to…
rubenthoms May 12, 2025
8332c39
Merge remote-tracking branch 'equinor/main' into refactor-3dviewer-to…
rubenthoms May 12, 2025
ca7a67d
wip
rubenthoms May 12, 2025
198e83a
wip
rubenthoms May 13, 2025
7857ef8
Merge remote-tracking branch 'equinor/main' into refactor-3dviewer-to…
rubenthoms May 13, 2025
bd67340
wip
rubenthoms May 13, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions backend_py/primary/primary/services/vds_access/vds_access.py
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,14 @@ async def get_inline_slice_async(self, line_no: int) -> Tuple[NDArray[np.float32
response = await self._query_async(endpoint, slice_request)

parts = self._extract_and_validate_body_parts_from_response(response)

metadata = VdsSliceMetadata(**json.loads(parts[0].content))
response_metadata = json.loads(parts[0].content)
metadata = VdsSliceMetadata(
format=response_metadata["format"],
shape=response_metadata["shape"],
x_axis=VdsAxis(**response_metadata["x"]),
y_axis=VdsAxis(**response_metadata["y"]),
geospatial=response_metadata["geospatial"],
)
self._assert_valid_metadata_format_and_shape(metadata)

byte_array = parts[1].content
Expand Down Expand Up @@ -254,7 +260,7 @@ async def get_flattened_fence_traces_array_and_metadata_async(

# Convert every value of `hard_coded_fill_value` to np.nan
flattened_fence_traces_float32_array[flattened_fence_traces_float32_array == hard_coded_fill_value] = np.nan

print("flattened fence data", flattened_fence_traces_float32_array, len(flattened_fence_traces_float32_array))
return (flattened_fence_traces_float32_array, num_traces, num_samples_per_trace)

def _extract_and_validate_body_parts_from_response(self, response: httpx.Response) -> Tuple[BodyPart, BodyPart]:
Expand Down
2 changes: 1 addition & 1 deletion frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/webviz-logo.svg" />
<link href="/src/main.css" rel="stylesheet" />
<link href="https://cdn.eds.equinor.com/font/equinor-font.css" rel="stylesheet" />
<link href="https://cdn.eds.equinor.com/font/equinor-font.css" rel="stylesheet" crossorigin="anonymous" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Webviz | FMU results visualization</title>
</head>
Expand Down
2,384 changes: 1,812 additions & 572 deletions frontend/package-lock.json

Large diffs are not rendered by default.

13 changes: 12 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,14 @@
"vite-plugin-node-polyfills is only installed as a workaround for an import issue in the map module. See webviz-subsurface-components issue #2540 for details"
],
"dependencies": {
"@deck.gl/aggregation-layers": "^9.0.33",
"@deck.gl/core": "^9.0.33",
"@deck.gl/extensions": "^9.0.33",
"@deck.gl/geo-layers": "^9.0.33",
"@deck.gl/json": "^9.0.33",
"@deck.gl/layers": "^9.0.33",
"@deck.gl/mesh-layers": "^9.0.33",
"@deck.gl/react": "^9.0.33",
"@equinor/eds-core-react": "^0.45.1",
"@equinor/esv-intersection": "^3.1.2",
"@headlessui/react": "^1.7.8",
Expand Down Expand Up @@ -52,7 +60,8 @@
"simplify-js": "^1.2.4",
"uuid": "^9.0.0",
"vite-plugin-node-polyfills": "^0.23.0",
"wonka": "^6.3.4"
"wonka": "^6.3.4",
"workerpool": "^9.2.0"
},
"devDependencies": {
"@hey-api/openapi-ts": "^0.61.1",
Expand All @@ -67,6 +76,7 @@
"@types/react-dom": "^18.2.7",
"@types/react-plotly.js": "^2.6.0",
"@types/uuid": "^9.0.0",
"@types/workerpool": "^6.4.7",
"@vitejs/plugin-react": "^4.4.1",
"@vitest/coverage-istanbul": "^3.0.7",
"dependency-cruiser": "^14.0.0",
Expand All @@ -85,6 +95,7 @@
"typescript-eslint": "^8.25.0",
"vite": "^6.3.5",
"vite-plugin-checker": "^0.9.0",
"vite-plugin-glsl": "^1.3.1",
"vitest": "^3.0.7"
}
}
33 changes: 33 additions & 0 deletions frontend/src/assets/add_path.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions frontend/src/assets/add_path_point.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions frontend/src/assets/continue_path.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions frontend/src/assets/path.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 41 additions & 0 deletions frontend/src/assets/remove_path.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions frontend/src/assets/remove_path_point.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 additions & 0 deletions frontend/src/assets/set_path_point.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added frontend/src/assets/textures/checkerboard.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading