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.

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

fix(modules): add stylus loader as an option to be uncommented #3710

Merged
merged 86 commits into from
Oct 10, 2023
Merged
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
a52a59d
feat(stylus): bring back the stylus loader temporarly
sedghi Aug 1, 2023
9637f4c
add seg mode
sedghi Aug 4, 2023
3c882dc
initial panel
sedghi Aug 4, 2023
9ef0feb
add segmentation panel
sedghi Aug 4, 2023
2b2e566
segpanel initial work
sedghi Aug 4, 2023
acd5676
working seg panel
sedghi Aug 4, 2023
94a1f02
Merge branch 'master' of github.com:OHIF/Viewers into feat/monai-label
sedghi Aug 9, 2023
ba9e2f6
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Aug 9, 2023
eeef8e8
added panel secton
sedghi Aug 10, 2023
9768919
add panel section
sedghi Aug 10, 2023
f50f93a
add panel section
sedghi Aug 10, 2023
3946285
wip
sedghi Aug 10, 2023
c212ce6
start of new seg row
sedghi Aug 11, 2023
7b13485
add load segmentation for dipslayset
sedghi Aug 11, 2023
df8b791
wip segmentation
sedghi Aug 15, 2023
8e1bd50
add required edits to make monai work
sedghi Aug 15, 2023
4fc8c49
wip
sedghi Aug 16, 2023
6215d0e
checkpoint
sedghi Aug 16, 2023
1de6081
wip
sedghi Aug 16, 2023
3aa36c5
working segment
sedghi Aug 16, 2023
6953f64
working everything
sedghi Aug 16, 2023
12e00fb
wip
sedghi Aug 16, 2023
98f4219
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Aug 16, 2023
696f29b
working read only with new design
sedghi Aug 17, 2023
dfddbb3
wip for the new edit mode
sedghi Aug 17, 2023
e3a0f3e
initial advanced toolbox
sedghi Aug 22, 2023
62d5f8a
wip
sedghi Aug 22, 2023
c4f118f
wip
sedghi Aug 22, 2023
6ee70f4
wip
sedghi Aug 22, 2023
96f4f5e
advanced toolbox
sedghi Aug 23, 2023
90656c4
wip sync between tools and toolbar
sedghi Aug 24, 2023
63857b7
wip
sedghi Aug 24, 2023
a620865
wip
sedghi Aug 24, 2023
8b23c2b
wip
sedghi Aug 24, 2023
43aa396
wip
sedghi Aug 25, 2023
f832049
brushes work fine
sedghi Aug 25, 2023
fdc902e
wip input double range
sedghi Aug 26, 2023
9d1ea8c
segment and double range
sedghi Aug 28, 2023
5e130d7
wip
sedghi Aug 30, 2023
9909878
segmentation export works
sedghi Aug 30, 2023
5c56cff
wip
sedghi Sep 1, 2023
ba3b521
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Sep 1, 2023
eab774a
wip new button groups
sedghi Sep 1, 2023
55214f7
fix button group design
sedghi Sep 1, 2023
f063ef5
working segmentation mode
sedghi Sep 5, 2023
f98c7c7
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Sep 5, 2023
0e25075
remaining styles changes
sedghi Sep 5, 2023
dacd78a
after pull
sedghi Sep 6, 2023
25f5cde
update cs3d
sedghi Sep 6, 2023
9e9ba13
fix brush initial state
sedghi Sep 8, 2023
b36665a
fix add new segmentation
sedghi Sep 8, 2023
394023b
fix remove segmentation
sedghi Sep 8, 2023
893be36
fix seg config styles
sedghi Sep 8, 2023
68fd83a
fix seg tool box state syncs
sedghi Sep 8, 2023
7481cb5
fix tooltip
sedghi Sep 8, 2023
d7c04e4
fix row unlocked
sedghi Sep 8, 2023
48e5ef1
fix
sedghi Sep 11, 2023
534db04
fix extra segs getting created
sedghi Sep 11, 2023
30bb919
refactor hydration for segmentations
sedghi Sep 11, 2023
6ff8d03
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Sep 11, 2023
da09815
update yarn lock
sedghi Sep 11, 2023
5865c0d
fix rest of seg
sedghi Sep 12, 2023
c7432fd
Merge branch 'feat/segmentation-mode' of github.com:OHIF/Viewers into…
sedghi Sep 12, 2023
3e2dd49
after rebase
sedghi Sep 12, 2023
6b1064c
update pr with new cs3d
sedghi Sep 12, 2023
48f1d48
Merge branch 'master' of github.com:OHIF/Viewers into feat/segmentati…
sedghi Sep 12, 2023
dac16b2
fix commands module
sedghi Sep 12, 2023
cfe7814
fix e2e unstable tests
sedghi Sep 12, 2023
90566dd
fix ui stuff
sedghi Sep 12, 2023
0360d83
fix more bugs
sedghi Sep 12, 2023
326a39f
wip
sedghi Sep 12, 2023
78d8cab
Merge branch 'feat/segmentation-mode' of github.com:OHIF/Viewers into…
sedghi Sep 12, 2023
5bb78a6
more refactoring and docs
sedghi Sep 13, 2023
60a1133
Merge branch 'feat/segmentation-mode' of github.com:OHIF/Viewers into…
sedghi Sep 13, 2023
ee0c0ff
fix bugs
sedghi Sep 13, 2023
36cefeb
Merge branch 'master' of github.com:OHIF/Viewers into feat/monai-label
sedghi Sep 25, 2023
40e06be
after pull
sedghi Sep 25, 2023
c2d3b57
fix
sedghi Sep 25, 2023
bc54380
Merge branch 'master' of github.com:OHIF/Viewers into feat/monai-label
sedghi Oct 4, 2023
c299fe2
fix debug
sedghi Oct 4, 2023
4975d8d
Merge branch 'master' of github.com:OHIF/Viewers into feat/monai-label
sedghi Oct 7, 2023
3eb0095
fix panel study browswer
sedghi Oct 7, 2023
8b965f9
dont use shared array buffer in not secure
sedghi Oct 7, 2023
b2601ba
Merge branch 'master' of github.com:OHIF/Viewers into feat/monai-label
sedghi Oct 10, 2023
ec9bacc
reduce the diff
sedghi Oct 10, 2023
0db98c3
reduce the diff
sedghi Oct 10, 2023
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
Prev Previous commit
Next Next commit
wip
sedghi committed Aug 16, 2023
commit 1de608148359fc07f47ad4026408b91abb17a246
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ function AddSegmentRow() {
return (
<div className="flex">
<div className="w-[28px] h-[28px]"></div>
<div className="group ml-1 mt-1">
<div className="group ml-0.5 mt-1">
<div className="text-primary-active flex group-hover:bg-secondary-dark items-center rounded-sm pr-2">
<div className="w-[28px] h-[28px] grid place-items-center">
<Icon name="icon-add" />
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ const SegmentItem = ({
isActive,
isVisible,
color,
showSegmentDelete,
showDelete,
isLocked = false,
onClick,
onEdit,
@@ -20,89 +20,56 @@ const SegmentItem = ({
onToggleVisibility,
onToggleLocked,
}) => {
const [isHovering, setIsHovering] = useState(false);
const [isSegmentIndexHovering, setIsSegmentIndexHovering] = useState(false);

const onMouseEnter = () => setIsHovering(true);
const onMouseLeave = () => setIsHovering(false);
const [isRowHovering, setRowIsHovering] = useState(false);
const [isNumberBoxHovering, setIsNumberBoxHovering] = useState(false);

const cssColor = `rgb(${color[0]},${color[1]},${color[2]})`;

return (
<div
className={classnames(
'group relative flex cursor-pointer bg-primary-dark transition duration-300 text-[12px] overflow-hidden border',
{
'border-primary-light rounded-[3px]': isActive,
},
{
'border-transparent': !isActive,
}
)}
onMouseEnter={onMouseEnter}
onMouseLeave={onMouseLeave}
className="flex text-aqua-pale bg-black group/row min-h-[28px]"
onMouseEnter={() => setRowIsHovering(true)}
onMouseLeave={() => setRowIsHovering(false)}
onClick={e => {
e.stopPropagation();
onClick(segmentationId, segmentIndex);
}}
role="button"
tabIndex={0}
data-cy={'segment-item'}
>
<div
className={classnames(
'w-[27px] flex items-center justify-center border-r border-r-black text-[12px]',
{
'bg-primary-light text-black border-l border-l-primary-light rounded-l-sm': isActive,
'bg-[#1d3c58] border-l border-l-[#1d3c58] rounded-l-sm':
!isActive && isHovering,
'bg-primary-dark text-aqua-pale':
!isActive && !isHovering && isVisible,
'bg-[#140e2e] opacity-60 text-[#537594]': !isActive && !isVisible,
}
)}
onMouseEnter={() => setIsSegmentIndexHovering(true)}
onMouseLeave={() => setIsSegmentIndexHovering(false)}
className="grid place-items-center w-[28px] bg-primary-dark group/number"
onMouseEnter={() => setIsNumberBoxHovering(true)}
onMouseLeave={() => setIsNumberBoxHovering(false)}
>
{isSegmentIndexHovering && showSegmentDelete ? (
{isNumberBoxHovering && showDelete ? (
<Icon
name="close"
className={classnames('pr-0.5')}
onClick={e => {
e.stopPropagation();
onDelete(segmentationId, segmentIndex);
}}
/>
) : (
<div className={classnames('flex items-center pr-2 ')}>
{segmentIndex}
</div>
<div>{segmentIndex}</div>
)}
</div>
<div
className={classnames(
'flex items-center justify-between w-full pl-2 py-1 text-white border-r border-r-black relative ',
{
'bg-primary-dark text-primary-light': isActive,
'bg-primary-dark text-aqua-pale': !isActive && isVisible,
'bg-[#140e2e] opacity-60 text-[#3d5871]': !isVisible,
}
)}
>
<div className={classnames('flex items-baseline gap-2')}>
<div
className={classnames('shrink-0 w-[8px] h-[8px] rounded-full')}
style={{ backgroundColor: cssColor }}
onClick={e => {
e.stopPropagation();
onColor(segmentationId, segmentIndex);
}}
/>
<div className="">{label}</div>
<div className="relative flex w-full">
<div className="flex flex-grow items-center group-hover/row:bg-primary-dark w-full h-full">
<div className="pl-3 pr-2.5">
<div
className={classnames('grow-0 w-[8px] h-[8px] rounded-full')}
style={{ backgroundColor: cssColor }}
onClick={e => {
e.stopPropagation();
onColor(segmentationId, segmentIndex);
}}
/>
</div>
<div className="flex items-center">{label}</div>
</div>
{/* with faded background */}
<div className="absolute right-0 bg-black/15 rounded-lg pr-[7px]">
{!isVisible && !isHovering && (
<div className="absolute right-0 top-1 bg-black/15 rounded-lg pr-[7px]">
{!isVisible && !isRowHovering && (
<div>
<Icon
name="row-hidden"
@@ -114,7 +81,7 @@ const SegmentItem = ({
/>
</div>
)}
{isHovering && (
{isRowHovering && (
<HoveringIcons
onEdit={onEdit}
isLocked={isLocked}