diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 8b19d40..c40ec8f 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:Correlator.ViewModel" d1P1:Ignorable="d" - StartupUri="/View/HomePageProWindow.xaml"> + StartupUri="/View/MainWindow.xaml"> diff --git a/Correlator/App.xaml b/Correlator/App.xaml index 8b19d40..c40ec8f 100644 --- a/Correlator/App.xaml +++ b/Correlator/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:Correlator.ViewModel" d1P1:Ignorable="d" - StartupUri="/View/HomePageProWindow.xaml"> + StartupUri="/View/MainWindow.xaml"> diff --git a/Correlator/View/HomePageProWindow.xaml b/Correlator/View/HomePageProWindow.xaml index 14f5183..012363b 100644 --- a/Correlator/View/HomePageProWindow.xaml +++ b/Correlator/View/HomePageProWindow.xaml @@ -2,6 +2,7 @@ x:Class="Correlator.View.HomePageProWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:act="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:converter="clr-namespace:Correlator.Converter" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:hc="https://handyorg.github.io/handycontrol" @@ -19,6 +20,12 @@ WindowStyle="None" mc:Ignorable="d"> + + + + + + @@ -741,11 +748,19 @@ Text="管道材料" /> + - + FontSize="18" + IsEnabled="{Binding ComboBoxIsEnabled}" + ItemsSource="{Binding PipeMaterialsArray}" + SelectedItem="{Binding PipeName}"> + + + + + @@ -767,7 +782,8 @@ Margin="45,0,10,0" hc:InfoElement.Placeholder="请输入管道直径,单位:mm" FontSize="18" - ShowClearButton="True" /> + ShowClearButton="True" + Text="{Binding PipeDiameter}" /> + ShowClearButton="True" + Text="{Binding PipeLength}" /> @@ -826,6 +843,7 @@ + Text="干扰频段区间" /> + + ShowClearButton="True" + Text="{Binding LowFrequency}" /> + ShowClearButton="True" + Text="{Binding HighFrequency}" /> @@ -915,13 +938,23 @@ Margin="0,10" Columns="2" Rows="2"> -