Commit 55856895 authored by 冯伟球's avatar 冯伟球

微调界面布局

parent 14a64597
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2" xmlns:c1c="clr-namespace:C1.WPF.C1Chart;assembly=C1.WPF.C1Chart.4.5.2"
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls" xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" x:Class="FLY.HeatingHelper.UI.UIModule.UC_FramePicker" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" x:Class="FLY.HeatingHelper.UI.UiModule.UC_FramePicker"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="600"> d:DesignHeight="450" d:DesignWidth="600">
<UserControl.Resources> <UserControl.Resources>
...@@ -114,7 +114,7 @@ ...@@ -114,7 +114,7 @@
<c1c:C1Chart.Data> <c1c:C1Chart.Data>
<c1c:ChartData> <c1c:ChartData>
<c1c:DataSeries Values="{Binding DS_thick}" AxisY="ay0" Label="厚度" ChartType="Column" <c1c:DataSeries Values="{Binding DS_thick}" AxisY="ay0" Label="厚度" ChartType="Column"
PlotElementLoaded="DataSeries_PlotElementLoaded"/> PlotElementLoaded="DataSeries_PlotElementLoaded" />
<c1c:DataSeries Values="{Binding DS_heat}" AxisY="ay1" Label="加热率"/> <c1c:DataSeries Values="{Binding DS_heat}" AxisY="ay1" Label="加热率"/>
</c1c:ChartData> </c1c:ChartData>
</c1c:C1Chart.Data> </c1c:C1Chart.Data>
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
</c1c:ChartView> </c1c:ChartView>
</c1c:C1Chart.View> </c1c:C1Chart.View>
</c1c:C1Chart> </c1c:C1Chart>
<Slider Grid.Row="1" Margin="20,3,20,3" <Slider Grid.Row="1" Margin="20"
Minimum="{Binding MinFrame}" Minimum="{Binding MinFrame}"
Maximum="{Binding MaxFrame}" Maximum="{Binding MaxFrame}"
Value="{Binding SelectedFrame}"/> Value="{Binding SelectedFrame}"/>
......
...@@ -110,7 +110,6 @@ ...@@ -110,7 +110,6 @@
<Controls:ToggleSwitch Content="过滤加热重复项" Margin="30,10" IsChecked="{Binding Path=Dat.IsDataFilter}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/> <Controls:ToggleSwitch Content="过滤加热重复项" Margin="30,10" IsChecked="{Binding Path=Dat.IsDataFilter}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Controls:ToggleSwitch Content="过滤不稳定数据" Margin="30,10" IsChecked="{Binding Path=Dat.IsFilterUnstable}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/> <Controls:ToggleSwitch Content="过滤不稳定数据" Margin="30,10" IsChecked="{Binding Path=Dat.IsFilterUnstable}" Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}" FontSize="15"/>
<Button Content="缺省数据范围" Width="180" <Button Content="缺省数据范围" Width="180"
Style="{DynamicResource AccentedSquareButtonStyle}"
Command="{Binding DefaultLoadDataRange}"/> Command="{Binding DefaultLoadDataRange}"/>
<Button Content="加载数据" Width="180" <Button Content="加载数据" Width="180"
Command="{Binding ReloadData}"/> Command="{Binding ReloadData}"/>
...@@ -150,7 +149,7 @@ ...@@ -150,7 +149,7 @@
</TextBlock.Text> </TextBlock.Text>
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<Controls:RangeSlider Minimum="0" <Controls:RangeSlider Minimum="0" Margin="20,0"
Maximum="{Binding RecordCount, Mode=OneWay}" Maximum="{Binding RecordCount, Mode=OneWay}"
LowerValue="{Binding Dat.AnalystIndexFrom}" LowerValue="{Binding Dat.AnalystIndexFrom}"
UpperValue="{Binding Dat.AnalystIndexTo}" UpperValue="{Binding Dat.AnalystIndexTo}"
......
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