Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into mweigl/scattervis-…
Browse files Browse the repository at this point in the history 
…regression
  • Loading branch information
@dvmartinweigl
dvmartinweigl committed Apr 30, 2024
2 parents 11eae82 + c949f8c commit 23a8390
Show file tree
Hide file tree
Showing 10 changed files with 1,962 additions and 4,415 deletions.
18 changes: 9 additions & 9 deletions package.json
View file
@@ -1,7 +1,7 @@
{
"name": "visyn_core",
"description": "Core repository for datavisyn applications.",
"version": "10.0.1-SNAPSHOT",
"version": "10.0.2-SNAPSHOT",
"author": {
"name": "datavisyn GmbH",
"email": "contact@datavisyn.io",
Expand Down Expand Up @@ -83,15 +83,15 @@
"@fortawesome/free-solid-svg-icons": "^6.1.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@mantine/code-highlight": "~7.6.1",
"@mantine/core": "~7.6.1",
"@mantine/dates": "~7.6.1",
"@mantine/dropzone": "~7.6.1",
"@mantine/form": "~7.6.1",
"@mantine/hooks": "~7.6.1",
"@mantine/modals": "~7.6.1",
"@mantine/notifications": "~7.6.1",
"@mantine/core": "~7.8.1",
"@mantine/dates": "~7.8.1",
"@mantine/dropzone": "~7.8.1",
"@mantine/form": "~7.8.1",
"@mantine/hooks": "~7.8.1",
"@mantine/modals": "~7.8.1",
"@mantine/notifications": "~7.8.1",
"@mantine/styles": "~6.0.21",
"@mantine/tiptap": "~7.6.1",
"@mantine/tiptap": "~7.8.1",
"@mantine6/core": "npm:@mantine/core@~6.0.21",
"@types/d3-hexbin": "^0.2.3",
"@types/d3v7": "npm:@types/d3@^7.4.0",
Expand Down
2 changes: 1 addition & 1 deletion requirements_extras_rdkit.txt
View file
@@ -1 +1 @@
rdkit==2023.3.2
rdkit==2023.9.6
36 changes: 36 additions & 0 deletions src/icons/Icons.tsx
View file
Expand Up @@ -135,3 +135,39 @@ export const dvNumericCol: IconDefinition = {
M369.834 303.914L342.77 341.073C353.639 351.068 365.921 358.782 379.616 364.215C393.311 369.647 408.745 372.364 425.918 372.364C441.352 372.364 455.59 369.647 468.633 364.215C481.676 358.565 492.11 350.199 499.935 339.117C507.978 328.035 512 314.453 512 298.373C512 283.597 508.413 271.32 501.24 261.541C494.066 251.545 484.175 244.049 471.567 239.051C464.495 236.074 456.856 233.947 448.65 232.669L503.848 177.772V143.548H351.574V189.181H440.178L389.398 241.332V269.364H418.418C428.2 269.364 436.135 270.668 442.221 273.275C448.308 275.883 452.764 279.36 455.59 283.706C458.633 288.052 460.155 292.941 460.155 298.373C460.155 307.5 456.46 314.562 449.069 319.56C441.678 324.341 431.896 326.731 419.722 326.731C409.723 326.731 400.593 324.775 392.333 320.864C384.072 316.735 376.573 311.085 369.834 303.914Z `,
],
};

export const dvSortAsc: IconDefinition = {
prefix: 'dv' as IconPrefix,
iconName: 'sortAsc' as IconName,
icon: [
512,
512,
[],
null,
'M250.622 110.314C261.557 121.248 261.557 138.977 250.622 149.912C239.688 160.846 221.959 160.846 211.024 149.912L157.421 96.308V443.711C157.421 459.175 144.886 471.711 129.421 471.711C113.957 471.711 101.421 459.175 101.421 443.711V96.2895L47.7988 149.912C36.8643 160.846 19.1357 160.846 8.20117 149.912C-2.7334 138.977 -2.7334 121.248 8.20117 110.314L105.577 12.9375C106.61 11.3647 107.818 9.87315 109.201 8.49028C114.773 2.91771 122.111 0.185044 129.414 0.292283C136.716 0.186143 144.051 2.91881 149.622 8.49034C151.005 9.87322 152.213 11.3647 153.246 12.9374L250.622 110.314ZM482 451C498.568 451 512 437.569 512 421C512 404.431 498.568 391 482 391H222C205.432 391 192 404.431 192 421C192 437.569 205.432 451 222 451H482ZM482 265.586C498.568 265.586 512 252.154 512 235.585C512 219.017 498.568 205.585 482 205.585H222C205.432 205.585 192 219.017 192 235.585C192 252.154 205.432 265.586 222 265.586H482ZM482 81C498.568 81 512 67.5685 512 51C512 34.4314 498.568 21 482 21H282C265.432 21 252 34.4314 252 51C252 67.5685 265.432 81 282 81H482Z',
],
};

export const dvSortDesc: IconDefinition = {
prefix: 'dv' as IconPrefix,
iconName: 'sortDesc' as IconName,
icon: [
512,
512,
[],
null,
'M157.421 28.2893C157.421 12.8253 144.885 0.289307 129.421 0.289307C113.957 0.289307 101.421 12.8253 101.421 28.2893V375.711L47.7988 322.088C36.8641 311.154 19.1355 311.154 8.20087 322.088C-2.73383 333.023 -2.73383 350.752 8.20087 361.686L105.576 459.062C106.61 460.635 107.818 462.127 109.201 463.51C114.773 469.082 122.111 471.815 129.414 471.708C136.715 471.814 144.051 469.081 149.622 463.51C151.005 462.127 152.213 460.635 153.246 459.062L250.622 361.686C261.557 350.752 261.557 333.023 250.622 322.088C239.688 311.154 221.959 311.154 211.024 322.088L157.421 375.691V28.2893ZM482 21C498.569 21 512 34.4315 512 51C512 67.5685 498.569 81 482 81H222C205.431 81 192 67.5685 192 51C192 34.4315 205.431 21 222 21H482ZM482 206.415C498.569 206.415 512 219.846 512 236.414C512 252.983 498.569 266.414 482 266.414H222C205.431 266.414 192 252.983 192 236.414C192 219.846 205.431 206.415 222 206.415H482ZM482 391C498.569 391 512 404.431 512 421C512 437.569 498.569 451 482 451H282C265.431 451 252 437.569 252 421C252 404.431 265.431 391 282 391H482Z',
],
};

export const dvSort: IconDefinition = {
prefix: 'dv' as IconPrefix,
iconName: 'sort' as IconName,
icon: [
512,
512,
[],
null,
'M8.20093 110.314C-2.73364 121.248 -2.73364 138.977 8.20093 149.912C19.1355 160.846 36.864 160.846 47.7986 149.912L101.402 96.308V443.711C101.402 459.175 113.938 471.711 129.402 471.711C144.866 471.711 157.402 459.175 157.402 443.711V96.2896L211.024 149.912C221.959 160.846 239.687 160.846 250.622 149.912C261.556 138.977 261.556 121.248 250.622 110.314L153.246 12.9376C152.213 11.3649 151.005 9.87317 149.622 8.49023C144.05 2.91797 136.713 0.185425 129.41 0.292358C122.108 0.185913 114.772 2.91858 109.201 8.49036C107.818 9.87317 106.61 11.3646 105.577 12.9373L8.20093 110.314ZM354.579 375.692V28.2893C354.579 12.8253 367.114 0.289307 382.579 0.289307C398.043 0.289307 410.579 12.8253 410.579 28.2893V375.71L464.201 322.088C475.135 311.154 492.864 311.154 503.799 322.088C514.733 333.023 514.733 350.752 503.799 361.686L406.423 459.062C405.389 460.635 404.181 462.127 402.799 463.51C397.226 469.082 389.889 471.815 382.587 471.708C375.285 471.814 367.949 469.081 362.378 463.51C360.995 462.127 359.787 460.635 358.754 459.063L261.378 361.686C250.443 350.752 250.443 333.023 261.378 322.088C272.312 311.154 290.041 311.154 300.975 322.088L354.579 375.692Z',
],
};
37 changes: 37 additions & 0 deletions src/scss/vendors/_lineup.scss
View file
Expand Up @@ -23,4 +23,41 @@ $lu_include_font_awesome: false !default;
// the LineUp zoom buttons are still working as they are using percentages (e.g., `font-size: 100%`)
// which works relative to the font size defined here.
font-size: 13.4px;
}

// override lineup sort icons
// sort neutral
.lu-action-sort::before {
background-color: currentColor;
content: '11' !important; /* This is necessary for the icons to have the same size */
-webkit-mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M8.20093 110.314C-2.73364 121.248 -2.73364 138.977 8.20093 149.912C19.1355 160.846 36.864 160.846 47.7986 149.912L101.402 96.308V443.711C101.402 459.175 113.938 471.711 129.402 471.711C144.866 471.711 157.402 459.175 157.402 443.711V96.2896L211.024 149.912C221.959 160.846 239.687 160.846 250.622 149.912C261.556 138.977 261.556 121.248 250.622 110.314L153.246 12.9376C152.213 11.3649 151.005 9.87317 149.622 8.49023C144.05 2.91797 136.713 0.185425 129.41 0.292358C122.108 0.185913 114.772 2.91858 109.201 8.49036C107.818 9.87317 106.61 11.3646 105.577 12.9373L8.20093 110.314ZM354.579 375.692V28.2893C354.579 12.8253 367.114 0.289307 382.579 0.289307C398.043 0.289307 410.579 12.8253 410.579 28.2893V375.71L464.201 322.088C475.135 311.154 492.864 311.154 503.799 322.088C514.733 333.023 514.733 350.752 503.799 361.686L406.423 459.062C405.389 460.635 404.181 462.127 402.799 463.51C397.226 469.082 389.889 471.815 382.587 471.708C375.285 471.814 367.949 469.081 362.378 463.51C360.995 462.127 359.787 460.635 358.754 459.063L261.378 361.686C250.443 350.752 250.443 333.023 261.378 322.088C272.312 311.154 290.041 311.154 300.975 322.088L354.579 375.692Z' /%3E%3C/svg%3E");
mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M8.20093 110.314C-2.73364 121.248 -2.73364 138.977 8.20093 149.912C19.1355 160.846 36.864 160.846 47.7986 149.912L101.402 96.308V443.711C101.402 459.175 113.938 471.711 129.402 471.711C144.866 471.711 157.402 459.175 157.402 443.711V96.2896L211.024 149.912C221.959 160.846 239.687 160.846 250.622 149.912C261.556 138.977 261.556 121.248 250.622 110.314L153.246 12.9376C152.213 11.3649 151.005 9.87317 149.622 8.49023C144.05 2.91797 136.713 0.185425 129.41 0.292358C122.108 0.185913 114.772 2.91858 109.201 8.49036C107.818 9.87317 106.61 11.3646 105.577 12.9373L8.20093 110.314ZM354.579 375.692V28.2893C354.579 12.8253 367.114 0.289307 382.579 0.289307C398.043 0.289307 410.579 12.8253 410.579 28.2893V375.71L464.201 322.088C475.135 311.154 492.864 311.154 503.799 322.088C514.733 333.023 514.733 350.752 503.799 361.686L406.423 459.062C405.389 460.635 404.181 462.127 402.799 463.51C397.226 469.082 389.889 471.815 382.587 471.708C375.285 471.814 367.949 469.081 362.378 463.51C360.995 462.127 359.787 460.635 358.754 459.063L261.378 361.686C250.443 350.752 250.443 333.023 261.378 322.088C272.312 311.154 290.041 311.154 300.975 322.088L354.579 375.692Z' /%3E%3C/svg%3E");
mask-size: contain;
mask-position: center;
mask-repeat: no-repeat;
font-size: inherit;
}

// sort asc
.lu-action-sort[data-sort='asc']::before {
background-color: currentColor;
content: '11' !important; /* This is necessary for the icons to have the same size */
-webkit-mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M250.622 110.314C261.557 121.248 261.557 138.977 250.622 149.912C239.688 160.846 221.959 160.846 211.024 149.912L157.421 96.308V443.711C157.421 459.175 144.886 471.711 129.421 471.711C113.957 471.711 101.421 459.175 101.421 443.711V96.2895L47.7988 149.912C36.8643 160.846 19.1357 160.846 8.20117 149.912C-2.7334 138.977 -2.7334 121.248 8.20117 110.314L105.577 12.9375C106.61 11.3647 107.818 9.87315 109.201 8.49028C114.773 2.91771 122.111 0.185044 129.414 0.292283C136.716 0.186143 144.051 2.91881 149.622 8.49034C151.005 9.87322 152.213 11.3647 153.246 12.9374L250.622 110.314ZM482 451C498.568 451 512 437.569 512 421C512 404.431 498.568 391 482 391H222C205.432 391 192 404.431 192 421C192 437.569 205.432 451 222 451H482ZM482 265.586C498.568 265.586 512 252.154 512 235.585C512 219.017 498.568 205.585 482 205.585H222C205.432 205.585 192 219.017 192 235.585C192 252.154 205.432 265.586 222 265.586H482ZM482 81C498.568 81 512 67.5685 512 51C512 34.4314 498.568 21 482 21H282C265.432 21 252 34.4314 252 51C252 67.5685 265.432 81 282 81H482Z' /%3E%3C/svg%3E");
mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M250.622 110.314C261.557 121.248 261.557 138.977 250.622 149.912C239.688 160.846 221.959 160.846 211.024 149.912L157.421 96.308V443.711C157.421 459.175 144.886 471.711 129.421 471.711C113.957 471.711 101.421 459.175 101.421 443.711V96.2895L47.7988 149.912C36.8643 160.846 19.1357 160.846 8.20117 149.912C-2.7334 138.977 -2.7334 121.248 8.20117 110.314L105.577 12.9375C106.61 11.3647 107.818 9.87315 109.201 8.49028C114.773 2.91771 122.111 0.185044 129.414 0.292283C136.716 0.186143 144.051 2.91881 149.622 8.49034C151.005 9.87322 152.213 11.3647 153.246 12.9374L250.622 110.314ZM482 451C498.568 451 512 437.569 512 421C512 404.431 498.568 391 482 391H222C205.432 391 192 404.431 192 421C192 437.569 205.432 451 222 451H482ZM482 265.586C498.568 265.586 512 252.154 512 235.585C512 219.017 498.568 205.585 482 205.585H222C205.432 205.585 192 219.017 192 235.585C192 252.154 205.432 265.586 222 265.586H482ZM482 81C498.568 81 512 67.5685 512 51C512 34.4314 498.568 21 482 21H282C265.432 21 252 34.4314 252 51C252 67.5685 265.432 81 282 81H482Z' /%3E%3C/svg%3E");
mask-size: contain;
mask-position: center;
mask-repeat: no-repeat;
font-size: inherit;
}

// sort desc
.lu-action-sort[data-sort='desc']::before {
background-color: currentColor;
content: '11' !important; /* This is necessary for the icons to have the same size */
-webkit-mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M157.421 28.2893C157.421 12.8253 144.885 0.289307 129.421 0.289307C113.957 0.289307 101.421 12.8253 101.421 28.2893V375.711L47.7988 322.088C36.8641 311.154 19.1355 311.154 8.20087 322.088C-2.73383 333.023 -2.73383 350.752 8.20087 361.686L105.576 459.062C106.61 460.635 107.818 462.127 109.201 463.51C114.773 469.082 122.111 471.815 129.414 471.708C136.715 471.814 144.051 469.081 149.622 463.51C151.005 462.127 152.213 460.635 153.246 459.062L250.622 361.686C261.557 350.752 261.557 333.023 250.622 322.088C239.688 311.154 221.959 311.154 211.024 322.088L157.421 375.691V28.2893ZM482 21C498.569 21 512 34.4315 512 51C512 67.5685 498.569 81 482 81H222C205.431 81 192 67.5685 192 51C192 34.4315 205.431 21 222 21H482ZM482 206.415C498.569 206.415 512 219.846 512 236.414C512 252.983 498.569 266.414 482 266.414H222C205.431 266.414 192 252.983 192 236.414C192 219.846 205.431 206.415 222 206.415H482ZM482 391C498.569 391 512 404.431 512 421C512 437.569 498.569 451 482 451H282C265.431 451 252 437.569 252 421C252 404.431 265.431 391 282 391H482Z' /%3E%3C/svg%3E");
mask-image: url("data:image/svg+xml,%3Csvg width='512' height='472' fill='inherit' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M157.421 28.2893C157.421 12.8253 144.885 0.289307 129.421 0.289307C113.957 0.289307 101.421 12.8253 101.421 28.2893V375.711L47.7988 322.088C36.8641 311.154 19.1355 311.154 8.20087 322.088C-2.73383 333.023 -2.73383 350.752 8.20087 361.686L105.576 459.062C106.61 460.635 107.818 462.127 109.201 463.51C114.773 469.082 122.111 471.815 129.414 471.708C136.715 471.814 144.051 469.081 149.622 463.51C151.005 462.127 152.213 460.635 153.246 459.062L250.622 361.686C261.557 350.752 261.557 333.023 250.622 322.088C239.688 311.154 221.959 311.154 211.024 322.088L157.421 375.691V28.2893ZM482 21C498.569 21 512 34.4315 512 51C512 67.5685 498.569 81 482 81H222C205.431 81 192 67.5685 192 51C192 34.4315 205.431 21 222 21H482ZM482 206.415C498.569 206.415 512 219.846 512 236.414C512 252.983 498.569 266.414 482 266.414H222C205.431 266.414 192 252.983 192 236.414C192 219.846 205.431 206.415 222 206.415H482ZM482 391C498.569 391 512 404.431 512 421C512 437.569 498.569 451 482 451H282C265.431 451 252 437.569 252 421C252 404.431 265.431 391 282 391H482Z' /%3E%3C/svg%3E");
mask-size: contain;
mask-position: center;
mask-repeat: no-repeat;
font-size: inherit;
}
114 changes: 57 additions & 57 deletions visyn_core/tests/rdkit/maximum_common_substructure.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 23a8390

Please sign in to comment.