Fix spelling mistakes
authorLukáš Jiřiště <jiriste@icpf.cas.cz>
Mon, 1 Jul 2024 09:46:39 +0000 (11:46 +0200)
committerLukáš Jiřiště <jiriste@icpf.cas.cz>
Mon, 22 Jul 2024 08:19:34 +0000 (10:19 +0200)
Bubliny2023.m

index e9d2957c1efd68b9eb00e6adb34e54c5d44127d7..c3bec7fdbc8277d07022a812e270eb414b3aad26 100755 (executable)
@@ -48,9 +48,9 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
 %% variable allocation\r
 \r
        LevelNum = zeros(1,nFFiles);\r
-       Heihgt = zeros(1,nFFiles);\r
+       Height = zeros(1,nFFiles);\r
        Metr_fit_H = zeros(1,nFFiles);\r
-       Botom = zeros(1,nFFiles);\r
+       Bottom = zeros(1,nFFiles);\r
        Metr_fit_B = zeros(1,nFFiles);\r
 \r
 %%\r
@@ -80,7 +80,7 @@ for iii=1:1:nSelectedDirectory  % Cycles for directories with files
                ContrastFigureFin(p1+1:p1+p2,1:q)=ContrastFigure2;\r
                ContrastFigureFin(p1+p2+1:p1+p2+p3,1:q)=ContrastFigure3;\r
 \r
-               IntensitaAverFin{jjj}= mean(ContrastFigureFin);\r
+               IntensitiesAverFin{jjj}= mean(ContrastFigureFin);\r
 \r
                % figure\r
                % imshow(ContrastFigure1)\r
@@ -222,17 +222,17 @@ clear ContrastMeterMid
                figure\r
                imshow(ContrastFigure)\r
                hold on\r
-               plot(IntensitaAverFin{jjj},'-y','linewidth',2)\r
+               plot(IntensitiesAverFin{jjj},'-y','linewidth',2)\r
                hold on\r
                if jjj>=startFile+step                                                            %subtracts the intensities\r
-                       plot(IntensitaAverFin{jjj-step},'Color',[0.9290 0.6940 0.1250],'linewidth',2)\r
+                       plot(IntensitiesAverFin{jjj-step},'Color',[0.9290 0.6940 0.1250],'linewidth',2)\r
                        hold on\r
-                       IntensitaAverFin_2{jjj}=IntensitaAverFin{jjj}-IntensitaAverFin{jjj-step};\r
-                       waytrend=mean(IntensitaAverFin_2{jjj},2);                                  % waytrend will tell whether to calculate the minimum or maximum green intensity IntensitaAverFin_2{jjj}\r
+                       IntensitiesAverFin_2{jjj}=IntensitiesAverFin{jjj}-IntensitiesAverFin{jjj-step};\r
+                       waytrend=mean(IntensitiesAverFin_2{jjj},2);                                  % waytrend will tell whether to calculate the minimum or maximum green intensity IntensitiesAverFin_2{jjj}\r
                        if waytrend<=0;\r
-                               plot(-IntensitaAverFin_2{jjj},'-g','linewidth',2)\r
+                               plot(-IntensitiesAverFin_2{jjj},'-g','linewidth',2)\r
                        else\r
-                               plot(IntensitaAverFin_2{jjj},'-g','linewidth',2)\r
+                               plot(IntensitiesAverFin_2{jjj},'-g','linewidth',2)\r
                        end\r
                        hold on\r
                end\r
@@ -247,57 +247,57 @@ clear ContrastMeterMid
                % % plot(lk,abs(pk),'oc','linewidth',2)\r
                if D_num==1\r
                        LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image\r
-                       [pk,lk] = findpeaks(-IntensitaAverFin{jjj}(1:(LevelPixels+30)));  %10\r
-                       [Heihgt(1,jjj),pkH]=max(pk);\r
+                       [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(1:(LevelPixels+30)));  %10\r
+                       [Height(1,jjj),pkH]=max(pk);\r
                        qH=lk(pkH);\r
                        Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
-                       plot(qH,-Heihgt(jjj),'or','linewidth',2)\r
+                       plot(qH,-Height(jjj),'or','linewidth',2)\r
                        if jjj>=startFile+step\r
                                LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);             % x level in pixels in the original image\r
                                if waytrend<=0;\r
-                                       [pk,lk] = findpeaks(-IntensitaAverFin_2{jjj}(1:(LevelPixels+30)));  %10\r
+                                       [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(1:(LevelPixels+30)));  %10\r
                                else\r
-                                       [pk,lk] = findpeaks(IntensitaAverFin_2{jjj}(1:(LevelPixels+30)));  %10\r
+                                       [pk,lk] = findpeaks(IntensitiesAverFin_2{jjj}(1:(LevelPixels+30)));  %10\r
                                end\r
-                               [Heihgt(1,jjj),pkH]=max(pk);\r
+                               [Height(1,jjj),pkH]=max(pk);\r
                                if max(pk)>=10;                                                 % error cleaning %30\r
                                        qH=lk(pkH);\r
                                        Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
                                end\r
-                               plot(qH,Heihgt(jjj),'om','linewidth',2)\r
+                               plot(qH,Height(jjj),'om','linewidth',2)\r
                        end\r
 \r
                elseif D_num==2\r
                        if jjj<startFile+step\r
                                LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
-                               [pk,lk] = findpeaks(-IntensitaAverFin{jjj}(LevelPixels:end));  %10\r
-                               [Heihgt(1,jjj),pkH]=max(pk);\r
+                               [pk,lk] = findpeaks(-IntensitiesAverFin{jjj}(LevelPixels:end));  %10\r
+                               [Height(1,jjj),pkH]=max(pk);\r
                                qH=LevelPixels+lk(pkH);\r
                                Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
-                               plot(qH,-Heihgt(jjj),'or','linewidth',2)\r
+                               plot(qH,-Height(jjj),'or','linewidth',2)\r
                        elseif jjj>=startFile+step\r
                                        LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
-                                       [pk,lk] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk,lk] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                else\r
-                                       [pk,lk] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk,lk] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                end\r
-                                       [Heihgt(1,jjj),pkH]=max(pk);\r
+                                       [Height(1,jjj),pkH]=max(pk);\r
                                        qH=LevelPixels+lk(pkH);\r
                                        Metr_fit_H(1,jjj)=polyval(polypar_Metr,qH);\r
                                        if max(pk)<30;                                                 % error cleaning %30\r
                                                qH=NaN;\r
                                                Metr_fit_H(1,jjj)=NaN;\r
                                        end\r
-                                       plot(qH,Heihgt(jjj),'om','linewidth',2)\r
+                                       plot(qH,Height(jjj),'om','linewidth',2)\r
                        end\r
                end\r
 \r
                if D_num==1\r
                        if jjj<startFile+step\r
-                               [pk2,lk2] = findpeaks(-IntensitaAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
+                               [pk2,lk2] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
 \r
-                               [pk3,lk3] = findpeaks(-IntensitaAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
+                               [pk3,lk3] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
                                [one,nqq]=size(lk3);\r
                                [one,npp]=size(lk2);\r
 \r
@@ -321,42 +321,42 @@ clear ContrastMeterMid
                                % % plot(lk2,abs(pk2),'om','linewidth',2)\r
                                hold on\r
 \r
-                               [Botom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
+                               [Bottom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
                                qB=lk2(pk2B);                             % For 1-4 files\r
 \r
                                Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
                                if Metr_fit_B(1,jjj)>=(Metr_fit_H(1,jjj)-2)                                 % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface\r
                                        Metr_fit_B(1,jjj)=NaN;\r
                                        qB=NaN;\r
-                               elseif Botom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
+                               elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
                                        Metr_fit_B(1,jjj)=NaN;                                                % For 1-4 files\r
                                        qB=NaN;\r
                                end\r
-                               plot(qB,Botom(jjj),'ob','linewidth',2)\r
+                               plot(qB,Bottom(jjj),'ob','linewidth',2)\r
                        end\r
 \r
                        if jjj>=startFile+step\r
                                LevelPixels=MeterScale(1+(1000-LevelNum(1,jjj))/100);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
-                                       [pk2,lk2] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                else\r
-                                       [pk2,lk2] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk2,lk2] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                end\r
-                               [Botom(1,jjj),pk2B]=max(pk2);\r
+                               [Bottom(1,jjj),pk2B]=max(pk2);\r
                                qB=LevelPixels+lk2(pk2B);\r
                                Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
                                if max(pk2)<=45;                                                            % error cleaning\r
                                        qB=NaN;\r
                                        Metr_fit_B(1,jjj)=NaN;\r
                                end\r
-                               plot(qB,Botom(jjj),'oc','linewidth',2)\r
+                               plot(qB,Bottom(jjj),'oc','linewidth',2)\r
                        end\r
 \r
                elseif D_num==2\r
                        if jjj<startFile+step\r
-                               [pk2,lk2] = findpeaks(-IntensitaAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
+                               [pk2,lk2] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5);                         % Small peaks at the bubble/liquid interface\r
 \r
-                               [pk3,lk3] = findpeaks(-IntensitaAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
+                               [pk3,lk3] = findpeaks(-IntensitiesAverFin{jjj},'MinPeakProminence',5,'MinPeakDistance',30);    % Throw out small random peaks in the liquid, peaks far apart cca 1cm\r
                                [one,nqq]=size(lk3);\r
                                [one,npp]=size(lk2);\r
 \r
@@ -380,44 +380,43 @@ clear ContrastMeterMid
                                % % plot(lk2,abs(pk2),'om','linewidth',2)\r
                                hold on\r
 \r
-                               [Botom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
+                               [Bottom(1,jjj),pk2B]=max(abs(pk2));        % For 1-4 files\r
                                qB=lk2(pk2B);                             % For 1-4 files\r
 \r
-                               % [Botom(1,jjj),pk2B]=max(abs(pk));           % For 5. files\r
+                               % [Bottom(1,jjj),pk2B]=max(abs(pk));           % For 5. files\r
                                % qB=lk(pk2B);                                % For 5. files\r
 \r
                                Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
                                if Metr_fit_B(1,jjj)>=(Metr_fit_H(1,jjj)-2)                                 % Throw out the bubble/liquid interface if it is above the surface, 2cm 2D interface\r
                                        Metr_fit_B(1,jjj)=NaN;\r
                                        qB=NaN;\r
-                               elseif Botom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
+                               elseif Bottom(1,jjj)<=(max(abs(pk))+min(abs(pk)))*0.62                     % 0.65 is an estimate of how much intensity the bubbles need\r
                                        Metr_fit_B(1,jjj)=NaN;                                                % For 1-4 files\r
                                        qB=NaN;\r
                                end\r
-                               plot(qB,Botom(jjj),'ob','linewidth',2)\r
+                               plot(qB,Bottom(jjj),'ob','linewidth',2)\r
                        end\r
 \r
                        if jjj>=startFile+step\r
                                LevelPixels=MeterScale(1);                 % x level in pixels in the original image\r
                                if waytrend<=0;\r
-                                       [pk2,lk2] = findpeaks(-IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk2,lk2] = findpeaks(-IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                else\r
-                                       [pk2,lk2] = findpeaks(IntensitaAverFin_2{jjj}(LevelPixels:end));  %10\r
+                                       [pk2,lk2] = findpeaks(IntensitiesAverFin_2{jjj}(LevelPixels:end));  %10\r
                                end\r
-                               [Botom(1,jjj),pk2B]=max(pk2);\r
+                               [Bottom(1,jjj),pk2B]=max(pk2);\r
                                qB=LevelPixels+lk2(pk2B);\r
                                Metr_fit_B(1,jjj)=polyval(polypar_Metr,qB);\r
                                if max(pk2)<=20;                                                          % error cleaning\r
                                        qB=NaN;\r
                                        Metr_fit_B(1,jjj)=NaN;\r
                                end\r
-                               plot(qB,Botom(jjj),'oc','linewidth',2)\r
+                               plot(qB,Bottom(jjj),'oc','linewidth',2)\r
                        end\r
                end\r
 \r
-               writematrix(["ImageName" "Date" "Time [s]" "Intensita Heihgt [-]" "Intensita Botom [-]" "Heihgt [cm]" "Botom [cm]" "Level [cm]"], ResFile, "Sheet", SelectedDirectory{iii}, "Range", "A1:H1");\r
-               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)]);\r
-\r
+               writematrix(["ImageName" "Date" "Time [s]" "Intensities Height [-]" "Intensities Bottom [-]" "Height [cm]" "Bottom [cm]" "Level [cm]"], ResFile, "Sheet", SelectedDirectory{iii}, "Range", "A1:H1");\r
+               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)]);\r
 \r
                clear Figure\r
                clear ContrastFigure\r
@@ -425,7 +424,7 @@ clear ContrastMeterMid
                clear ContrastFigure2\r
                clear ContrastFigure3\r
                clear ContrastFigureFin\r
-               % clear IntensitaAverFin\r
+               % clear IntensitiesAverFin\r
 \r
        end  % jjj, Cycles for figures files\r
 \r
@@ -439,7 +438,7 @@ clear ContrastMeterMid
        xlabel('time [s]','FontWeight','bold');\r
        ylabel('position [cm]','FontWeight','bold');\r
        grid('on');\r
-       [legend_h,object_h,plot_h,text_strings] = legend([hp1,hp2,hp3],'Heihgt', 'Botom', 'Level','Location','southeast' );\r
+       [legend_h,object_h,plot_h,text_strings] = legend([hp1,hp2,hp3],'Height', 'Bottom', 'Level','Location','southeast' );\r
        set(legend_h, 'Box', 'off', 'FontSize',7)\r
 \r
 %--------------------------------------------------------------------------\r