Fixed source code formatting.

DCMTK · Jan 26, 2024 · 51f6b81 · 51f6b81
1 parent 271fae9
commit 51f6b81
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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,16 +110,16 @@ 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);
     }
     /* row 7 of the table */
     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
@@ -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
@@ -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
@@ -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);
         }