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.

Sign up for GitHub

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 pypx types #1281

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Fix pypx types #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b5da57
Show error message for pfdcmStudies.error
jennydaman Oct 24, 2024
14ea169
Fix simplifyPypxSeriesData undefineds
jennydaman Oct 24, 2024
152012e
pnpm run fmt
jennydaman Oct 24, 2024
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
50 changes: 27 additions & 23 deletions src/api/pfdcm/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,42 +198,46 @@ function getValue(
data: { [key: string]: PypxTag | ReadonlyArray<{ [key: string]: PypxTag }> },
name: string,
): string {
if (!(name in data)) {
return "";
}
if ("value" in data[name]) {
return "" + data[name].value;
}
return "";
}

function simplifyPypxSeriesData(data: { [key: string]: PypxTag }): Series {
const parsedNumInstances =
data.NumberOfSeriesRelatedInstances.value === 0
? NaN
: parseInt(data.NumberOfSeriesRelatedInstances.value);
const NumberOfSeriesRelatedInstances = Number.isNaN(parsedNumInstances)
const numInstances = parseInt(
getValue(data, "NumberOfSeriesRelatedInstances"),
);
const NumberOfSeriesRelatedInstances = Number.isNaN(numInstances)
? null
: parsedNumInstances;
: numInstances;
return {
SpecificCharacterSet: "" + data.SpecificCharacterSet.value,
SpecificCharacterSet: getValue(data, "SpecificCharacterSet"),
StudyDate: parsePypxDicomDate(data.StudyDate),
SeriesDate: parsePypxDicomDate(data.SeriesDate),
AccessionNumber: "" + data.AccessionNumber.value,
RetrieveAETitle: "" + data.RetrieveAETitle.value,
Modality: "" + data.Modality.value,
StudyDescription: "" + data.StudyDescription.value,
SeriesDescription: "" + data.SeriesDescription.value,
PatientName: "" + data.PatientName.value,
PatientID: "" + data.PatientID.value,
AccessionNumber: getValue(data, "AccessionNumber"),
RetrieveAETitle: getValue(data, "RetrieveAETitle"),
Modality: getValue(data, "Modality"),
StudyDescription: getValue(data, "StudyDescription"),
SeriesDescription: getValue(data, "SeriesDescription"),
PatientName: getValue(data, "PatientName"),
PatientID: getValue(data, "PatientID"),
PatientBirthDate: parsePypxDicomDate(data.PatientBirthDate),
PatientSex: "" + data.PatientSex.value,
PatientAge: "" + data.PatientAge.value,
ProtocolName: "" + data.ProtocolName.value,
AcquisitionProtocolName: "" + data.AcquisitionProtocolName.value,
AcquisitionProtocolDescription:
"" + data.AcquisitionProtocolDescription.value,
StudyInstanceUID: "" + data.StudyInstanceUID.value,
SeriesInstanceUID: "" + data.SeriesInstanceUID.value,
PatientSex: getValue(data, "PatientSex"),
PatientAge: getValue(data, "PatientAge"),
ProtocolName: getValue(data, "ProtocolName"),
AcquisitionProtocolName: getValue(data, "AcquisitionProtocolName"),
AcquisitionProtocolDescription: getValue(
data,
"AcquisitionProtocolDescription",
),
StudyInstanceUID: getValue(data, "StudyInstanceUID"),
SeriesInstanceUID: getValue(data, "SeriesInstanceUID"),
NumberOfSeriesRelatedInstances,
PerformedStationAETitle: "" + data.PerformedStationAETitle.value,
PerformedStationAETitle: getValue(data, "PerformedStationAETitle"),
};
}

Expand Down
6 changes: 3 additions & 3 deletions src/app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@
.small-button {
width: 16px;
height: 16px;
font-size: 0.8rem
font-size: 0.8rem;
}

.large-button {
width: 24px;
height: 24px;
font-size:1rem;
font-size: 1rem;
}

.button-style {
Expand All @@ -81,5 +81,5 @@
display: flex !important;
justify-content: center !important;
align-items: center !important;
line-height:0 !important
line-height: 0 !important;
}
5 changes: 3 additions & 2 deletions src/components/Pacs/PacsController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,8 +371,9 @@ const PacsController: React.FC<PacsControllerProps> = ({
}, [preferences, studies]);

const error = React.useMemo(
() => wsError || pfdcmServices.error?.message,
[wsError, pfdcmServices.error],
() =>
wsError || pfdcmServices.error?.message || pfdcmStudies.error?.message,
[wsError, pfdcmServices.error, pfdcmStudies.error],
);

// ========================================
Expand Down
Loading