Skip to content
Snippets Groups Projects
Commit efd2f6a2 authored by Eric Wait's avatar Eric Wait
Browse files

Fixed up built in bioformats to use the Microscope data package

parent f3e3cbde
Branches
No related tags found
No related merge requests found
...@@ -44,10 +44,10 @@ ip.parse(varargin{:}); ...@@ -44,10 +44,10 @@ ip.parse(varargin{:});
id = ip.Results.id; id = ip.Results.id;
% verify that enough memory is allocated % verify that enough memory is allocated
bfCheckJavaMemory(); MicroscopeData.Original.BioFormats.bfCheckJavaMemory();
% load the Bio-Formats library into the MATLAB environment % load the Bio-Formats library into the MATLAB environment
status = bfCheckJavaPath(); status = MicroscopeData.Original.BioFormats.bfCheckJavaPath();
assert(status, ['Missing Bio-Formats library. Either add bioformats_package.jar '... assert(status, ['Missing Bio-Formats library. Either add bioformats_package.jar '...
'to the static Java path or add it to the Matlab path.']); 'to the static Java path or add it to the Matlab path.']);
......
...@@ -33,7 +33,7 @@ function bfInitLogging(varargin) ...@@ -33,7 +33,7 @@ function bfInitLogging(varargin)
% 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. % 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
% Check Bio-Formats is set in the Java class path % Check Bio-Formats is set in the Java class path
bfCheckJavaPath(); MicroscopeData.Original.BioFormats.bfCheckJavaPath();
% Input check % Input check
levels = {'ALL', 'DEBUG', 'ERROR', 'FATAL', 'INFO', 'OFF', 'TRACE', 'WARN'}; levels = {'ALL', 'DEBUG', 'ERROR', 'FATAL', 'INFO', 'OFF', 'TRACE', 'WARN'};
......
...@@ -96,7 +96,7 @@ stitchFiles = 0; ...@@ -96,7 +96,7 @@ stitchFiles = 0;
% -- Main function - no need to edit anything past this point -- % -- Main function - no need to edit anything past this point --
% load the Bio-Formats library into the MATLAB environment % load the Bio-Formats library into the MATLAB environment
status = bfCheckJavaPath(autoloadBioFormats); status = MicroscopeData.Original.BioFormats.bfCheckJavaPath(autoloadBioFormats);
assert(status, ['Missing Bio-Formats library. Either add bioformats_package.jar '... assert(status, ['Missing Bio-Formats library. Either add bioformats_package.jar '...
'to the static Java path or add it to the Matlab path.']); 'to the static Java path or add it to the Matlab path.']);
...@@ -108,10 +108,10 @@ if nargin == 0 || exist(id, 'file') == 0 ...@@ -108,10 +108,10 @@ if nargin == 0 || exist(id, 'file') == 0
end end
% Initialize logging % Initialize logging
bfInitLogging(); MicroscopeData.Original.BioFormats.bfInitLogging();
% Get the channel filler % Get the channel filler
r = bfGetReader(id, stitchFiles); r = MicroscopeData.Original.BioFormats.bfGetReader(id, stitchFiles);
% Test plane size % Test plane size
if nargin >=4 if nargin >=4
...@@ -147,7 +147,7 @@ for s = 1:numSeries ...@@ -147,7 +147,7 @@ for s = 1:numSeries
fprintf('\n '); fprintf('\n ');
end end
fprintf('.'); fprintf('.');
arr = bfGetPlane(r, i, varargin{:}); arr = MicroscopeData.Original.BioFormats.bfGetPlane(r, i, varargin{:});
% retrieve color map data % retrieve color map data
if bpp == 1 if bpp == 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment