From: Lukáš Jiřiště <jiriste@icpf.cas.cz>
Date: Tue, 17 Dec 2024 09:31:06 +0000 (+0100)
Subject: Add some improvements
X-Git-Url: https://git.ljiriste.work/?a=commitdiff_plain;p=Bubble_column.git

Add some improvements
---

diff --git a/batch_column_processing.m b/batch_column_processing.m
index 2aea0bb..22b4d96 100755
--- a/batch_column_processing.m
+++ b/batch_column_processing.m
@@ -71,6 +71,7 @@ for i=1:nSelectedDirectory
 		end
 		close();
 		main_wb = waitbar(0, 'Whole batch progress');
+		main_wb_pos = get(main_wb, 'position');
 	end
 
 	waitbar((i - 0.5)/nSelectedDirectory, main_wb);
@@ -78,6 +79,8 @@ for i=1:nSelectedDirectory
 	[~, calm_level] = min(mean(double(meanfig), Weights = mask));
 
 	wait_bar = waitbar(0, '');
+	wait_bar_pos = main_wb_pos + [0 main_wb_pos(4) 0 0];
+	set(wait_bar, 'position', wait_bar_pos);
 	set(gca(wait_bar).Title, 'Interpreter', 'none');
 	start_time = name_to_time(FFiles(1).name);
 	startFile = 1;
@@ -92,22 +95,28 @@ for i=1:nSelectedDirectory
 		intensity = mean(double(Figure), Weights = mask);
 		[water(j), bubble_top(j), bubble_bot(j)] = get_levels(intensity);
 		time(j) = name_to_time(ImageName) - start_time;
-		if (j == 1)
-			write_mode = 'overwrite';
-		else
-			write_mode = 'append';
-		end
+	end
+	close(wait_bar);
+	waitbar(i/nSelectedDirectory, main_wb);
+
+	water = 100 * meter(water);
+	bubble_top = 100 * meter(bubble_top);
+	bubble_bot = 100 * meter(bubble_bot);
+
+	writecell(...
+		[{"filename"}, {"date"}, ...
+			{"water level (cm)"}, {"top bubble front (cm)"}, {"bottom bubble front (cm)"}],...
+		[results_dir '/' SelectedDirectory{i} '.csv'],...
+		"WriteMode", "overwrite");
+	for j = 1:N
 		writecell(...
 			[{FFiles(j).name}, {FFiles(j).date}, ...
 				{water(j)}, {bubble_top(j)}, {bubble_bot(j)}],...
 			[results_dir '/' SelectedDirectory{i} '.csv'],...
-			"WriteMode", write_mode);
+			"WriteMode", "append");
 	end
-	close(wait_bar);
-	waitbar(i/nSelectedDirectory, main_wb);
-
 	figure()
-	plot(seconds(time), 100 * meter([water; bubble_top; bubble_bot]'), 'LineWidth', 3);
+	plot(seconds(time), [water; bubble_top; bubble_bot]', 'LineWidth', 3);
 	legend('Water level', 'Bubble top', 'Bubble bottom','Location', 'north');
 	xlabel('Time (s)');
 	ylabel('Height (cm)');