Merge pull request #514 from HJZollner/develop

Prepare windwos compilation
schorschinho · Sep 6, 2022 · 4dd5145 · 4dd5145
2 parents 0b1fde5 + c1f0b9c
commit 4dd5145
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/job/CreateOspreyJob.mlapp b/job/CreateOspreyJob.mlapp
diff --git a/job/CreateOspreyJob_app.m b/job/CreateOspreyJob_app.m
@@ -497,11 +497,11 @@ function StatcsvFileButtonPushed(app, event)
 
         % Button pushed function: basissetfileButton
         function basissetfileButtonPushed(app, event)
-            info = 'Select a .mat basis file to overwrite the automatic basis set selection';
+            info = 'Select a basis file (.mat for Osprey / .basis for LCModel) to overwrite the automatic basis set selection';
 
             ndata = 1;
 
-            basisfiles = spm_select(ndata,'any',info,{},pwd,'any','1');
+            basisfiles = spm_select(ndata,'any',info,{},pwd,{'.mat','.BASIS','.basis'},'1');
 
             app.BasisSetEditField.Value = basisfiles(1,:);
 

diff --git a/settings/OspreySettings.m b/settings/OspreySettings.m
@@ -95,17 +95,30 @@
 MRSCont.flags.didOverview   = 0;
 
 if (ismcc || isdeployed)
-    currentDir = ctfroot;
-    [currentDir,~,~] = fileparts(currentDir);
-    SepFileList =  split(currentDir, filesep);
     if ismac
+        currentDir = ctfroot;
+        [currentDir,~,~] = fileparts(currentDir);
+         SepFileList =  split(currentDir, filesep);
         index = find(strcmp(SepFileList,'application'));
         if ~isempty(index)
             MRSCont.opts.fit.basissetFolder = fullfile(SepFileList{1:index},'basissets');
         else
             MRSCont.opts.fit.basissetFolder = [];
         end
     end
+    if ispc
+        [~, result] = system('path');
+        currentDir = char(regexpi(result, 'Path=(.*?);', 'tokens', 'once'));
+        SepFileList =  split(currentDir, filesep);
+        MRSCont.opts.fit.basissetFolder =currentDir;
+        index = find(strcmp(SepFileList,'application'));
+        if ~isempty(index)
+            MRSCont.opts.fit.basissetFolder = fullfile(SepFileList{1:index},'basissets');
+        else
+            MRSCont.opts.fit.basissetFolder = [];
+        end
+    end
+
 else
     MRSCont.opts.fit.basissetFolder = [];
 end