From 5f757457c8caf36634cdc77bbd1b2edfd319cf2e Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Tue, 9 Feb 2016 17:41:58 +0100
Subject: [PATCH] Bug fixes for conformance criteria and pixel spacing check

---
 .../lesiontracker/lib/TrialCriteriaConstraints.js    | 12 ++++++------
 .../lesiontracker/lib/pixelSpacingAutorunCheck.js    |  6 +++++-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Packages/lesiontracker/lib/TrialCriteriaConstraints.js b/Packages/lesiontracker/lib/TrialCriteriaConstraints.js
index 222083448..48bd44c4e 100644
--- a/Packages/lesiontracker/lib/TrialCriteriaConstraints.js
+++ b/Packages/lesiontracker/lib/TrialCriteriaConstraints.js
@@ -39,7 +39,7 @@ function RECIST(image) {
         criteria.baseline.target.nodal = {
             shortestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(15, 2 * acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(15, 2 * acquisitionSliceThickness),
                     message: '^Nodal lesions must be >= 15 mm short axis AND >= double the acquisition slice thickness (' +
                              acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
@@ -114,7 +114,7 @@ function RECIST(image) {
         criteria.baseline.target.extraNodal = {
             longestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(10, 2 * acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(10, 2 * acquisitionSliceThickness),
                     message: '^Extranodal lesions must be >= 10 mm long axis AND >= double the acquisition slice thickness (' +
                     acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
@@ -179,14 +179,14 @@ function irRC(image) {
         criteria.baseline.target.all = {
             longestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(10, acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(10, acquisitionSliceThickness),
                     message: '^Target lesions must be >= 10 mm long axis AND >= double the acquisition slice thickness (' +
                     acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
             },
             shortestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(10, acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(10, acquisitionSliceThickness),
                     message: '^Target lesions must be >= 10 mm short axis AND >= double the acquisition slice thickness (' +
                     acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
@@ -258,14 +258,14 @@ function irRC(image) {
             // - New target lesions must be >/= 5 X 5 mm AND >/= double the acquisition slice thickness by CT and MR
             longestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(5, 2 * acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(5, 2 * acquisitionSliceThickness),
                     message: '^New target lesions must be >= 5 mm long axis AND >= double the acquisition slice thickness (' +
                     acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
             },
             shortestDiameter: {
                 numericality: {
-                    greaterThanOrEqualTo: Math.min(5, 2 * acquisitionSliceThickness),
+                    greaterThanOrEqualTo: Math.max(5, 2 * acquisitionSliceThickness),
                     message: '^New target lesions must be >= 5 mm short axis AND >= double the acquisition slice thickness (' +
                     acquisitionSliceThickness + ' mm) for CT and MR.'
                 }
diff --git a/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js b/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
index b301fb515..e4d41086b 100644
--- a/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
+++ b/Packages/lesiontracker/lib/pixelSpacingAutorunCheck.js
@@ -15,7 +15,11 @@ pixelSpacingAutorunCheck = function() {
         return;
     }
 
-    var enabledElement = cornerstone.getEnabledElement(element);
+    try {
+        var enabledElement = cornerstone.getEnabledElement(element);
+    } catch(error) {
+        return;
+    }
 
     // Check value of rowPixelSpacing & columnPixelSpacing to define as unavailable
     if (!enabledElement ||