othmane/ohif-viewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1825 from OHIF/feat/ohif-195

Browse Source 
OHIF-195: Update "More Menu" toolbar icons to use previous versions
This commit is contained in:
Danny Brown 2020-06-26 16:43:45 -04:00 committed by GitHub
commit baf6093fca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 134 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modes/example/src/toolbarButtons.js
View File

@ -72,7 +72,7 @@ export default [
id: 'ResetView',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-reset',
label: 'Reset View',
commandName: 'resetViewport',
type: 'primary',
@ -82,7 +82,7 @@ export default [
id: 'RotateClockwise',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-rotate-right',
label: 'Rotate Right',
commandName: 'rotateViewportCW',
type: 'primary',
@ -92,7 +92,7 @@ export default [
id: 'FlipHorizontally',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-ellipse-h',
label: 'Flip Horizontally',
commandName: 'flipViewportHorizontal',
type: 'primary',
@ -106,7 +106,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-bars',
label: 'Stack Scroll',
commandName: 'setToolActive',
commandOptions: { toolName: 'StackScroll' },
@ -121,7 +121,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-circle',
label: 'Magnify',
commandName: 'setToolActive',
commandOptions: { toolName: 'Magnify' },
@ -132,7 +132,7 @@ export default [
id: 'Invert',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-invert',
label: 'Invert',
commandName: 'invertViewport',
type: 'primary',
@ -143,7 +143,7 @@ export default [
id: 'Cine',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-youtube',
label: 'Cine',
commandName: '',
type: 'primary',
@ -158,7 +158,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-angle-left',
label: 'Angle',
commandName: 'setToolActive',
commandOptions: { toolName: 'Angle' },
@ -173,7 +173,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-dot-circle',
label: 'Probe',
commandName: 'setToolActive',
commandOptions: { toolName: 'Probe' },
@ -188,7 +188,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-circle-o',
label: 'Rectangle',
commandName: 'setToolActive',
commandOptions: { toolName: 'RectangleRoi' },

20
modes/longitudinal/src/toolbarButtons.js
View File

@ -120,7 +120,7 @@ export default [
id: 'ResetView',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-reset',
label: 'Reset View',
commandName: 'resetViewport',
type: 'primary',
@ -130,7 +130,7 @@ export default [
id: 'RotateClockwise',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-rotate-right',
label: 'Rotate Right',
commandName: 'rotateViewportCW',
type: 'primary',
@ -140,7 +140,7 @@ export default [
id: 'FlipHorizontally',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-ellipse-h',
label: 'Flip Horizontally',
commandName: 'flipViewportHorizontal',
type: 'primary',
@ -154,7 +154,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-bars',
label: 'Stack Scroll',
commandName: 'setToolActive',
commandOptions: { toolName: 'StackScroll' },
@ -169,7 +169,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-circle',
label: 'Magnify',
commandName: 'setToolActive',
commandOptions: { toolName: 'Magnify' },
@ -180,7 +180,7 @@ export default [
id: 'Invert',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-invert',
label: 'Invert',
commandName: 'invertViewport',
type: 'primary',
@ -191,7 +191,7 @@ export default [
id: 'Cine',
type: 'ohif.action',
props: {
icon: 'tool-capture',
icon: 'old-youtube',
label: 'Cine',
commandName: '',
type: 'primary',
@ -206,7 +206,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-angle-left',
label: 'Angle',
commandName: 'setToolActive',
commandOptions: { toolName: 'Angle' },
@ -221,7 +221,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-dot-circle',
label: 'Probe',
commandName: 'setToolActive',
commandOptions: { toolName: 'Probe' },
@ -236,7 +236,7 @@ export default [
},
props: {
isActive: false,
icon: 'tool-move',
icon: 'old-circle-o',
label: 'Rectangle',
commandName: 'setToolActive',
commandOptions: { toolName: 'RectangleRoi' },

9
platform/ui/src/assets/icons/old-angle-left.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 256 512"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Angle Left</title>
<path d="M31.7 239l136-136c9.4-9.4 24.6-9.4 33.9 0l22.6 22.6c9.4 9.4 9.4 24.6 0 33.9L127.9 256l96.4 96.4c9.4 9.4 9.4 24.6 0 33.9L201.7 409c-9.4 9.4-24.6 9.4-33.9 0l-136-136c-9.5-9.4-9.5-24.6-.1-34z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 365 B

9
platform/ui/src/assets/icons/old-bars.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 1792 1792"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Bars</title>
<path d="M1664 1344v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45zm0-512v128q0 26-19 45t-45 19h-1408q-26 0-45-19t-19-45v-128q0-26 19-45t45-19h1408q26 0 45 19t19 45z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 472 B

9
platform/ui/src/assets/icons/old-circle-o.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 448 512"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Square Outline</title>
<path d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48zm-6 400H54c-3.3 0-6-2.7-6-6V86c0-3.3 2.7-6 6-6h340c3.3 0 6 2.7 6 6v340c0 3.3-2.7 6-6 6z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 374 B

9
platform/ui/src/assets/icons/old-circle.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Circle</title>
<path d="M256 8C119 8 8 119 8 256s111 248 248 248 248-111 248-248S393 8 256 8z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 243 B

9
platform/ui/src/assets/icons/old-dot-circle.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 512 512"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Dot Circle</title>
<path d="M256 56c110.532 0 200 89.451 200 200 0 110.532-89.451 200-200 200-110.532 0-200-89.451-200-200 0-110.532 89.451-200 200-200m0-48C119.033 8 8 119.033 8 256s111.033 248 248 248 248-111.033 248-248S392.967 8 256 8zm0 168c-44.183 0-80 35.817-80 80s35.817 80 80 80 80-35.817 80-80-35.817-80-80-80z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 469 B

9
platform/ui/src/assets/icons/old-ellipse-h.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 22 28"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Ellipse Horizontal</title>
<path d="M6 11.5v3c0 0.828-0.672 1.5-1.5 1.5h-3c-0.828 0-1.5-0.672-1.5-1.5v-3c0-0.828 0.672-1.5 1.5-1.5h3c0.828 0 1.5 0.672 1.5 1.5zM14 11.5v3c0 0.828-0.672 1.5-1.5 1.5h-3c-0.828 0-1.5-0.672-1.5-1.5v-3c0-0.828 0.672-1.5 1.5-1.5h3c0.828 0 1.5 0.672 1.5 1.5zM22 11.5v3c0 0.828-0.672 1.5-1.5 1.5h-3c-0.828 0-1.5-0.672-1.5-1.5v-3c0-0.828 0.672-1.5 1.5-1.5h3c0.828 0 1.5 0.672 1.5 1.5z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 555 B

9
platform/ui/src/assets/icons/old-invert.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 28"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Adjust</title>
<path d="M12 22.5v-17c-4.688 0-8.5 3.813-8.5 8.5s3.813 8.5 8.5 8.5zM24 14c0 6.625-5.375 12-12 12s-12-5.375-12-12 5.375-12 12-12 12 5.375 12 12z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 306 B

9
platform/ui/src/assets/icons/old-reset.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 28"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Reset</title>
<path d="M24 14c0 6.609-5.391 12-12 12-3.578 0-6.953-1.578-9.234-4.328-0.156-0.203-0.141-0.5 0.031-0.672l2.141-2.156c0.109-0.094 0.25-0.141 0.391-0.141 0.141 0.016 0.281 0.078 0.359 0.187 1.531 1.984 3.828 3.109 6.312 3.109 4.406 0 8-3.594 8-8s-3.594-8-8-8c-2.047 0-3.984 0.781-5.437 2.141l2.141 2.156c0.297 0.281 0.375 0.719 0.219 1.078-0.156 0.375-0.516 0.625-0.922 0.625h-7c-0.547 0-1-0.453-1-1v-7c0-0.406 0.25-0.766 0.625-0.922 0.359-0.156 0.797-0.078 1.078 0.219l2.031 2.016c2.203-2.078 5.187-3.313 8.266-3.313 6.609 0 12 5.391 12 12z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 701 B

9
platform/ui/src/assets/icons/old-rotate-right.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 24 24"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">Rotate Right</title>
<path d="M16.875 15.469c0.563-0.75 0.891-1.594 1.031-2.484h2.016c-0.188 1.406-0.703 2.719-1.594 3.891zM12.984 17.906c0.891-0.141 1.734-0.469 2.484-1.031l1.453 1.453c-1.172 0.891-2.531 1.406-3.938 1.594v-2.016zM19.922 11.016h-2.016c-0.141-0.891-0.469-1.734-1.031-2.484l1.453-1.406c0.891 1.172 1.406 2.484 1.594 3.891zM15.563 5.531l-4.547 4.453v-3.891c-2.859 0.469-5.016 2.953-5.016 5.906s2.156 5.438 5.016 5.906v2.016c-3.938-0.469-7.031-3.844-7.031-7.922s3.094-7.453 7.031-7.922v-3.094z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 654 B

9
platform/ui/src/assets/icons/old-youtube.svg Normal file
View File

@ -0,0 +1,9 @@
<svg
xmlns="http://www.w3.org/2000/svg"
viewBox="0 0 28 28"
aria-labelledby="title"
fill="currentColor"
>
<title id="title">YouTube Logo</title>
<path d="M11.109 17.625l7.562-3.906-7.562-3.953v7.859zM14 4.156c5.891 0 9.797 0.281 9.797 0.281 0.547 0.063 1.75 0.063 2.812 1.188 0 0 0.859 0.844 1.109 2.781 0.297 2.266 0.281 4.531 0.281 4.531v2.125s0.016 2.266-0.281 4.531c-0.25 1.922-1.109 2.781-1.109 2.781-1.062 1.109-2.266 1.109-2.812 1.172 0 0-3.906 0.297-9.797 0.297v0c-7.281-0.063-9.516-0.281-9.516-0.281-0.625-0.109-2.031-0.078-3.094-1.188 0 0-0.859-0.859-1.109-2.781-0.297-2.266-0.281-4.531-0.281-4.531v-2.125s-0.016-2.266 0.281-4.531c0.25-1.937 1.109-2.781 1.109-2.781 1.062-1.125 2.266-1.125 2.812-1.188 0 0 3.906-0.281 9.797-0.281v0z" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 766 B

24
platform/ui/src/components/Icon/getIcon.jsx
View File

@ -46,6 +46,18 @@ import toolBidirectional from './../../assets/icons/tool-bidirectional.svg';
import toolElipse from './../../assets/icons/tool-elipse.svg';
import toolLength from './../../assets/icons/tool-length.svg';
/** Old OHIF */
import oldBars from './../../assets/icons/old-bars.svg';
import oldCircle from './../../assets/icons/old-circle.svg';
import oldEllipseH from './../../assets/icons/old-ellipse-h.svg';
import oldInvert from './../../assets/icons/old-invert.svg';
import oldRotateRight from './../../assets/icons/old-rotate-right.svg';
import oldYoutube from './../../assets/icons/old-youtube.svg';
import oldDotCircle from './../../assets/icons/old-dot-circle.svg';
import oldAngleLeft from './../../assets/icons/old-angle-left.svg';
import oldReset from './../../assets/icons/old-reset.svg';
import oldCircleO from './../../assets/icons/old-circle-o.svg';
const ICONS = {
'arrow-down': arrowDown,
calendar: calendar,
@ -91,6 +103,18 @@ const ICONS = {
'tool-bidirectional': toolBidirectional,
'tool-elipse': toolElipse,
'tool-length': toolLength,
/** Old OHIF */
'old-bars': oldBars,
'old-circle': oldCircle,
'old-ellipse-h': oldEllipseH,
'old-invert': oldInvert,
'old-rotate-right': oldRotateRight,
'old-youtube': oldYoutube,
'old-dot-circle': oldDotCircle,
'old-angle-left': oldAngleLeft,
'old-reset': oldReset,
'old-circle-o': oldCircleO
};
/**