fix(typescript): rename services to fix typescript (#3165)

* fix: Rename services to lower camel case, hp, measure

* fix: Rename DisplaySetService instances to displaySetService

* fix: Rename CornerstoneViewportService to lower camel case

* fix: Added lower case segmentationService rename

* rename other services (#3166)

* rename uiDialogService

* rename toolGroupService

* rename uiNotificationService

* rename viewportGridService

* rename syncGroupService

* rename CornerstoneCacheService

* Fix a syntax error in hotkeys

* Fix a couple of rename issues that were missed

---------

Co-authored-by: Alireza <ar.sedghi@gmail.com>
This commit is contained in:
Bill WallaceandAlireza authored and GitHub committed 2023-02-10 16:46:09 -05:00
1 parent a97fb2fc9a
commit 8af0362d12
97 files changed
+934 -908

No files matched your search

+23 -23
View File
@@ -30,10 +30,10 @@ function ViewerViewportGrid(props) {
// TODO -> Need some way of selecting which displaySets hit the viewports.
const {
DisplaySetService,
MeasurementService,
HangingProtocolService,
UINotificationService,
displaySetService,
measurementService,
hangingProtocolService,
uiNotificationService,
} = servicesManager.services;
/**
@@ -48,7 +48,7 @@ function ViewerViewportGrid(props) {
const {
viewportMatchDetails,
hpAlreadyApplied,
} = HangingProtocolService.getMatchDetails();
} = hangingProtocolService.getMatchDetails();
if (!viewportMatchDetails.size) {
return;
@@ -104,7 +104,7 @@ function ViewerViewportGrid(props) {
const suppressEvent = true;
const applied = true;
HangingProtocolService.setHangingProtocolAppliedForViewport(
hangingProtocolService.setHangingProtocolAppliedForViewport(
viewportIndex,
applied,
suppressEvent
@@ -119,13 +119,13 @@ function ViewerViewportGrid(props) {
(viewportIndex, displaySetInstanceUID) => {
let updatedViewports = [];
try {
updatedViewports = HangingProtocolService.getViewportsRequireUpdate(
updatedViewports = hangingProtocolService.getViewportsRequireUpdate(
viewportIndex,
displaySetInstanceUID
);
} catch (error) {
console.warn(error);
UINotificationService.show({
uiNotificationService.show({
title: 'Drag and Drop',
message:
'The selected display sets could not be added to the viewport due to a mismatch in the Hanging Protocol rules.',
@@ -136,18 +136,18 @@ function ViewerViewportGrid(props) {
return updatedViewports;
},
[HangingProtocolService, UINotificationService]
[hangingProtocolService, uiNotificationService]
);
useEffect(() => {
const displaySets = DisplaySetService.getActiveDisplaySets();
const displaySets = displaySetService.getActiveDisplaySets();
updateDisplaySetsForViewports(displaySets);
}, [numRows, numCols]);
// Layout change based on hanging protocols
useEffect(() => {
const { unsubscribe } = HangingProtocolService.subscribe(
HangingProtocolService.EVENTS.NEW_LAYOUT,
const { unsubscribe } = hangingProtocolService.subscribe(
hangingProtocolService.EVENTS.NEW_LAYOUT,
({ layoutType, numRows, numCols, layoutOptions }) => {
viewportGridService.setLayout({
numRows,
@@ -165,10 +165,10 @@ function ViewerViewportGrid(props) {
// Using Hanging protocol engine to match the displaySets
useEffect(() => {
const { unsubscribe } = HangingProtocolService.subscribe(
HangingProtocolService.EVENTS.PROTOCOL_CHANGED,
const { unsubscribe } = hangingProtocolService.subscribe(
hangingProtocolService.EVENTS.PROTOCOL_CHANGED,
() => {
const displaySets = DisplaySetService.getActiveDisplaySets();
const displaySets = displaySetService.getActiveDisplaySets();
updateDisplaySetsForViewports(displaySets);
}
);
@@ -179,8 +179,8 @@ function ViewerViewportGrid(props) {
}, [viewports]);
useEffect(() => {
const { unsubscribe } = MeasurementService.subscribe(
MeasurementService.EVENTS.JUMP_TO_MEASUREMENT,
const { unsubscribe } = measurementService.subscribe(
measurementService.EVENTS.JUMP_TO_MEASUREMENT,
({ viewportIndex, measurement }) => {
const {
displaySetInstanceUID: referencedDisplaySetInstanceUID,
@@ -198,7 +198,7 @@ function ViewerViewportGrid(props) {
}
}
const displaySet = DisplaySetService.getDisplaySetByUID(
const displaySet = displaySetService.getDisplaySetByUID(
referencedDisplaySetInstanceUID
);
@@ -335,7 +335,7 @@ function ViewerViewportGrid(props) {
const displaySets = displaySetInstanceUIDsToUse.map(
displaySetInstanceUID => {
return (
DisplaySetService.getDisplaySetByUID(displaySetInstanceUID) || {}
displaySetService.getDisplaySetByUID(displaySetInstanceUID) || {}
);
}
);
@@ -343,7 +343,7 @@ function ViewerViewportGrid(props) {
const ViewportComponent = _getViewportComponent(
displaySets,
viewportComponents,
UINotificationService
uiNotificationService
);
// look inside displaySets to see if they need reRendering
@@ -403,7 +403,7 @@ function ViewerViewportGrid(props) {
}, [viewports, activeViewportIndex, viewportComponents, dataSource]);
/**
* Loading indicator until numCols and numRows are gotten from the HangingProtocolService
* Loading indicator until numCols and numRows are gotten from the hangingProtocolService
*/
if (!numRows || !numCols) {
return null;
@@ -428,7 +428,7 @@ ViewerViewportGrid.defaultProps = {
function _getViewportComponent(
displaySets,
viewportComponents,
UINotificationService
uiNotificationService
) {
if (!displaySets || !displaySets.length) {
return EmptyViewport;
@@ -453,7 +453,7 @@ function _getViewportComponent(
}
console.log("Can't show displaySet", SOPClassHandlerId, displaySets[0]);
UINotificationService.show({
uiNotificationService.show({
title: 'Viewport Not Supported Yet',
message: `Cannot display SOPClassId of ${displaySets[0].SOPClassUID} yet`,
type: 'error',