Fixed bug where data could not be loaded into DataInMemory

AlanRace · Mar 14, 2019 · d9e4568 · d9e4568
1 parent f986ed6
commit d9e4568
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/core/DataInMemory.m b/src/core/DataInMemory.m
@@ -89,10 +89,10 @@ function loadData(obj, parser, regionOfInterest, spectralChannelRange, zeroFilli
                     end
 
                     if(isempty(obj.data))
-                        if(isinf(spectralChannelRange(1)))
+                        if(isinf(spectralChannelRange(1)) && ~isempty(spectralChannels))
                             spectralChannelRange(1) = min(spectralChannels);
                         end
-                        if(isinf(spectralChannelRange(2)))
+                        if(isinf(spectralChannelRange(2)) && ~isempty(spectralChannels))
                             spectralChannelRange(2) = max(spectralChannels);
                         end
 

diff --git a/src/io/ImzMLParser.m b/src/io/ImzMLParser.m
@@ -68,16 +68,16 @@ function parse(obj)
             if(isempty(imzMLSpectrum))
                 spectralChannels = [];
                 intensities = [];
-
-                return;
+            else
+                spectralChannels = imzMLSpectrum.getmzArray();
+                intensities = imzMLSpectrum.getIntensityArray();
             end
-
-            spectralChannels = imzMLSpectrum.getmzArray();
-            intensities = imzMLSpectrum.getIntensityArray();
 
             spectrum = SpectralData(spectralChannels, intensities);
 
-            spectrum.setIsContinuous(~imzMLSpectrum.isCentroid());
+            if(~isempty(imzMLSpectrum))
+                spectrum.setIsContinuous(~imzMLSpectrum.isCentroid());
+            end
         end
 
         function image = getImage(obj, spectralChannel, channelWidth)