Add some improvements

diff --git a/batch_column_processing.m b/batch_column_processing.m
index 2aea0bb658e11cf99b71506aed506a23e0be1a2d..22b4d967acfaebaa8441a8f920280e9bf7c6485c 100755 (executable)
--- a/batch_column_processing.m
+++ b/batch_column_processing.m
@@ -71,6 +71,7 @@ for i=1:nSelectedDirectory
                end\r
                close();\r
                main_wb = waitbar(0, 'Whole batch progress');\r
                end\r
                close();\r
                main_wb = waitbar(0, 'Whole batch progress');\r

+               main_wb_pos = get(main_wb, 'position');\r

        end\r
 \r
        waitbar((i - 0.5)/nSelectedDirectory, main_wb);\r
        end\r
 \r
        waitbar((i - 0.5)/nSelectedDirectory, main_wb);\r


@@ -78,6 +79,8 @@ for i=1:nSelectedDirectory
        [~, calm_level] = min(mean(double(meanfig), Weights = mask));\r
 \r
        wait_bar = waitbar(0, '');\r
        [~, calm_level] = min(mean(double(meanfig), Weights = mask));\r
 \r
        wait_bar = waitbar(0, '');\r

+       wait_bar_pos = main_wb_pos + [0 main_wb_pos(4) 0 0];\r
+       set(wait_bar, 'position', wait_bar_pos);\r

        set(gca(wait_bar).Title, 'Interpreter', 'none');\r
        start_time = name_to_time(FFiles(1).name);\r
        startFile = 1;\r
        set(gca(wait_bar).Title, 'Interpreter', 'none');\r
        start_time = name_to_time(FFiles(1).name);\r
        startFile = 1;\r


@@ -92,22 +95,28 @@ for i=1:nSelectedDirectory
                intensity = mean(double(Figure), Weights = mask);\r
                [water(j), bubble_top(j), bubble_bot(j)] = get_levels(intensity);\r
                time(j) = name_to_time(ImageName) - start_time;\r
                intensity = mean(double(Figure), Weights = mask);\r
                [water(j), bubble_top(j), bubble_bot(j)] = get_levels(intensity);\r
                time(j) = name_to_time(ImageName) - start_time;\r

-               if (j == 1)\r
-                       write_mode = 'overwrite';\r
-               else\r
-                       write_mode = 'append';\r
-               end\r
+       end\r
+       close(wait_bar);\r
+       waitbar(i/nSelectedDirectory, main_wb);\r
+\r
+       water = 100 * meter(water);\r
+       bubble_top = 100 * meter(bubble_top);\r
+       bubble_bot = 100 * meter(bubble_bot);\r
+\r
+       writecell(...\r
+               [{"filename"}, {"date"}, ...\r
+                       {"water level (cm)"}, {"top bubble front (cm)"}, {"bottom bubble front (cm)"}],...\r
+               [results_dir '/' SelectedDirectory{i} '.csv'],...\r
+               "WriteMode", "overwrite");\r
+       for j = 1:N\r

                writecell(...\r
                        [{FFiles(j).name}, {FFiles(j).date}, ...\r
                                {water(j)}, {bubble_top(j)}, {bubble_bot(j)}],...\r
                        [results_dir '/' SelectedDirectory{i} '.csv'],...\r
                writecell(...\r
                        [{FFiles(j).name}, {FFiles(j).date}, ...\r
                                {water(j)}, {bubble_top(j)}, {bubble_bot(j)}],...\r
                        [results_dir '/' SelectedDirectory{i} '.csv'],...\r

-                       "WriteMode", write_mode);\r
+                       "WriteMode", "append");\r

        end\r
        end\r

-       close(wait_bar);\r
-       waitbar(i/nSelectedDirectory, main_wb);\r
-\r

        figure()\r
        figure()\r

-       plot(seconds(time), 100 * meter([water; bubble_top; bubble_bot]'), 'LineWidth', 3);\r
+       plot(seconds(time), [water; bubble_top; bubble_bot]', 'LineWidth', 3);\r

        legend('Water level', 'Bubble top', 'Bubble bottom','Location', 'north');\r
        xlabel('Time (s)');\r
        ylabel('Height (cm)');\r
        legend('Water level', 'Bubble top', 'Bubble bottom','Location', 'north');\r
        xlabel('Time (s)');\r
        ylabel('Height (cm)');\r