解决合并冲突:合并TURBO-596分支

This commit is contained in:
李伟
2026-05-07 13:51:59 +08:00
12 changed files with 678 additions and 245 deletions
@@ -17,13 +17,19 @@ namespace XplorePlane.Views
{
private MainViewModel _mainVm;
private void SetStatus(string msg)
private MainViewModel GetMainVm()
{
if (_mainVm == null)
{
try { _mainVm = ContainerLocator.Current?.Resolve<MainViewModel>(); } catch { }
}
if (_mainVm != null) _mainVm.StatusMessage = msg;
return _mainVm;
}
private void SetStatus(string msg)
{
var vm = GetMainVm();
if (vm != null) vm.StatusMessage = msg;
}
public ViewportPanelView()
@@ -113,6 +119,15 @@ namespace XplorePlane.Views
}, Prism.Events.ThreadOption.UIThread);
}
catch { }
// 光标信息:从 RoiCanvas.CursorInfo 同步到 MainViewModel
var cursorInfoDesc = System.ComponentModel.DependencyPropertyDescriptor.FromProperty(
PolygonRoiCanvas.CursorInfoProperty, typeof(PolygonRoiCanvas));
cursorInfoDesc?.AddValueChanged(RoiCanvas, (s, e) =>
{
var vm = GetMainVm();
if (vm != null) vm.CursorInfoText = RoiCanvas.CursorInfo;
});
}
private void OnDataContextChanged(object sender, DependencyPropertyChangedEventArgs e)