UNST-9678: update qp_basedir('exe') in deployed mode on Windows: d3d_qp.exe is not always located in the first folder on the PATH.

Author: hrajagers

src/tools_lgpl/matlab/quickplot/progsrc/md_colormap.m

@@ -306,7 +306,7 @@
         S = convertcolors(S,newspace);
     case 'save'
         try
-            qp_path=qp_basedir;
+            qp_path=qp_basedir('exe');
             clrmap_path=[qp_path filesep 'colormaps'];
         catch
             clrmap_path=pwd;
@@ -386,7 +386,7 @@
         switch cmd
             case 'load'
                 try
-                    qp_path=qp_basedir;
+                    qp_path=qp_basedir('exe');
                     clrmap_path=[qp_path filesep 'colormaps'];
                 catch
                     clrmap_path=pwd;

src/tools_lgpl/matlab/quickplot/progsrc/private/qp_basedir.m

@@ -3,9 +3,12 @@
 %
 %   PATH=QP_BASEDIR(TYPE)
 %   where TYPE=
-%      'base' returns base directory of installation (default).
-%      'exe'  returns directory of executable.
-%      'pref' returns preference directory of installation.
+%      'deploy' returns directory of executable.
+%      'exe'    returns directory of executable (default).
+%      'pref'   returns preference directory of installation.
+
+%      'base'   returns base directory of installation if
+%               matlabversionnumber < 7 (obsolete).
 
 %----- LGPL --------------------------------------------------------------------
 %                                                                               
@@ -38,7 +41,7 @@
 %   $Id$
 
 if nargin==0
-    t='base';
+    t='exe';
 elseif ~ischar(t)
     error('Invalid input argument.');
 end
@@ -93,12 +96,23 @@
 function folder = exeroot
 c = computer;
 if strcmp(c(1:2),'PC')
-   [status, result] = system('set PATH');
+   [~, result] = system('set PATH');
+   linefeed = strfind(result,newline);
    eql = strfind(result,'=');
-   col = strfind(result,';');
-   folder = strtrim(result(eql(1)+1:col(1)-1));
-   filename = check_path([folder filesep 'd3d_qp.version']);
-   folder = fileparts(filename);
+   result = result(eql(1)+1:linefeed(1)-1);
+   folders = strsplit(result,';');
+   folder = '';
+   for i = 1:length(folders)
+       try % typically d3d_qp.exe is located in the first folder, but sometimes in the second one ...
+           filename = check_path([folder filesep 'd3d_qp.exe']);
+           folder = fileparts(filename);
+           return
+       catch
+       end
+   end
+   if isempty(folder)
+       error('Unable to locate the QUICKPLOT executable.')
+   end
 else % Unix
    % call a mex file
    folder = fileparts(exepath);
@@ -142,10 +156,10 @@ function ensure_directory(dirname)
     ensure_directory(parent);
     cd(parent)
     c = computer;
-    if c(1:2) == 'PC'
-        s=dos(['mkdir "',thisdir,'"']);
+    if strcmp(c(1:2),'PC')
+        status = dos(['mkdir "',thisdir,'"']); %#ok<NASGU>
     else
-        s=unix(['mkdir -p ',thisdir]);
+        status = unix(['mkdir -p ',thisdir]); %#ok<NASGU>
     end
 end
 

src/tools_lgpl/matlab/quickplot/progsrc/private/qp_colormap.m

@@ -70,7 +70,7 @@
     %
     % Retreive directory information from QP_BASEDIR.
     %
-    qp_path = qp_basedir('base');
+    qp_path = qp_basedir('exe');
     clrmap_path = [qp_path filesep 'colormaps'];
     %
     % Reset list of loaded colormaps.