Merge branch 'master' of github.com:kristinbranson/BABAM

# Conflicts:
#	docs/index.html

ExploreBehaviorAnatomyCorrelations.m

@@ -74,6 +74,12 @@ function ExploreBehaviorAnatomyCorrelations_OpeningFcn(hObject, eventdata, handl
 
 function handles = InitializeParameters(handles,varargin)
 
+[handles.isanatomydir,leftovers] = myparse_nocheck(varargin,'isanatomydir',[]);
+disp(varargin(:));
+
+if ischar(handles.isanatomydir),
+  handles.isanatomydir = str2double(handles.isanatomydir);
+end
 handles.dologcmap = true;
 handles.minpvalue_log = .0001;
 handles.maxpvalue = .051;
@@ -101,7 +107,7 @@ function ExploreBehaviorAnatomyCorrelations_OpeningFcn(hObject, eventdata, handl
 global EBAC_DATA;
 
 EBAC_DATA = BehaviorAnatomyCorrData('SetStatusFcn',@(varargin) SetStatusCallback(handles.figure1,varargin{:}),...
-  'ClearStatusFcn',@(varargin) ClearStatusCallback(handles.figure1,varargin{:}),varargin{:});
+  'ClearStatusFcn',@(varargin) ClearStatusCallback(handles.figure1,varargin{:}),leftovers{:});
 
 if isunix,
   handles.rcfile = getenv('HOME');
@@ -195,7 +201,10 @@ function ExploreBehaviorAnatomyCorrelations_OpeningFcn(hObject, eventdata, handl
   return;
 end
 
-if ~exist(EBAC_DATA.anatomydir,'dir'),
+if ~isempty(handles.isanatomydir) && (handles.isanatomydir == 0),
+  EBAC_DATA.anatomydir = '';
+  fprintf('No access to per-line anatomy image directory.\n');
+elseif ~exist(EBAC_DATA.anatomydir,'dir'),
   res = questdlg('Do you have access to the per-line anatomy image directory?');
   if strcmpi(res,'yes'),
     fprintf('Select per-line anatomy image directory. Example: AverageAnatomyData20141028...\n');

docs/index.html

@@ -102,7 +102,7 @@ <h2><a id="DataLocs">Specifying Data Locations</a></h2>
 </li>
 <li> <a href="images/ScreenShot_SelectSupervoxelDataMATFile.png"><b>Supervoxel Clustering Data MAT File</b></a>: MAT file containing the supervoxel clustering of the brain. This data can be downloaded at <a href="http://research.janelia.org/bransonlab/FlyBowl/BABAMMATFiles/current/SupervoxelClusteringData.mat">SupervoxelClusteringData.mat</a>. <br>
 </li>
-<li> <a href="images/ScreenShot_SelectAnatomyDir.png"><b>Per-line Anatomy Image Directory</b></a>: Directory containing normalized, registered images of the expression patterns for each brain. This data can be downloaded at <a href="http://research.janelia.org/bransonlab/FlyBowl/BABAMMATFiles/current/AverageAnatomyData.zip">AverageAnatomyData.zip</a>.<br>
+<li> <a href="images/ScreenShot_SelectAnatomyDir.png"><b>Per-line Anatomy Image Directory</b></a>: Directory containing normalized, registered images of the expression patterns for each brain. This data can be downloaded at <a href="http://research.janelia.org/bransonlab/FlyBowl/BABAMMATFiles/current/AverageAnatomyData.zip">AverageAnatomyData</a>.<br>
 </li>
 </ol>