From 7873c40932d5ffe18b9ef8b90913d56c33720553 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Luk=C3=A1=C5=A1=20Ji=C5=99i=C5=A1t=C4=9B?= Date: Mon, 29 Jul 2024 15:54:09 +0200 Subject: [PATCH] Deobfuscate the code a little Move some other pieces of code outside of the loop. Use ImageName instead of FFiles(jjj).name. --- Bubliny.m | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Bubliny.m b/Bubliny.m index 2e2e869..01a304d 100755 --- a/Bubliny.m +++ b/Bubliny.m @@ -35,6 +35,9 @@ if (ResFile == 0) end ResFile = [res_path, ResFile]; +% helper variables +infmt = 'hh:mm:ss.SS'; % Time format in file names +FileType = '*.png'; % extension of image file %% % load of all directories in cycles @@ -44,7 +47,6 @@ for iii=1:1:nSelectedDirectory % Cycles for directories with files %% % read names of all files - FileType = '*.png'; % extension of image file FileName=([DirectoryName '/' 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 @@ -58,14 +60,15 @@ for iii=1:1:nSelectedDirectory % Cycles for directories with files Metr_fit_B = zeros(1,nFFiles); %% -% Load the dimensions from the 1st image (p&q in pxl) +% Initiation from the first file ImageName = FFiles(1).name; + start_time = duration([(ImageName(8:9)) ':' (ImageName(10:11)) ':' (ImageName(12:16))],'Format',infmt); Figure = imread([FFiles(1).folder '/' ImageName]); ContrastFigure = imadjust(Figure); % Adjust the contrast of the image using imadjust. [MeterScale, polypar_Metr] = meter(SelectedDirectory{iii}, ContrastFigure, ResFile); D_num=str2double(SelectedDirectory{iii}(21)); % position of camera -% load of all files in cycles +% load of all files in cycles step=1; startFile= 40; %945; %200 (20. ) endFile= 110; %nFFiles; %1000; %325 (20.) @@ -119,10 +122,9 @@ for iii=1:1:nSelectedDirectory % Cycles for directories with files hold on end - infmt = 'hh:mm:ss.SS'; - Time(jjj)=duration([(FFiles(jjj).name(8:9)) ':' (FFiles(jjj).name(10:11)) ':' (FFiles(jjj).name(12:16))],'Format',infmt)-duration([(FFiles(1).name(8:9)) ':' (FFiles(1).name(10:11)) ':' (FFiles(1).name(12:16))],'Format',infmt); + Time(jjj)=duration([(ImageName(8:9)) ':' (ImageName(10:11)) ':' (ImageName(12:16))],'Format',infmt) - start_time; infmd = ['yy' 'MM' 'dd']; - Date(jjj) = datetime(FFiles(jjj).name(1:6),'InputFormat',infmd); + Date(jjj) = datetime(ImageName(1:6),'InputFormat',infmd); Level(jjj,1:3)=SelectedDirectory{iii}(7:9); LevelNum(1,jjj)=str2double(Level(jjj,:))*1000; -- 2.30.2