From 51f6b81e4f147ebd5a840fdb97009de9ee944c0e Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier Date: Fri, 26 Jan 2024 09:24:20 +0100 Subject: [PATCH] Fixed source code formatting. --- dcmsr/libsrc/dsrchecc.cc | 10 +++++----- dcmsr/libsrc/dsrcolcc.cc | 2 +- dcmsr/libsrc/dsrmamcc.cc | 6 +++--- dcmsr/libsrc/dsrprdcc.cc | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dcmsr/libsrc/dsrchecc.cc b/dcmsr/libsrc/dsrchecc.cc index e99f16bd07..fd593c4b4c 100644 --- a/dcmsr/libsrc/dsrchecc.cc +++ b/dcmsr/libsrc/dsrchecc.cc @@ -81,14 +81,14 @@ OFBool DSRChestCadSRConstraintChecker::checkContentRelationship(const E_ValueTyp else if ((relationshipType == RT_hasObsContext) && !byReference && ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) { - result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_PName) || (targetValueType == VT_UIDRef) || (targetValueType == VT_Composite); } /* row 3 of the table (including CONTAINER-related constraints from row 2) */ else if ((relationshipType == RT_hasObsContext) && !byReference && (sourceValueType == VT_Container)) { - result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_PName) || (targetValueType == VT_UIDRef) || (targetValueType == VT_Composite) || (targetValueType == VT_Container); } @@ -110,8 +110,8 @@ OFBool DSRChestCadSRConstraintChecker::checkContentRelationship(const E_ValueTyp ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num))) { /* by-reference allowed */ - result = (targetValueType == VT_Container) || (targetValueType == VT_Text) || (targetValueType == VT_Code) || - (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Image) || + result = (targetValueType == VT_Container) || (targetValueType == VT_Text) || (targetValueType == VT_Code) || + (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Image) || (targetValueType == VT_Waveform) || (targetValueType == VT_SCoord) || (targetValueType == VT_TCoord) || (targetValueType == VT_UIDRef); } @@ -119,7 +119,7 @@ OFBool DSRChestCadSRConstraintChecker::checkContentRelationship(const E_ValueTyp else if ((relationshipType == RT_inferredFrom) && ((sourceValueType == VT_Code) || (sourceValueType == VT_Num))) { /* by-reference allowed */ - result = (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Image) || + result = (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Image) || (targetValueType == VT_Waveform) || (targetValueType == VT_SCoord) || (targetValueType == VT_TCoord) || (targetValueType == VT_Container) || (targetValueType == VT_Text); } diff --git a/dcmsr/libsrc/dsrcolcc.cc b/dcmsr/libsrc/dsrcolcc.cc index 384f28b3dc..f413f6ea2b 100644 --- a/dcmsr/libsrc/dsrcolcc.cc +++ b/dcmsr/libsrc/dsrcolcc.cc @@ -87,7 +87,7 @@ OFBool DSRColonCadSRConstraintChecker::checkContentRelationship(const E_ValueTyp (targetValueType == VT_UIDRef) || (targetValueType == VT_Composite); } /* row 3 of the table (including CONTAINER-related constraints from row 2) */ - else if ((relationshipType == RT_hasObsContext) && !byReference && (sourceValueType == VT_Container)) + else if ((relationshipType == RT_hasObsContext) && !byReference && (sourceValueType == VT_Container)) { result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_PName) || diff --git a/dcmsr/libsrc/dsrmamcc.cc b/dcmsr/libsrc/dsrmamcc.cc index fbec1f3f26..fc3629c416 100644 --- a/dcmsr/libsrc/dsrmamcc.cc +++ b/dcmsr/libsrc/dsrmamcc.cc @@ -75,8 +75,8 @@ OFBool DSRMammographyCadSRConstraintChecker::checkContentRelationship(const E_Va if ((relationshipType == RT_contains) && !byReference && (sourceValueType == VT_Container)) { result = (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_SCoord) || - (targetValueType == VT_Image) || (targetValueType == VT_Container) || - (targetValueType == VT_Text) || (targetValueType == VT_Date); + (targetValueType == VT_Image) || (targetValueType == VT_Container) || (targetValueType == VT_Text) || + (targetValueType == VT_Date); } /* row 2 of the table (CONTAINER-related constraints are checked with row 3) */ else if ((relationshipType == RT_hasObsContext) && !byReference && @@ -87,7 +87,7 @@ OFBool DSRMammographyCadSRConstraintChecker::checkContentRelationship(const E_Va (targetValueType == VT_UIDRef) || (targetValueType == VT_Composite); } /* row 3 of the table (including CONTAINER-related constraints from row 2) */ - else if ((relationshipType == RT_hasObsContext) && !byReference && (sourceValueType == VT_Container)) + else if ((relationshipType == RT_hasObsContext) && !byReference && (sourceValueType == VT_Container)) { result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_Date) || (targetValueType == VT_Time) || (targetValueType == VT_PName) || diff --git a/dcmsr/libsrc/dsrprdcc.cc b/dcmsr/libsrc/dsrprdcc.cc index 022eb924aa..3f5dc08ed1 100644 --- a/dcmsr/libsrc/dsrprdcc.cc +++ b/dcmsr/libsrc/dsrprdcc.cc @@ -113,7 +113,7 @@ OFBool DSRPatientRadiationDoseSRConstraintChecker::checkContentRelationship(cons else if ((relationshipType == RT_hasProperties) && ((sourceValueType == VT_Text) || (sourceValueType == VT_Code) || (sourceValueType == VT_Num) || (sourceValueType == VT_Composite))) { - result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || + result = (targetValueType == VT_Text) || (targetValueType == VT_Code) || (targetValueType == VT_Num) || (targetValueType == VT_DateTime) || (targetValueType == VT_UIDRef) || (targetValueType == VT_PName) || (targetValueType == VT_Image) || (targetValueType == VT_Composite) || (targetValueType == VT_Container); }