Views/PoreDistributionView.xaml

@@ -1,6 +1,7 @@
 <UserControl x:Class="MembranePoreTester.Views.PoreDistributionView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:oxy="http://oxyplot.org/wpf"
              xmlns:conv="clr-namespace:MembranePoreTester.Converters">
     <UserControl.Resources>
         <conv:InverseBooleanConverter x:Key="InverseBooleanConverter"/>
@@ -69,12 +70,17 @@
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal" Margin="0,0,0,5">
                         <Button Content="添加行" Command="{Binding AddDataPointCommand}" Padding="10,5" Margin="5"/>
                         <Button Content="删除行" Command="{Binding RemoveDataPointCommand}" Padding="10,5" Margin="5"/>
+                      
 
                         <!-- 新增：模式选择 -->
                         <ComboBox SelectedItem="{Binding TestMode}" Width="80" Margin="5">
                             <ComboBoxItem Content="湿膜" IsSelected="True"/>
                             <ComboBoxItem Content="干膜"/>
                         </ComboBox>
+                        <ComboBox SelectedIndex="{Binding SelectedFlowModeIndex}" Width="100" Margin="5">
+                            <ComboBoxItem IsSelected="True" Content="大流量"/>
+                            <ComboBoxItem Content="小流量"/>
+                        </ComboBox>
                         <Button Content="读取PLC" Command="{Binding ReadPlcCommand}" Padding="10,5" Margin="5"/>
                     </StackPanel>
                     <DataGrid ItemsSource="{Binding Record.DataPoints}" AutoGenerateColumns="False" CanUserAddRows="False">
@@ -91,7 +97,7 @@
 
             <!-- 右侧简易数据展示（可用图表库，此处仅用ListBox预览） -->
             <GroupBox Grid.Column="2" Header="数据预览" Margin="5,0,0,0">
-                <ListBox ItemsSource="{Binding Record.DataPoints}">
+                <!--<ListBox ItemsSource="{Binding Record.DataPoints}">
                     <ListBox.ItemTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal">
@@ -103,7 +109,10 @@
                             </StackPanel>
                         </DataTemplate>
                     </ListBox.ItemTemplate>
-                </ListBox>
+                </ListBox>-->
+                <GroupBox Grid.Column="2" Header="流量-压力曲线" Margin="5,0,0,0">
+                    <oxy:PlotView Model="{Binding PlotModel}" Height="300" Margin="5"/>
+                </GroupBox>
             </GroupBox>
         </Grid>
 
@@ -122,6 +131,7 @@
                     <TextBlock Text="{Binding RangePercentage, StringFormat={}{0:F1}%}" FontSize="16" VerticalAlignment="Center" Margin="10,0"/>
                 </StackPanel>
             </GroupBox>
+            <Button Content="流量校准" Command="{Binding OpenFlowCalibCommand}" Padding="15,8" Margin="5"/>
             <Button Content="生成报告" Command="{Binding GenerateReportCommand}" Padding="15,8" Margin="5"/>
             <Button Content="保存到历史" Command="{Binding SaveCommand}" Padding="15,8" Margin="5"/>
             <Button Content="导出Excel" Command="{Binding ExportCommand}" Padding="15,8" Margin="5"/>