From: Lukáš Jiřiště Date: Tue, 20 Aug 2024 12:33:16 +0000 (+0200) Subject: Remove pointless comentary X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=b2ea02b1eaa49440c44ec52e33542cf0cf22dd65;p=Bubble_column.git Remove pointless comentary --- diff --git a/Bubliny.m b/Bubliny.m index 22a243e..865dece 100755 --- a/Bubliny.m +++ b/Bubliny.m @@ -13,9 +13,9 @@ end 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) = []; +for i=numel(DDirectory):-1:1 + if (strcmp(DDirectory(i).name, ".") || strcmp(DDirectory(i).name, "..")) + DDirectory(i) = []; end end @@ -35,43 +35,39 @@ end ResFile = [res_path, ResFile]; %} -% helper variables FileType = '*.png'; -% load of all directories in cycles -for iii=1:nSelectedDirectory % Cycles for directories with files -% read names of all files - FileName=([DirectoryName '/' SelectedDirectory{iii} '/' FileType]); +% process all directories in cycles +for i=1:nSelectedDirectory + FileName=([DirectoryName '/' SelectedDirectory{i} '/' FileType]); FFiles = dir(FileName); % Loads files to struct FFiles(1).name, FFiles(1).folder, FFiles(1).date - i s casem -% Initiation from the first file ImageName = FFiles(1).name; start_time = name_to_time(FFiles(1).name); Figure = imread([FFiles(1).folder '/' ImageName]); - %%D_num=str2double(SelectedDirectory{iii}(21)); % position of camera + %%D_num=str2double(SelectedDirectory{i}(21)); % position of camera [image_width, image_height] = size(Figure); sumfig = zeros(image_width, image_height); minfig = Figure; maxfig = Figure; -% load of all files in cycles step = 10; - startFile = 1; %945; %200 (20. ) - endFile = numel(FFiles); %nFFiles; %1000; %325 (20.) + startFile = 1; + endFile = numel(FFiles); wait_bar = waitbar(0, ''); set(gca(wait_bar).Title, 'Interpreter', 'none'); - for jjj=startFile:step:endFile % Cycles for figures files - ImageName = FFiles(jjj).name; - Figure = imread([FFiles(jjj).folder '/' ImageName]); + for j=startFile:step:endFile + ImageName = FFiles(j).name; + Figure = imread([FFiles(j).folder '/' ImageName]); - waitbar((jjj - startFile)/(endFile - startFile), wait_bar, ['Preproccessing images from meassurement ' num2str(iii) '/' num2str(nSelectedDirectory)]); + waitbar((j - startFile)/(endFile - startFile), wait_bar, ['Preproccessing images from meassurement ' num2str(i) '/' num2str(nSelectedDirectory)]); sumfig = sumfig + double(Figure); minfig = min(minfig, Figure); maxfig = max(maxfig, Figure); - end % jjj, Cycles for figures files + end close(wait_bar); @@ -111,7 +107,7 @@ for iii=1:nSelectedDirectory % Cycles for directories with files file_ind = startFile + (j - 1) * step; ImageName = FFiles(file_ind).name; Figure = imread([FFiles(file_ind).folder '/' ImageName]); - waitbar(j/N, wait_bar, ['Proccessing images from meassurement ' num2str(iii) '/' num2str(nSelectedDirectory)]); + waitbar(j/N, wait_bar, ['Proccessing images from meassurement ' num2str(i) '/' num2str(nSelectedDirectory)]); intensity = mean(double(Figure), Weights = mask); [water(j), bubble_top(j), bubble_bot(j)] = get_levels(intensity); end @@ -120,4 +116,4 @@ for iii=1:nSelectedDirectory % Cycles for directories with files figure plot(meter([water; bubble_top; bubble_bot]')); -end % iii, Cycles for directories with files +end