From f5b78536d216e1789f82748486d4567bf61e4ef3 Mon Sep 17 00:00:00 2001 From: igoroctaviano Date: Fri, 26 Jun 2020 16:49:34 -0300 Subject: [PATCH 1/4] Add old icons --- modes/example/src/toolbarButtons.js | 10 +++++----- modes/longitudinal/src/toolbarButtons.js | 10 +++++----- platform/ui/src/assets/icons/old-bars.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-circle.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-ellipse-h.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-invert.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-rotate-right.svg | 11 +++++++++++ platform/ui/src/components/Icon/getIcon.jsx | 14 ++++++++++++++ 8 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 platform/ui/src/assets/icons/old-bars.svg create mode 100644 platform/ui/src/assets/icons/old-circle.svg create mode 100644 platform/ui/src/assets/icons/old-ellipse-h.svg create mode 100644 platform/ui/src/assets/icons/old-invert.svg create mode 100644 platform/ui/src/assets/icons/old-rotate-right.svg diff --git a/modes/example/src/toolbarButtons.js b/modes/example/src/toolbarButtons.js index 3f4db8160..1863efdfb 100644 --- a/modes/example/src/toolbarButtons.js +++ b/modes/example/src/toolbarButtons.js @@ -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', diff --git a/modes/longitudinal/src/toolbarButtons.js b/modes/longitudinal/src/toolbarButtons.js index 6fc5634ea..eacdb2497 100644 --- a/modes/longitudinal/src/toolbarButtons.js +++ b/modes/longitudinal/src/toolbarButtons.js @@ -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', diff --git a/platform/ui/src/assets/icons/old-bars.svg b/platform/ui/src/assets/icons/old-bars.svg new file mode 100644 index 000000000..3b735f90e --- /dev/null +++ b/platform/ui/src/assets/icons/old-bars.svg @@ -0,0 +1,11 @@ + + Bars + + diff --git a/platform/ui/src/assets/icons/old-circle.svg b/platform/ui/src/assets/icons/old-circle.svg new file mode 100644 index 000000000..99b9995b3 --- /dev/null +++ b/platform/ui/src/assets/icons/old-circle.svg @@ -0,0 +1,11 @@ + + Circle + + diff --git a/platform/ui/src/assets/icons/old-ellipse-h.svg b/platform/ui/src/assets/icons/old-ellipse-h.svg new file mode 100644 index 000000000..1dbb78331 --- /dev/null +++ b/platform/ui/src/assets/icons/old-ellipse-h.svg @@ -0,0 +1,11 @@ + + Ellipse Horizontal + + diff --git a/platform/ui/src/assets/icons/old-invert.svg b/platform/ui/src/assets/icons/old-invert.svg new file mode 100644 index 000000000..ae2747644 --- /dev/null +++ b/platform/ui/src/assets/icons/old-invert.svg @@ -0,0 +1,11 @@ + + Adjust + + diff --git a/platform/ui/src/assets/icons/old-rotate-right.svg b/platform/ui/src/assets/icons/old-rotate-right.svg new file mode 100644 index 000000000..106284fa0 --- /dev/null +++ b/platform/ui/src/assets/icons/old-rotate-right.svg @@ -0,0 +1,11 @@ + + Rotate Right + + diff --git a/platform/ui/src/components/Icon/getIcon.jsx b/platform/ui/src/components/Icon/getIcon.jsx index 8f0a7a534..4328e10ce 100644 --- a/platform/ui/src/components/Icon/getIcon.jsx +++ b/platform/ui/src/components/Icon/getIcon.jsx @@ -46,6 +46,13 @@ 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'; + const ICONS = { 'arrow-down': arrowDown, calendar: calendar, @@ -91,6 +98,13 @@ 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 }; /** From 9bd1ce734cdfddd4db2ced2a1c5134a204cea456 Mon Sep 17 00:00:00 2001 From: igoroctaviano Date: Fri, 26 Jun 2020 16:56:19 -0300 Subject: [PATCH 2/4] Add more icons --- modes/example/src/toolbarButtons.js | 6 +++--- modes/longitudinal/src/toolbarButtons.js | 6 +++--- platform/ui/src/assets/icons/old-angle-left.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-dot-circle.svg | 11 +++++++++++ platform/ui/src/assets/icons/old-youtube.svg | 11 +++++++++++ platform/ui/src/components/Icon/getIcon.jsx | 9 +++++++-- 6 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 platform/ui/src/assets/icons/old-angle-left.svg create mode 100644 platform/ui/src/assets/icons/old-dot-circle.svg create mode 100644 platform/ui/src/assets/icons/old-youtube.svg diff --git a/modes/example/src/toolbarButtons.js b/modes/example/src/toolbarButtons.js index 1863efdfb..db2f87cc2 100644 --- a/modes/example/src/toolbarButtons.js +++ b/modes/example/src/toolbarButtons.js @@ -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' }, diff --git a/modes/longitudinal/src/toolbarButtons.js b/modes/longitudinal/src/toolbarButtons.js index eacdb2497..709176661 100644 --- a/modes/longitudinal/src/toolbarButtons.js +++ b/modes/longitudinal/src/toolbarButtons.js @@ -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' }, diff --git a/platform/ui/src/assets/icons/old-angle-left.svg b/platform/ui/src/assets/icons/old-angle-left.svg new file mode 100644 index 000000000..15fb36b07 --- /dev/null +++ b/platform/ui/src/assets/icons/old-angle-left.svg @@ -0,0 +1,11 @@ + + Angle Left + + diff --git a/platform/ui/src/assets/icons/old-dot-circle.svg b/platform/ui/src/assets/icons/old-dot-circle.svg new file mode 100644 index 000000000..3533dde76 --- /dev/null +++ b/platform/ui/src/assets/icons/old-dot-circle.svg @@ -0,0 +1,11 @@ + + Dot Circle + + diff --git a/platform/ui/src/assets/icons/old-youtube.svg b/platform/ui/src/assets/icons/old-youtube.svg new file mode 100644 index 000000000..00db81c23 --- /dev/null +++ b/platform/ui/src/assets/icons/old-youtube.svg @@ -0,0 +1,11 @@ + + YouTube Logo + + diff --git a/platform/ui/src/components/Icon/getIcon.jsx b/platform/ui/src/components/Icon/getIcon.jsx index 4328e10ce..e04b163fe 100644 --- a/platform/ui/src/components/Icon/getIcon.jsx +++ b/platform/ui/src/components/Icon/getIcon.jsx @@ -52,7 +52,9 @@ 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'; const ICONS = { 'arrow-down': arrowDown, calendar: calendar, @@ -104,7 +106,10 @@ const ICONS = { 'old-circle': oldCircle, 'old-ellipse-h': oldEllipseH, 'old-invert': oldInvert, - 'old-rotate-right': oldRotateRight + 'old-rotate-right': oldRotateRight, + 'old-youtube': oldYoutube, + 'old-dot-circle': oldDotCircle, + 'old-angle-left': oldAngleLeft }; /** From 550564d60fea92e71cc7fddaad8241e4184d223f Mon Sep 17 00:00:00 2001 From: igoroctaviano Date: Fri, 26 Jun 2020 16:59:47 -0300 Subject: [PATCH 3/4] Add more icons --- modes/example/src/toolbarButtons.js | 2 +- modes/longitudinal/src/toolbarButtons.js | 2 +- platform/ui/src/assets/icons/old-angle-left.svg | 2 -- platform/ui/src/assets/icons/old-bars.svg | 2 -- platform/ui/src/assets/icons/old-circle.svg | 2 -- platform/ui/src/assets/icons/old-dot-circle.svg | 2 -- platform/ui/src/assets/icons/old-ellipse-h.svg | 2 -- platform/ui/src/assets/icons/old-invert.svg | 2 -- platform/ui/src/assets/icons/old-reset.svg | 9 +++++++++ platform/ui/src/assets/icons/old-rotate-right.svg | 2 -- platform/ui/src/assets/icons/old-youtube.svg | 2 -- platform/ui/src/components/Icon/getIcon.jsx | 5 ++++- 12 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 platform/ui/src/assets/icons/old-reset.svg diff --git a/modes/example/src/toolbarButtons.js b/modes/example/src/toolbarButtons.js index db2f87cc2..0f3165a62 100644 --- a/modes/example/src/toolbarButtons.js +++ b/modes/example/src/toolbarButtons.js @@ -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', diff --git a/modes/longitudinal/src/toolbarButtons.js b/modes/longitudinal/src/toolbarButtons.js index 709176661..54f1e2f7d 100644 --- a/modes/longitudinal/src/toolbarButtons.js +++ b/modes/longitudinal/src/toolbarButtons.js @@ -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', diff --git a/platform/ui/src/assets/icons/old-angle-left.svg b/platform/ui/src/assets/icons/old-angle-left.svg index 15fb36b07..5b87c1da3 100644 --- a/platform/ui/src/assets/icons/old-angle-left.svg +++ b/platform/ui/src/assets/icons/old-angle-left.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 512" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Angle Left diff --git a/platform/ui/src/assets/icons/old-bars.svg b/platform/ui/src/assets/icons/old-bars.svg index 3b735f90e..d7e430f0c 100644 --- a/platform/ui/src/assets/icons/old-bars.svg +++ b/platform/ui/src/assets/icons/old-bars.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1792 1792" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Bars diff --git a/platform/ui/src/assets/icons/old-circle.svg b/platform/ui/src/assets/icons/old-circle.svg index 99b9995b3..2cad5edcb 100644 --- a/platform/ui/src/assets/icons/old-circle.svg +++ b/platform/ui/src/assets/icons/old-circle.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Circle diff --git a/platform/ui/src/assets/icons/old-dot-circle.svg b/platform/ui/src/assets/icons/old-dot-circle.svg index 3533dde76..625f3b247 100644 --- a/platform/ui/src/assets/icons/old-dot-circle.svg +++ b/platform/ui/src/assets/icons/old-dot-circle.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Dot Circle diff --git a/platform/ui/src/assets/icons/old-ellipse-h.svg b/platform/ui/src/assets/icons/old-ellipse-h.svg index 1dbb78331..1d95148f7 100644 --- a/platform/ui/src/assets/icons/old-ellipse-h.svg +++ b/platform/ui/src/assets/icons/old-ellipse-h.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 28" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Ellipse Horizontal diff --git a/platform/ui/src/assets/icons/old-invert.svg b/platform/ui/src/assets/icons/old-invert.svg index ae2747644..f859c45bc 100644 --- a/platform/ui/src/assets/icons/old-invert.svg +++ b/platform/ui/src/assets/icons/old-invert.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 28" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Adjust diff --git a/platform/ui/src/assets/icons/old-reset.svg b/platform/ui/src/assets/icons/old-reset.svg new file mode 100644 index 000000000..116676d9c --- /dev/null +++ b/platform/ui/src/assets/icons/old-reset.svg @@ -0,0 +1,9 @@ + + Reset + + diff --git a/platform/ui/src/assets/icons/old-rotate-right.svg b/platform/ui/src/assets/icons/old-rotate-right.svg index 106284fa0..11646928f 100644 --- a/platform/ui/src/assets/icons/old-rotate-right.svg +++ b/platform/ui/src/assets/icons/old-rotate-right.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > Rotate Right diff --git a/platform/ui/src/assets/icons/old-youtube.svg b/platform/ui/src/assets/icons/old-youtube.svg index 00db81c23..433789f12 100644 --- a/platform/ui/src/assets/icons/old-youtube.svg +++ b/platform/ui/src/assets/icons/old-youtube.svg @@ -2,8 +2,6 @@ xmlns="http://www.w3.org/2000/svg" viewBox="0 0 28 28" aria-labelledby="title" - width="1em" - height="1em" fill="currentColor" > YouTube Logo diff --git a/platform/ui/src/components/Icon/getIcon.jsx b/platform/ui/src/components/Icon/getIcon.jsx index e04b163fe..7a71930c4 100644 --- a/platform/ui/src/components/Icon/getIcon.jsx +++ b/platform/ui/src/components/Icon/getIcon.jsx @@ -55,6 +55,8 @@ 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'; + const ICONS = { 'arrow-down': arrowDown, calendar: calendar, @@ -109,7 +111,8 @@ const ICONS = { 'old-rotate-right': oldRotateRight, 'old-youtube': oldYoutube, 'old-dot-circle': oldDotCircle, - 'old-angle-left': oldAngleLeft + 'old-angle-left': oldAngleLeft, + 'old-reset': oldReset }; /** From b18e5099d9fc2e810383d00ec098c970dfac80cf Mon Sep 17 00:00:00 2001 From: igoroctaviano Date: Fri, 26 Jun 2020 17:03:17 -0300 Subject: [PATCH 4/4] Add more icons --- modes/example/src/toolbarButtons.js | 2 +- modes/longitudinal/src/toolbarButtons.js | 2 +- platform/ui/src/assets/icons/old-circle-o.svg | 9 +++++++++ platform/ui/src/components/Icon/getIcon.jsx | 4 +++- 4 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 platform/ui/src/assets/icons/old-circle-o.svg diff --git a/modes/example/src/toolbarButtons.js b/modes/example/src/toolbarButtons.js index 0f3165a62..d4a3a7a59 100644 --- a/modes/example/src/toolbarButtons.js +++ b/modes/example/src/toolbarButtons.js @@ -188,7 +188,7 @@ export default [ }, props: { isActive: false, - icon: 'tool-move', + icon: 'old-circle-o', label: 'Rectangle', commandName: 'setToolActive', commandOptions: { toolName: 'RectangleRoi' }, diff --git a/modes/longitudinal/src/toolbarButtons.js b/modes/longitudinal/src/toolbarButtons.js index 54f1e2f7d..c2e5cd5e4 100644 --- a/modes/longitudinal/src/toolbarButtons.js +++ b/modes/longitudinal/src/toolbarButtons.js @@ -236,7 +236,7 @@ export default [ }, props: { isActive: false, - icon: 'tool-move', + icon: 'old-circle-o', label: 'Rectangle', commandName: 'setToolActive', commandOptions: { toolName: 'RectangleRoi' }, diff --git a/platform/ui/src/assets/icons/old-circle-o.svg b/platform/ui/src/assets/icons/old-circle-o.svg new file mode 100644 index 000000000..4242c992f --- /dev/null +++ b/platform/ui/src/assets/icons/old-circle-o.svg @@ -0,0 +1,9 @@ + + Square Outline + + diff --git a/platform/ui/src/components/Icon/getIcon.jsx b/platform/ui/src/components/Icon/getIcon.jsx index 7a71930c4..f421f579a 100644 --- a/platform/ui/src/components/Icon/getIcon.jsx +++ b/platform/ui/src/components/Icon/getIcon.jsx @@ -56,6 +56,7 @@ 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, @@ -112,7 +113,8 @@ const ICONS = { 'old-youtube': oldYoutube, 'old-dot-circle': oldDotCircle, 'old-angle-left': oldAngleLeft, - 'old-reset': oldReset + 'old-reset': oldReset, + 'old-circle-o': oldCircleO }; /**