xhouse/XplorePlane
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

状态栏优化：测量信息显示到主界面底部状态栏，移除图像窗口状态栏，MainViewModel改为单例注册

Browse Source
This commit is contained in:
李伟
2026-04-24 15:38:53 +08:00
parent faa4e61d98
commit de21e462e7
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
XplorePlane/Views/Main/ViewportPanelView.xaml.cs
+25 -12
View File
@@ -15,33 +15,47 @@ namespace XplorePlane.Views
{
public partial class ViewportPanelView : UserControl
{
private MainViewModel _mainVm;
private void SetStatus(string msg)
{
if (_mainVm == null)
{
try { _mainVm = ContainerLocator.Current?.Resolve<MainViewModel>(); } catch { }
}
if (_mainVm != null) _mainVm.StatusMessage = msg;
}
public ViewportPanelView()
{
InitializeComponent();
DataContextChanged += OnDataContextChanged;
// 测量事件 → 更新状态栏
// 测量事件 → 更新主界面状态栏
RoiCanvas.MeasureCompleted += (s, e) =>
{
if (e is MeasureCompletedEventArgs args && DataContext is ViewportPanelViewModel vm)
if (e is MeasureCompletedEventArgs args)
{
string typeLabel = args.MeasureType switch
{
"PointToLine" => "点线距",
"Angle" => "角度",
"FillRate" => "填锡率",
_ => "点点距"
};
string valueText = args.MeasureType == "Angle"
? $"{args.Distance:F2}°"
: $"{args.Distance:F2} px";
vm.MeasurementResult = valueText;
vm.ImageInfo = $"{typeLabel}: {valueText} | 共 {args.TotalCount} 条测量";
string valueText = args.MeasureType switch
{
"Angle" => $"{args.Distance:F2}°",
"FillRate" => $"{args.Distance:F1}%",
_ => $"{args.Distance:F2} px"
};
SetStatus($"{typeLabel}: {valueText} | 共 {args.TotalCount} 条测量");
}
};
RoiCanvas.MeasureStatusChanged += (s, e) =>
{
if (e is MeasureStatusEventArgs args && DataContext is ViewportPanelViewModel vm)
vm.ImageInfo = args.Message;
if (e is MeasureStatusEventArgs args)
SetStatus(args.Message);
};
// 十字辅助线：直接订阅 Prism 事件
@@ -61,6 +75,7 @@ namespace XplorePlane.Views
MeasurementToolMode.PointDistance => XP.ImageProcessing.RoiControl.Models.MeasureMode.PointDistance,
MeasurementToolMode.PointLineDistance => XP.ImageProcessing.RoiControl.Models.MeasureMode.PointToLine,
MeasurementToolMode.Angle => XP.ImageProcessing.RoiControl.Models.MeasureMode.Angle,
MeasurementToolMode.ThroughHoleFillRate => XP.ImageProcessing.RoiControl.Models.MeasureMode.FillRate,
_ => XP.ImageProcessing.RoiControl.Models.MeasureMode.None
};
}, Prism.Events.ThreadOption.UIThread);
@@ -91,10 +106,8 @@ namespace XplorePlane.Views
{
RoiCanvas.ClearMeasurements();
if (DataContext is ViewportPanelViewModel vm)
{
vm.ResetMeasurementState();
vm.ImageInfo = "已清除所有测量";
}
SetStatus("已清除所有测量");
}
private void SaveOriginalImage_Click(object sender, RoutedEventArgs e)