Commit d7c72d7f authored by 潘栩锋's avatar 潘栩锋 🚴

修复 边界查找X轴显示异常, 添加回边界范围显示

parent 781e7c3c
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
<TextBlock.Style> <TextBlock.Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}"> <Style TargetType="TextBlock" BasedOn="{StaticResource Styles.Text.FieldHeader}">
<Style.Triggers> <Style.Triggers>
<DataTrigger Binding="{Binding DataContext.Direction,ElementName=root}" Value="{x:Static misc:DIRECTION.BACKWARD}"> <DataTrigger Binding="{Binding DataContext.Direction,ElementName=grid_root}" Value="{x:Static misc:DIRECTION.BACKWARD}">
<Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Validation5}"/> <Setter Property="Foreground" Value="{StaticResource MahApps.Brushes.Validation5}"/>
</DataTrigger> </DataTrigger>
</Style.Triggers> </Style.Triggers>
...@@ -335,11 +335,19 @@ ...@@ -335,11 +335,19 @@
</lvc:Axis.Separator> </lvc:Axis.Separator>
<lvc:Axis.Sections> <lvc:Axis.Sections>
<!--#0边界范围-->
<lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected}"
Value="{Binding Sensor0AtBorderBegin}" SectionWidth="{Binding Sensor0AtBorderWidth}"/>
<!--#1边界范围-->
<lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected}"
Value="{Binding Sensor1AtBorderBegin}" SectionWidth="{Binding Sensor1AtBorderWidth}"/>
<!--图表缩放.选择器.X轴--> <!--图表缩放.选择器.X轴-->
<lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected.ZoomIn}" <lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected.ZoomIn}"
Value="{Binding ZoomInHelper.SelectedXBegin}" /> Value="{Binding ZoomInHelper.SelectedXBegin}" />
<lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected.ZoomIn}" <lvc:AxisSection Style="{StaticResource Styles.Axis.Section.Selected.ZoomIn}"
Value="{Binding ZoomInHelper.SelectedXEnd}" /> Value="{Binding ZoomInHelper.SelectedXEnd}" />
</lvc:Axis.Sections> </lvc:Axis.Sections>
</lvc:Axis> </lvc:Axis>
</lvc:CartesianChart.AxisX> </lvc:CartesianChart.AxisX>
......
...@@ -263,7 +263,7 @@ namespace FLY.Thick.Base.UI ...@@ -263,7 +263,7 @@ namespace FLY.Thick.Base.UI
XFormatter = (x) => XFormatter = (x) =>
{ {
int pos = (int)getPosFromGridIndex((int)x); int pos = (int)x;
int mm = (int)(pos * Mmpp); int mm = (int)(pos * Mmpp);
return $"{pos}\n{mm}mm"; return $"{pos}\n{mm}mm";
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment