From: Lukáš Jiřiště <jiriste@icpf.cas.cz>
Date: Wed, 19 Jun 2024 09:37:33 +0000 (+0200)
Subject: Improve compatibility with Linux version of Matlab
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=7e387df447f9f42a7a24687b4d5c2317172f2823;p=Bubble_column.git

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