feat: implement asynchronous image creation and layer processing in PSD utilities and view models

Author: InuInu2022

KuchiPaku.Psd/PsdUtil.cs

@@ -6,6 +6,7 @@
 using System.Drawing.Imaging;
 using static PsdParser.AdditionalLayerInformations.SectionDividerSetting;
 using System.Runtime.InteropServices;
+using System.Threading.Tasks;
 
 namespace KuchiPaku.Psd;
 
@@ -57,7 +58,7 @@ public static IReadOnlyList<YmmPsdLayer> ParsePsdLayers(PsdFile psd)
 		return tree;
 	}
 
-	public static Bitmap CreateImageFromTree(
+	public static async Task<Bitmap> CreateImageFromTreeAsync(
 		IReadOnlyList<YmmPsdLayer> tree, int width, int height,
 		IEnumerable<string>? enabledLayers
 	)
@@ -71,15 +72,22 @@ public static Bitmap CreateImageFromTree(
 			g.Clear(System.Drawing.Color.Transparent);
 
 			// 入れ子になったレイヤーを走査して合成
-			CombineLayerRecursive(tree, g, enabledLayers);
+			await CombineLayerRecursiveAsync(tree, g, enabledLayers)
+				.ConfigureAwait(false);
 		}
 
 		return finalBitmap;
 	}
 
 	public static async Task<Bitmap> CreateImageFromLayerAsync(YmmPsdLayer layer)
 	{
-		///*
+		var pixelData = await ReadImageAsync(layer).ConfigureAwait(false);
+		return CreateBitmapFromPixelData(
+			pixelData, layer.Image.Width, layer.Image.Height);
+	}
+
+	static async Task<byte[]> ReadImageAsync(YmmPsdLayer layer)
+	{
 		await _lock.WaitAsync().ConfigureAwait(false);
 		byte[] pixelData = [];
 		try
@@ -91,13 +99,11 @@ public static async Task<Bitmap> CreateImageFromLayerAsync(YmmPsdLayer layer)
 		{
 			_lock.Release();
 		}
-		//*/
-		//var pixelData = layer.Image.Read();
-		return CreateBitmapFromPixelData(
-			pixelData, layer.Image.Width, layer.Image.Height);
+
+		return pixelData;
 	}
 
-	static void CombineLayerRecursive(
+	static async ValueTask CombineLayerRecursiveAsync(
 		IEnumerable<YmmPsdLayer> layers,
 		Graphics g,
 		IEnumerable<string>? enabledLayers
@@ -112,7 +118,8 @@ static void CombineLayerRecursive(
 				{
 					continue;
 				}
-				CombineLayerRecursive(layer.Children.Reverse(), g, enabledLayers);
+				await CombineLayerRecursiveAsync(layer.Children.Reverse(), g, enabledLayers)
+					.ConfigureAwait(false);
 			}
 			else if (layer.IsNormalLayer)
 			{
@@ -127,7 +134,8 @@ static void CombineLayerRecursive(
 				}
 
 				// 通常レイヤーの場合、ビットマップを取得して合成
-				byte[] pixelData = layer.Image.Read(); // Pixelデータ取得
+				var pixelData = await ReadImageAsync(layer)
+					.ConfigureAwait(false); // Pixelデータ取得
 				using var layerBitmap = CreateBitmapFromPixelData(
 					pixelData,
 					layer.Image.Width,

KuchiPaku/ViewModels/LipSyncLayerViewModel.cs

@@ -62,16 +62,17 @@ Dictionary<string, bool> defaultVisible
 			if (ImageSrc is not null) return;
 			var w = PsdRect.Width;
 			var h = PsdRect.Height;
-			ShowThumb(VisibleLayerList.Where(v => v.Value).Select(v=>v.Key));
+			await ShowThumbAsync(VisibleLayerList.Where(v => v.Value).Select(v=>v.Key));
 			//ShowLayer();
 		});
 	}
 
-	public void ShowThumb(
+	public async Task ShowThumbAsync(
 		IEnumerable<string> enabledLayers
 	)
 	{
-		using var bmp = PsdUtil.CreateImageFromTree(LayerTree, PsdWidth, PsdHeight, enabledLayers);
+		using var bmp = await PsdUtil
+			.CreateImageFromTreeAsync(LayerTree, PsdWidth, PsdHeight, enabledLayers);
 		var rate = 200.0 / Math.Max(bmp.Width, bmp.Height);
 		var rw = (int)(bmp.Width * rate);
 		var rh = (int)(bmp.Height * rate);

KuchiPaku/ViewModels/MainWindowViewModel.cs

@@ -433,6 +433,8 @@ private async ValueTask SelectedCharaItemChangedAsync(CharacterListViewModel ite
 			//psd版LipSyncImagesのリスト構築
 			var flowControl = await LoadLipSyncLayersAsync(chara);
 
+			Manager.Info("PSD解析終了", "PSDファイルの解析終了！", true);
+			//await Task.Delay(1000);
 			Manager.Dismiss(loading);
 			if (!flowControl) return;
 
@@ -553,7 +555,7 @@ async ValueTask<bool>
 		var psd = await PsdUtil.LoadPsdAsync(path);
 		var tree = PsdUtil.ParsePsdLayers(psd);
 
-		//TODO: デフォルトレイヤー表示をymmpの"TachieDefaultItemParameter"から取得して反映、なければPSDファイルそのまま
+		//デフォルトレイヤー表示をymmpの"TachieDefaultItemParameter"から取得して反映、なければPSDファイルそのまま
 		var defs = SelectedCharaItem?.EnableLayers;
 		if (defs is not null && defs!.Any())
 		{

KuchiPaku/ViewModels/SelectedLayerViewModel.cs

@@ -148,7 +148,7 @@ private ValueTask IsVisibleChangedAsync(bool value)
 		var list = MainVM.SelectedLayers?.VisibleLayerList
 			.Where(x => x.Value)
 			.Select(x => x.Key) ?? [];
-		MainVM?.SelectedLayers?.ShowThumb(list);
+		MainVM?.SelectedLayers?.ShowThumbAsync(list);
 
 		return default;
 	}