From 44528722c8c3cc34e35eb23d757b7d55b6225116 Mon Sep 17 00:00:00 2001 From: Mark W <24956497+ndg63276@users.noreply.github.com> Date: Tue, 12 Nov 2024 10:05:17 +0000 Subject: [PATCH] LIMS-1463: Always display Mesh3D data collections as grid scans (#845) * LIMS-1463: Always display Mesh3d data collections as grid scans * LIMS-1463: Combine if clauses --------- Co-authored-by: Mark Williams --- api/src/Page/DC.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/api/src/Page/DC.php b/api/src/Page/DC.php index 34e59f5f2..eaf03183d 100644 --- a/api/src/Page/DC.php +++ b/api/src/Page/DC.php @@ -993,9 +993,10 @@ function _data_collections($single = null) $dc['DCT'] = 'Data Collection'; } - if ($dc['DCT'] == 'Mesh') + if ($dc['DCT'] == 'Mesh' || $dc['DCT'] == 'Mesh3D' || + ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1) + ) { $dc['DCT'] = 'Grid Scan'; - if ($dc['DCT'] != 'Serial Fixed' && $dc['DCT'] != 'Serial Jet' && $dc['AXISRANGE'] == 0 && $dc['NI'] > 1) { $dc['TYPE'] = 'grid'; } //$this->profile('dc');