chizui/SpineViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善工作区加载模型逻辑

Browse Source
This commit is contained in:
ww-rm
2025-10-02 11:44:51 +08:00
parent 06694c9e89
commit 8f8806417a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
SpineViewer/ViewModels/MainWindow/SpineObjectListViewModel.cs
View File

@@ -599,7 +599,7 @@ namespace SpineViewer.ViewModels.MainWindow
} }
else if (models.Count > 0) else if (models.Count > 0)
{ {
AddSpineObject(models[0]); InsertSpineObject(models[0]);
_logger.LogCurrentProcessMemoryUsage(); _logger.LogCurrentProcessMemoryUsage();
} }
} }
@@ -620,10 +620,10 @@ namespace SpineViewer.ViewModels.MainWindow
{ {
if (ct.IsCancellationRequested) break; if (ct.IsCancellationRequested) break;
var cfg = models[i]; var cfg = models[totalCount - 1 - i];
reporter.ProgressText = $"[{i}/{totalCount}] {cfg}"; reporter.ProgressText = $"[{i}/{totalCount}] {cfg}";
if (AddSpineObject(cfg)) if (InsertSpineObject(cfg))
success++; success++;
else else
error++; error++;
@@ -650,15 +650,15 @@ namespace SpineViewer.ViewModels.MainWindow
} }
/// <summary> /// <summary>
/// 安全地在列表末尾添加一个模型, 发生错误会输出日志 /// 安全地在列表头添加一个模型, 发生错误会输出日志
/// </summary> /// </summary>
/// <returns>是否添加成功</returns> /// <returns>是否添加成功</returns>
private bool AddSpineObject(SpineObjectWorkspaceConfigModel cfg) private bool InsertSpineObject(SpineObjectWorkspaceConfigModel cfg)
{ {
try try
{ {
var sp = new SpineObjectModel(cfg); var sp = new SpineObjectModel(cfg);
lock (_spineObjectModels.Lock) _spineObjectModels.Add(sp); lock (_spineObjectModels.Lock) _spineObjectModels.Insert(0, sp);
if (Application.Current.Dispatcher.CheckAccess()) if (Application.Current.Dispatcher.CheckAccess())
{ {
RequestSelectionChanging?.Invoke(this, new(NotifyCollectionChangedAction.Reset)); RequestSelectionChanging?.Invoke(this, new(NotifyCollectionChangedAction.Reset));