diff --git a/XplorePlane/ViewModels/Main/MainViewModel.cs b/XplorePlane/ViewModels/Main/MainViewModel.cs index 49d7349..1809723 100644 --- a/XplorePlane/ViewModels/Main/MainViewModel.cs +++ b/XplorePlane/ViewModels/Main/MainViewModel.cs @@ -21,7 +21,7 @@ namespace XplorePlane.ViewModels { public class MainViewModel : BindableBase { - private const double CncEditorHostWidth = 1162d; + private const double CncEditorHostWidth = 710d; private readonly ILoggerService _logger; private readonly IContainerProvider _containerProvider; private readonly IEventAggregator _eventAggregator; diff --git a/XplorePlane/Views/Cnc/CncPageView.xaml b/XplorePlane/Views/Cnc/CncPageView.xaml index f78ff2e..1a31aa7 100644 --- a/XplorePlane/Views/Cnc/CncPageView.xaml +++ b/XplorePlane/Views/Cnc/CncPageView.xaml @@ -9,7 +9,7 @@ xmlns:views="clr-namespace:XplorePlane.Views" xmlns:vm="clr-namespace:XplorePlane.ViewModels.Cnc" d:DesignHeight="760" - d:DesignWidth="600" + d:DesignWidth="702" prism:ViewModelLocator.AutoWireViewModel="True" mc:Ignorable="d"> @@ -69,8 +69,8 @@ - + - + - + @@ -100,15 +100,17 @@ + Text="{Binding ProgramName, TargetNullValue=CNC编辑}" + TextWrapping="Wrap" /> + Text="模块节点下会自动显示标记、等待、消息等子节点。" + TextWrapping="Wrap" /> @@ -293,7 +295,7 @@ @@ -312,7 +314,7 @@ @@ -398,15 +400,17 @@ + Text="未选择节点" + TextWrapping="Wrap" /> + Text="从左侧树中选择一个节点后,这里会显示可编辑的参数。" + TextWrapping="Wrap" /> @@ -434,15 +438,17 @@ + Text="未选择检测模块" + TextWrapping="Wrap" /> + Text="请选择一个检测模块节点后,在这里拖拽算子并配置参数。" + TextWrapping="Wrap" /> diff --git a/XplorePlane/Views/ImageProcessing/PipelineEditorView.xaml b/XplorePlane/Views/ImageProcessing/PipelineEditorView.xaml index fbbf736..5f4d2f1 100644 --- a/XplorePlane/Views/ImageProcessing/PipelineEditorView.xaml +++ b/XplorePlane/Views/ImageProcessing/PipelineEditorView.xaml @@ -11,25 +11,23 @@ - + Microsoft YaHei UI - -