Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: "Incorrect 2D axes rendering with vertical scaling #1957" #1971

Merged
merged 9 commits into from
Mar 21, 2024
Merged

fix: "Incorrect 2D axes rendering with vertical scaling #1957" #1971

merged 9 commits into from
Mar 21, 2024

Conversation

nilscb
Copy link
Collaborator

@nilscb nilscb commented Mar 18, 2024

Axes2DLayer now works with vertical scaling
-also some refactoring of this layer.

@nilscb nilscb self-assigned this Mar 18, 2024
@nilscb nilscb linked an issue Mar 18, 2024 that may be closed by this pull request
Incorrect 2D axes rendering with vertical scaling #1957
Closed
@nilscb nilscb added bug Something isn't working AspenTech Task owned by AspenTech map-component Issues related to the map component. labels Mar 18, 2024
@nilscb nilscb requested review from hkfb and w1nklr March 18, 2024 16:48
w1nklr
w1nklr reviewed Mar 19, 2024
View reviewed changes
typescript/packages/subsurface-viewer/src/layers/axes2d/label-vertex.glsl.js Outdated
@@ -1,20 +1,18 @@
export default `\
#version 300 es
#define SHADER_NAME graph-layer-axis-vertex-shader
#define SHADER_NAME axes2d-layer-vertex-shader //graph-layer-axis-vertex-shader
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove comment ?

typescript/packages/subsurface-viewer/src/layers/axes2d/label-fragment.glsl.js Outdated
@@ -1,6 +1,6 @@
export default `\
#version 300 es
#define SHADER_NAME graph-layer-fragment-shader
#define SHADER_NAME graph-layer-fragment-shader
Copy link
Collaborator

@w1nklr w1nklr Mar 19, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you rename the vertex shader, please update this one accordingly...

@nilscb nilscb requested a review from w1nklr March 19, 2024 09:36
w1nklr pushed a commit to w1nklr/webviz-subsurface-components that referenced this pull request Mar 20, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
2055f6e 
## [0.5.8](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.5.8) (2024-03-12)

### Bug Fixes

* bump ajv from 7.2.1 to 8.12.0 in /typescript ([equinor#1947](equinor#1947)) ([af95651](equinor@af95651)), closes [equinor#2190](equinor#2190) [equinor#2191](equinor#2191) [equinor#2158](equinor#2158) [equinor#2194](equinor#2194) [equinor#2192](equinor#2192) [ajv-validator/ajv#1840](ajv-validator/ajv#1840) [equinor#1840](equinor#1840) [equinor#1901](equinor#1901) [equinor#1922](equinor#1922) [equinor#1862](equinor#1862) [equinor#1861](equinor#1861) [equinor#1815](equinor#1815) [ajv-validator/ajv-keywords#220](ajv-validator/ajv-keywords#220) [equinor#1819](equinor#1819) [equinor#1725](equinor#1725) [equinor#1757](equinor#1757) [equinor#2195](equinor#2195) [equinor#1971](equinor#1971) [equinor#2194](equinor#2194) [equinor#2184](equinor#2184) [equinor#2193](equinor#2193) [equinor#2183](equinor#2183) [equinor#2158](equinor#2158) [equinor#2160](equinor#2160) [equinor#1935](equinor#1935) [equinor#2192](equinor#2192) [equinor#1949](equinor#1949) [equinor#2191](equinor#2191)
w1nklr pushed a commit to w1nklr/webviz-subsurface-components that referenced this pull request Mar 20, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
da74de5 
## [1.2.8](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@1.2.8) (2024-03-12)

### Bug Fixes

* bump ajv from 7.2.1 to 8.12.0 in /typescript ([equinor#1947](equinor#1947)) ([af95651](equinor@af95651)), closes [equinor#2190](equinor#2190) [equinor#2191](equinor#2191) [equinor#2158](equinor#2158) [equinor#2194](equinor#2194) [equinor#2192](equinor#2192) [ajv-validator/ajv#1840](ajv-validator/ajv#1840) [equinor#1840](equinor#1840) [equinor#1901](equinor#1901) [equinor#1922](equinor#1922) [equinor#1862](equinor#1862) [equinor#1861](equinor#1861) [equinor#1815](equinor#1815) [ajv-validator/ajv-keywords#220](ajv-validator/ajv-keywords#220) [equinor#1819](equinor#1819) [equinor#1725](equinor#1725) [equinor#1757](equinor#1757) [equinor#2195](equinor#2195) [equinor#1971](equinor#1971) [equinor#2194](equinor#2194) [equinor#2184](equinor#2184) [equinor#2193](equinor#2193) [equinor#2183](equinor#2183) [equinor#2158](equinor#2158) [equinor#2160](equinor#2160) [equinor#1935](equinor#1935) [equinor#2192](equinor#2192) [equinor#1949](equinor#1949) [equinor#2191](equinor#2191)
w1nklr pushed a commit to w1nklr/webviz-subsurface-components that referenced this pull request Mar 20, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
c69afd1 
## [0.20.1](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.20.1) (2024-03-12)

### Bug Fixes

* bump ajv from 7.2.1 to 8.12.0 in /typescript ([equinor#1947](equinor#1947)) ([af95651](equinor@af95651)), closes [equinor#2190](equinor#2190) [equinor#2191](equinor#2191) [equinor#2158](equinor#2158) [equinor#2194](equinor#2194) [equinor#2192](equinor#2192) [ajv-validator/ajv#1840](ajv-validator/ajv#1840) [equinor#1840](equinor#1840) [equinor#1901](equinor#1901) [equinor#1922](equinor#1922) [equinor#1862](equinor#1862) [equinor#1861](equinor#1861) [equinor#1815](equinor#1815) [ajv-validator/ajv-keywords#220](ajv-validator/ajv-keywords#220) [equinor#1819](equinor#1819) [equinor#1725](equinor#1725) [equinor#1757](equinor#1757) [equinor#2195](equinor#2195) [equinor#1971](equinor#1971) [equinor#2194](equinor#2194) [equinor#2184](equinor#2184) [equinor#2193](equinor#2193) [equinor#2183](equinor#2183) [equinor#2158](equinor#2158) [equinor#2160](equinor#2160) [equinor#1935](equinor#1935) [equinor#2192](equinor#2192) [equinor#1949](equinor#1949) [equinor#2191](equinor#2191)
w1nklr pushed a commit to w1nklr/webviz-subsurface-components that referenced this pull request Mar 20, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
edfacc2 
## [1.1.8](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@1.1.8) (2024-03-12)

### Bug Fixes

* bump ajv from 7.2.1 to 8.12.0 in /typescript ([equinor#1947](equinor#1947)) ([af95651](equinor@af95651)), closes [equinor#2190](equinor#2190) [equinor#2191](equinor#2191) [equinor#2158](equinor#2158) [equinor#2194](equinor#2194) [equinor#2192](equinor#2192) [ajv-validator/ajv#1840](ajv-validator/ajv#1840) [equinor#1840](equinor#1840) [equinor#1901](equinor#1901) [equinor#1922](equinor#1922) [equinor#1862](equinor#1862) [equinor#1861](equinor#1861) [equinor#1815](equinor#1815) [ajv-validator/ajv-keywords#220](ajv-validator/ajv-keywords#220) [equinor#1819](equinor#1819) [equinor#1725](equinor#1725) [equinor#1757](equinor#1757) [equinor#2195](equinor#2195) [equinor#1971](equinor#1971) [equinor#2194](equinor#2194) [equinor#2184](equinor#2184) [equinor#2193](equinor#2193) [equinor#2183](equinor#2183) [equinor#2158](equinor#2158) [equinor#2160](equinor#2160) [equinor#1935](equinor#1935) [equinor#2192](equinor#2192) [equinor#1949](equinor#1949) [equinor#2191](equinor#2191)
w1nklr pushed a commit to w1nklr/webviz-subsurface-components that referenced this pull request Mar 20, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
13eb48c 
## [1.5.1](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@1.5.1) (2024-03-12)

### Bug Fixes

* bump ajv from 7.2.1 to 8.12.0 in /typescript ([equinor#1947](equinor#1947)) ([af95651](equinor@af95651)), closes [equinor#2190](equinor#2190) [equinor#2191](equinor#2191) [equinor#2158](equinor#2158) [equinor#2194](equinor#2194) [equinor#2192](equinor#2192) [ajv-validator/ajv#1840](ajv-validator/ajv#1840) [equinor#1840](equinor#1840) [equinor#1901](equinor#1901) [equinor#1922](equinor#1922) [equinor#1862](equinor#1862) [equinor#1861](equinor#1861) [equinor#1815](equinor#1815) [ajv-validator/ajv-keywords#220](ajv-validator/ajv-keywords#220) [equinor#1819](equinor#1819) [equinor#1725](equinor#1725) [equinor#1757](equinor#1757) [equinor#2195](equinor#2195) [equinor#1971](equinor#1971) [equinor#2194](equinor#2194) [equinor#2184](equinor#2184) [equinor#2193](equinor#2193) [equinor#2183](equinor#2183) [equinor#2158](equinor#2158) [equinor#2160](equinor#2160) [equinor#1935](equinor#1935) [equinor#2192](equinor#2192) [equinor#1949](equinor#1949) [equinor#2191](equinor#2191)
@nilscb nilscb requested a review from hkfb March 21, 2024 07:45
@nilscb nilscb merged commit 8f24c5e into equinor:master Mar 21, 2024
9 checks passed
hkfb pushed a commit that referenced this pull request Mar 21, 2024
@semantic-release-bot
chore(release): [email protected] [skip ci]
bf9f538 
## [0.20.8](https://github.com/equinor/webviz-subsurface-components/compare/[email protected]@0.20.8) (2024-03-21)

### Bug Fixes

* "Incorrect 2D axes rendering with vertical scaling [#1957](#1957)" ([#1971](#1971)) ([8f24c5e](8f24c5e))
@hkfb
Copy link
Collaborator

hkfb commented Mar 21, 2024

🎉 This issue has been resolved in version [email protected] 🎉

The release is available on GitHub release

@hkfb hkfb added the released label Mar 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hkfb hkfb hkfb approved these changes

@w1nklr w1nklr Awaiting requested review from w1nklr

Assignees

@nilscb nilscb

Labels
AspenTech Task owned by AspenTech bug Something isn't working map-component Issues related to the map component. released
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Incorrect 2D axes rendering with vertical scaling
3 participants
@nilscb @hkfb @w1nklr