From: Lukáš Jiřiště <jiriste@icpf.cas.cz>
Date: Wed, 31 Jul 2024 09:54:37 +0000 (+0200)
Subject: Move LevelNum out of the loop
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=7f61af6f92dfc56906cb7f29eb9269f1dfa4459d;p=Bubble_column.git

Move LevelNum out of the loop

As it is only read from the name of the directory, there are no changes
between iterations. LevelNum should eventually track the ACTUAL level.
When that time comes, it will be reintroduced to the loop as an array.
---

diff --git a/Bubliny.m b/Bubliny.m
index 9534b11..ee11a3b 100755
--- a/Bubliny.m
+++ b/Bubliny.m
@@ -50,10 +50,10 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 	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
+	LevelNum=str2double(SelectedDirectory{iii}(7:9))*1000;
 
 %% variable allocation
 
-	LevelNum = zeros(1,nFFiles);
 	Height = zeros(1,nFFiles);
 	Metr_fit_H = zeros(1,nFFiles);
 	Bottom = zeros(1,nFFiles);
@@ -101,12 +101,10 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 		Time(jjj)=duration([(ImageName(8:9)) ':' (ImageName(10:11)) ':' (ImageName(12:16))],'Format',infmt) - start_time;
 		infmd = ['yy' 'MM' 'dd'];
 		Date(jjj) = datetime(ImageName(1:6),'InputFormat',infmd);
-		Level(jjj,1:3)=SelectedDirectory{iii}(7:9);
-		LevelNum(1,jjj)=str2double(Level(jjj,:))*1000;
 
 		% % plot(lk,abs(pk),'oc','linewidth',2)
 		if D_num==1
-			LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image
+			LevelPixels=MeterScale(1+(1000-LevelNum)/100);                 % x level in pixels in the original image
 			if jjj<startFile+step
 				[pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(1:(LevelPixels+30)));  %10
 				[Height(1,jjj),pkH]=max(pk);
@@ -193,7 +191,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 			plot(ax, qB, Bottom(jjj), 'ob', 'linewidth', 2)
 		else
 			if D_num==1
-				LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image
+				LevelPixels=MeterScale(1+(1000-LevelNum)/100);                 % x level in pixels in the original image
 				if waytrend<=0;
 					[pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10
 				else
@@ -226,7 +224,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 		end
 
 		writematrix(["ImageName" "Date" "Time [s]" "Intensities Height [-]" "Intensities Bottom [-]" "Height [cm]" "Bottom [cm]" "Level [cm]"], ResFile, "Sheet", SelectedDirectory{iii}, "Range", "A1:H1");
-		writematrix([ImageName string(Date(1,jjj)) seconds(Time(1,jjj)) Height(1,jjj) Bottom(1,jjj) Metr_fit_H(1,jjj) Metr_fit_B(1,jjj) str2double(SelectedDirectory{iii}(7:9))], ResFile, "Sheet", SelectedDirectory{iii}, "Range", ['A' num2str(jjj+1) ':H' num2str(jjj+1)]);
+		writematrix([ImageName string(Date(1,jjj)) seconds(Time(1,jjj)) Height(1,jjj) Bottom(1,jjj) Metr_fit_H(1,jjj) Metr_fit_B(1,jjj) LevelNum], ResFile, "Sheet", SelectedDirectory{iii}, "Range", ['A' num2str(jjj+1) ':H' num2str(jjj+1)]);
 
 		clear Figure
 		clear ContrastFigure
@@ -239,7 +237,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 	hold on
 	hp2=plot(seconds(Time(startFile:step:end)), Metr_fit_B(startFile:step:nFFiles),'-ob','linewidth',2);
 	hold on
-	hp3=plot(seconds(Time(startFile:step:end)),LevelNum(1,startFile:step:nFFiles)','-og','linewidth',2);
+	hp3=plot(seconds(Time(startFile:step:end)),LevelNum*ones(size(Time(startFile:step:end))),'-og','linewidth',2);
 
 	xlabel('time [s]','FontWeight','bold');
 	ylabel('position [cm]','FontWeight','bold');