Improve compatibility with Linux version of Matlab

Substitute '\' with '/' because it works on Unix based OSes as well
as on Windows version of matlab.
Also filter out . and .. dirs.

diff --git a/Bubliny2023.m b/Bubliny2023.m
index 3c777dd4e6a2c9be29cc2810fd96a864158763c0..66a2b9a886b522d1a76cdd55b7ed515a22ab227c 100755 (executable)
--- a/Bubliny2023.m
+++ b/Bubliny2023.m
@@ -9,11 +9,18 @@ clc;                                                                        % cl
 %%\r
 % User dialog for the data directory used for files\r
 \r
-DirectoryPath='T:\00-Orvalho\Travnickova\Bubble column\';\r
-DirectoryName = uigetdir(DirectoryPath,'Select the data folder');           % returns the name and path of the file selected in the dialog box\r
+%DirectoryPath='T:\00-Orvalho\Travnickova\Bubble column\';\r
+DirectoryName = uigetdir(pwd(), 'Select the data folder');           % returns the name and path of the file selected in the dialog box\r
 disp(['The data directory used for files is ', DirectoryName]);             % displays the name of selected file in Command Window\r
 \r
 DDirectory = dir(DirectoryName);                                            % Loads directories or subdirectories to struct FFiles(1).name, FFiles(1).folder, FFiles(1).date - i s casem\r
+\r
+for iii=numel(DDirectory):-1:1\r
+       if (strcmp(DDirectory(iii).name, ".") || strcmp(DDirectory(iii).name, ".."))\r
+               DDirectory(iii) = [];\r
+       end\r
+end\r
+\r
 list={DDirectory.name};\r
 [Selected,OK] = listdlg('ListString',list,'ListSize',[200 500]);\r
 SelectedDirectory = list(Selected)';                                   \r
@@ -22,8 +29,7 @@ if isempty(SelectedDirectory)                                               % ha
 end\r
 nSelectedDirectory = numel(SelectedDirectory);                              % Counts directories\r
 \r
-[one,Path]=size(DirectoryPath);\r
-ResFile = [DirectoryPath DirectoryName(Path+1:end) '.xlsm'];\r
+ResFile = [DirectoryName '.xlsm'];\r
 \r
 \r
 %%\r
@@ -35,7 +41,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 % read names of all files\r
 \r
     FileType = '*.png';                                                     % extension of image file\r
-    FileName=([DirectoryName '\' cell2mat(SelectedDirectory(iii)) '\' FileType]);\r
+    FileName=([DirectoryName '/' cell2mat(SelectedDirectory(iii)) '/' FileType]);\r
     FFiles = dir(FileName);                                                 % Loads files to struct FFiles(1).name, FFiles(1).folder, FFiles(1).date - i s casem\r
     nFFiles = numel(FFiles);                                                % Counts files\r
     \r
@@ -56,7 +62,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
     nFFiles=endFile;                                                        % Attention!!!\r
     for jjj=[1 startFile:step:nFFiles]                                      % Cycles for figures files\r
         ImageName = FFiles(jjj).name\r
-        Figure = imread([FFiles(jjj).folder '\' ImageName]);  \r
+        Figure = imread([FFiles(jjj).folder '/' ImageName]);  \r
         [p,q]=size(Figure);\r
         ContrastFigure = imadjust(Figure);                                  % Adjust the contrast of the image using imadjust.\r
     \r
@@ -147,9 +153,9 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
             end\r
 \r
             if D_num==1\r
-                plot(MeterScale, [floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2)],'oc','linewidth',2)\r
+                plot(MeterScale, floor(r/2) * ones(10, 1),'oc','linewidth',2)\r
             elseif D_num==2\r
-                plot(MeterScale(1:end-1), [floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2);floor(r/2)],'oc','linewidth',2)\r
+                plot(MeterScale(1:end-1), floor(r/2) * ones(8, 1),'oc','linewidth',2)\r
             end\r
 %--------------------------------------------------------------------------\r
             print ('-dpng', '-r1200', ['Contrasted_meter.png'])\r
@@ -196,11 +202,11 @@ clear ContrastMeterMid
 %--------------------------------------------------------------------------\r
 \r
             xlswrite(ResFile,{'Contrasted meter'},['Met ' cell2mat(SelectedDirectory(iii))],'A2'); %[cell2mat(SelectedDirectory(iii)) ': Meter scale'],'A1'); ['Meter scale ' num2str(iii)]\r
-            xlswritefig(hf1, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))] , 'A4')\r
+            %%xlswritefig(hf1, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))] , 'A4')\r
             xlswrite(ResFile,{'Intensity: places of dashes on the axis'},['Met ' cell2mat(SelectedDirectory(iii))],'A6');\r
-            xlswritefig(hf2, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))], 'B8')\r
+            %%xlswritefig(hf2, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))], 'B8')\r
             xlswrite(ResFile,{'Dashes scale'},['Met ' cell2mat(SelectedDirectory(iii))],'K6'); \r
-            xlswritefig(hf3, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))], 'L8')\r
+            %%xlswritefig(hf3, ResFile, ['Met ' cell2mat(SelectedDirectory(iii))], 'L8')\r
             xlswrite(ResFile,[{'Meter Scale'} {'Dashes scale'}],['Met ' cell2mat(SelectedDirectory(iii))],'A28'); \r
             xlswrite(ResFile,[{'AxisIntens'} {'AxisIntensUp'} {'AxisEmpty'} {'LevelMeter'}],['Met ' cell2mat(SelectedDirectory(iii))],'D28'); \r
             if D_num==1\r
@@ -441,7 +447,7 @@ clear ContrastMeterMid
 %--------------------------------------------------------------------------\r
 \r
 \r
-    xlswritefig(hf4, ResFile, cell2mat(SelectedDirectory(iii)), 'J2')\r
+    %%xlswritefig(hf4, ResFile, cell2mat(SelectedDirectory(iii)), 'J2')\r
 \r
 end  % iii, Cycles for directories with files\r
 \r