Sort by SliceLocation if IPPSorter fails

a-a-danilov · a-a-danilov · commit 3fff8bb3a386 · 2024-03-16T18:58:34.000+03:00
diff --git a/Common/MultiFrameDicomSeriesSorter.cxx b/Common/MultiFrameDicomSeriesSorter.cxx
@@ -149,7 +149,11 @@ ::Apply(DicomFilesList &dflist)
 		return EXIT_SUCCESS;
 		}
 	else
-		return EXIT_FAILURE;
+		{
+		// Fallback to sorting by SliceLocation
+		std::sort(dflist.begin(), dflist.end(), DicomFile::CompareBySliceLocation);
+		return EXIT_SUCCESS;
+		}
 }
 
 //===================================================
diff --git a/Common/MultiFrameDicomSeriesSorter.h b/Common/MultiFrameDicomSeriesSorter.h
@@ -24,6 +24,8 @@ struct DicomFile
 	// sorting functions
 	static bool CompareByInstanceNumber(const DicomFile &left, const DicomFile &right)
 	{ return left.m_InstanceNumber < right.m_InstanceNumber; }
+	static bool CompareBySliceLocation(const DicomFile &left, const DicomFile &right)
+	{ return left.m_SliceLocation > right.m_SliceLocation; }
 
   // members
   std::string m_Filename;

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,11 @@ ::Apply(DicomFilesList &dflist)`
`149`	`149`	`return EXIT_SUCCESS;`
`150`	`150`	`}`
`151`	`151`	`else`
`152`		`- return EXIT_FAILURE;`
	`152`	`+ {`
	`153`	`+ // Fallback to sorting by SliceLocation`
	`154`	`+ std::sort(dflist.begin(), dflist.end(), DicomFile::CompareBySliceLocation);`
	`155`	`+ return EXIT_SUCCESS;`
	`156`	`+ }`
`153`	`157`	`}`
`154`	`158`
`155`	`159`	`//===================================================`