From: Lukáš Jiřiště Date: Mon, 1 Jul 2024 09:46:39 +0000 (+0200) Subject: Fix spelling mistakes X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;h=ff7ca855c4d2903b904a1af30068799d637aa30e;p=Bubble_column.git Fix spelling mistakes --- diff --git a/Bubliny2023.m b/Bubliny2023.m index e9d2957..c3bec7f 100755 --- a/Bubliny2023.m +++ b/Bubliny2023.m @@ -48,9 +48,9 @@ for iii=1:1:nSelectedDirectory % Cycles for directories with files %% variable allocation LevelNum = zeros(1,nFFiles); - Heihgt = zeros(1,nFFiles); + Height = zeros(1,nFFiles); Metr_fit_H = zeros(1,nFFiles); - Botom = zeros(1,nFFiles); + Bottom = zeros(1,nFFiles); Metr_fit_B = zeros(1,nFFiles); %% @@ -80,7 +80,7 @@ for iii=1:1:nSelectedDirectory % Cycles for directories with files ContrastFigureFin(p1+1:p1+p2,1:q)=ContrastFigure2; ContrastFigureFin(p1+p2+1:p1+p2+p3,1:q)=ContrastFigure3; - IntensitaAverFin{jjj}= mean(ContrastFigureFin); + IntensitiesAverFin{jjj}= mean(ContrastFigureFin); % figure % imshow(ContrastFigure1) @@ -222,17 +222,17 @@ clear ContrastMeterMid figure imshow(ContrastFigure) hold on - plot(IntensitaAverFin{jjj},'-y','linewidth',2) + plot(IntensitiesAverFin{jjj},'-y','linewidth',2) hold on if jjj>=startFile+step %subtracts the intensities - plot(IntensitaAverFin{jjj-step},'Color',[0.9290 0.6940 0.1250],'linewidth',2) + plot(IntensitiesAverFin{jjj-step},'Color',[0.9290 0.6940 0.1250],'linewidth',2) hold on - IntensitaAverFin_2{jjj}=IntensitaAverFin{jjj}-IntensitaAverFin{jjj-step}; - waytrend=mean(IntensitaAverFin_2{jjj},2); % waytrend will tell whether to calculate the minimum or maximum green intensity IntensitaAverFin_2{jjj} + IntensitiesAverFin_2{jjj}=IntensitiesAverFin{jjj}-IntensitiesAverFin{jjj-step}; + waytrend=mean(IntensitiesAverFin_2{jjj},2); % waytrend will tell whether to calculate the minimum or maximum green intensity IntensitiesAverFin_2{jjj} if waytrend<=0; - plot(-IntensitaAverFin_2{jjj},'-g','linewidth',2) + plot(-IntensitiesAverFin_2{jjj},'-g','linewidth',2) else - plot(IntensitaAverFin_2{jjj},'-g','linewidth',2) + plot(IntensitiesAverFin_2{jjj},'-g','linewidth',2) end hold on end @@ -247,57 +247,57 @@ clear ContrastMeterMid % % 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 - [pk,lk] = findpeaks(-IntensitaAverFin{jjj}(1:(LevelPixels+30))); %10 - [Heihgt(1,jjj),pkH]=max(pk); + [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(1:(LevelPixels+30))); %10 + [Height(1,jjj),pkH]=max(pk); qH=lk(pkH); Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH); - plot(qH,-Heihgt(jjj),'or','linewidth',2) + plot(qH,-Height(jjj),'or','linewidth',2) if jjj>=startFile+step LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100); % x level in pixels in the original image if waytrend<=0; - [pk,lk] = findpeaks(-IntensitaAverFin_2{jjj}(1:(LevelPixels+30))); %10 + [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(1:(LevelPixels+30))); %10 else - [pk,lk] = findpeaks(IntensitaAverFin_2{jjj}(1:(LevelPixels+30))); %10 + [pk,lk] = findpeaks(IntensitiesAverFin_2{jjj}(1:(LevelPixels+30))); %10 end - [Heihgt(1,jjj),pkH]=max(pk); + [Height(1,jjj),pkH]=max(pk); if max(pk)>=10; % error cleaning %30 qH=lk(pkH); Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH); end - plot(qH,Heihgt(jjj),'om','linewidth',2) + plot(qH,Height(jjj),'om','linewidth',2) end elseif D_num==2 if jjj=startFile+step LevelPixels=MeterScale(1); % x level in pixels in the original image if waytrend<=0; - [pk,lk] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 else - [pk,lk] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk,lk] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 end - [Heihgt(1,jjj),pkH]=max(pk); + [Height(1,jjj),pkH]=max(pk); qH=LevelPixels+lk(pkH); Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH); if max(pk)<30; % error cleaning %30 qH=NaN; Metr_fit_H(1,jjj)=NaN; end - plot(qH,Heihgt(jjj),'om','linewidth',2) + plot(qH,Height(jjj),'om','linewidth',2) end end if D_num==1 if jjj=(Metr_fit_H(1,jjj)-2) % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface Metr_fit_B(1,jjj)=NaN; qB=NaN; - elseif Botom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62 % 0.65 is an estimate of how much intensity the bubbles need + elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62 % 0.65 is an estimate of how much intensity the bubbles need Metr_fit_B(1,jjj)=NaN; % For 1-4 files qB=NaN; end - plot(qB,Botom(jjj),'ob','linewidth',2) + plot(qB,Bottom(jjj),'ob','linewidth',2) end if jjj>=startFile+step LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100); % x level in pixels in the original image if waytrend<=0; - [pk2,lk2] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 else - [pk2,lk2] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk2,lk2] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 end - [Botom(1,jjj),pk2B]=max(pk2); + [Bottom(1,jjj),pk2B]=max(pk2); qB=LevelPixels+lk2(pk2B); Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB); if max(pk2)<=45; % error cleaning qB=NaN; Metr_fit_B(1,jjj)=NaN; end - plot(qB,Botom(jjj),'oc','linewidth',2) + plot(qB,Bottom(jjj),'oc','linewidth',2) end elseif D_num==2 if jjj=(Metr_fit_H(1,jjj)-2) % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface Metr_fit_B(1,jjj)=NaN; qB=NaN; - elseif Botom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62 % 0.65 is an estimate of how much intensity the bubbles need + elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62 % 0.65 is an estimate of how much intensity the bubbles need Metr_fit_B(1,jjj)=NaN; % For 1-4 files qB=NaN; end - plot(qB,Botom(jjj),'ob','linewidth',2) + plot(qB,Bottom(jjj),'ob','linewidth',2) end if jjj>=startFile+step LevelPixels=MeterScale(1); % x level in pixels in the original image if waytrend<=0; - [pk2,lk2] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 else - [pk2,lk2] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end)); %10 + [pk2,lk2] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end)); %10 end - [Botom(1,jjj),pk2B]=max(pk2); + [Bottom(1,jjj),pk2B]=max(pk2); qB=LevelPixels+lk2(pk2B); Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB); if max(pk2)<=20; % error cleaning qB=NaN; Metr_fit_B(1,jjj)=NaN; end - plot(qB,Botom(jjj),'oc','linewidth',2) + plot(qB,Bottom(jjj),'oc','linewidth',2) end end - writematrix(["ImageName" "Date" "Time [s]" "Intensita Heihgt [-]" "Intensita Botom [-]" "Heihgt [cm]" "Botom [cm]" "Level [cm]"], ResFile, "Sheet", SelectedDirectory{iii}, "Range", "A1:H1"); - writematrix([ImageName string(Date(1,jjj)) seconds(Time(1,jjj)) Heihgt(1,jjj) Botom(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" "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)]); clear Figure clear ContrastFigure @@ -425,7 +424,7 @@ clear ContrastMeterMid clear ContrastFigure2 clear ContrastFigure3 clear ContrastFigureFin - % clear IntensitaAverFin + % clear IntensitiesAverFin end % jjj, Cycles for figures files @@ -439,7 +438,7 @@ clear ContrastMeterMid xlabel('time [s]','FontWeight','bold'); ylabel('position [cm]','FontWeight','bold'); grid('on'); - [legend_h,object_h,plot_h,text_strings] = legend([hp1,hp2,hp3],'Heihgt', 'Botom', 'Level','Location','southeast' ); + [legend_h,object_h,plot_h,text_strings] = legend([hp1,hp2,hp3],'Height', 'Bottom', 'Level','Location','southeast' ); set(legend_h, 'Box', 'off', 'FontSize',7) %--------------------------------------------------------------------------