Fix bug in volume recognition code

codeling · codeling · commit 7ccea028f42e · 2016-12-14T18:16:42.000+01:00
diff --git a/core/src/mdichild.cpp b/core/src/mdichild.cpp
@@ -2851,9 +2851,11 @@ iALogger * MdiChild::getLogger()
 
 bool MdiChild::IsVolumeDataLoaded() const
 {
-	return QString::compare(getFileInfo().suffix(), "STL", Qt::CaseInsensitive) == 0 &&
-		QString::compare(getFileInfo().suffix(), "FEM", Qt::CaseInsensitive) == 0 &&
-		imageData->GetExtent()[1] >= 0 && imageData->GetExtent()[3] >= 0 && imageData->GetExtent()[5] >= 0;
+	QString suffix = getFileInfo().suffix();
+	int * extent = imageData->GetExtent();
+	return QString::compare(suffix, "STL", Qt::CaseInsensitive) != 0 &&
+		QString::compare(suffix, "FEM", Qt::CaseInsensitive) != 0 &&
+		extent[1] >= 0 && extent[3] >= 0 && extent[5] >= 0;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -2851,9 +2851,11 @@ iALogger * MdiChild::getLogger()`
`2851`	`2851`
`2852`	`2852`	`bool MdiChild::IsVolumeDataLoaded() const`
`2853`	`2853`	`{`
`2854`		`- return QString::compare(getFileInfo().suffix(), "STL", Qt::CaseInsensitive) == 0 &&`
`2855`		`- QString::compare(getFileInfo().suffix(), "FEM", Qt::CaseInsensitive) == 0 &&`
`2856`		`- imageData->GetExtent()[1] >= 0 && imageData->GetExtent()[3] >= 0 && imageData->GetExtent()[5] >= 0;`
	`2854`	`+ QString suffix = getFileInfo().suffix();`
	`2855`	`+ int * extent = imageData->GetExtent();`
	`2856`	`+ return QString::compare(suffix, "STL", Qt::CaseInsensitive) != 0 &&`
	`2857`	`+ QString::compare(suffix, "FEM", Qt::CaseInsensitive) != 0 &&`
	`2858`	`+ extent[1] >= 0 && extent[3] >= 0 && extent[5] >= 0;`
`2857`	`2859`	`}`
`2858`	`2860`
`2859`	`2861`