1.修改样式

RecipeEditorControl/View/EndPointDlg.xaml

@@ -5,7 +5,7 @@
     Title="EndPoint Setting"
         WindowStartupLocation="CenterOwner"
         WindowStyle="SingleBorderWindow"  ShowInTaskbar="False"
-        Background="LightSkyBlue" SizeToContent="WidthAndHeight" Width="700" Height="520">
+        Background="LightSkyBlue" SizeToContent="WidthAndHeight" Width="780" Height="520">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="10"></RowDefinition>
@@ -16,7 +16,7 @@
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="362"></ColumnDefinition>
-            <ColumnDefinition Width="330"></ColumnDefinition>
+            <ColumnDefinition Width="360"></ColumnDefinition>
         </Grid.ColumnDefinitions>
 
         <!--<StackPanel Orientation="Horizontal" Margin="0" Width="362" Height="25" Grid.Row="1">
@@ -35,21 +35,21 @@
             </Border>
         </StackPanel>-->
 
-        <StackPanel Orientation="Horizontal" Margin="0" Width="362" Height="25" Grid.Row="2">
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="10,0,0,0" Height="25" Width="200">
-                <TextBlock Text="CCD Exposure Time(ms)" HorizontalAlignment="Right" FontSize="12" Margin="0,0,10,0" Foreground="White"/>
+        <StackPanel Orientation="Horizontal" Margin="0" Width="362" Height="30" Grid.Row="2">
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="10,0,0,0" Height="30" Width="200">
+                <TextBlock Text="CCD Exposure Time(ms)" HorizontalAlignment="Right" FontSize="12" Margin="0,6,10,0" Foreground="White"/>
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Height="25" Width="120">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch" x:Name="textBoxInput" FontSize="12"  Text="{Binding ExposureTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="2" Height="20"/>
+            <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Height="30" Width="120">
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch" x:Name="textBoxInput" FontSize="12"  Text="{Binding ExposureTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Margin="2" Height="25"/>
             </Border>
         </StackPanel>
         <Grid Margin="10,0,0,10" Grid.Row="3">
             <Grid.RowDefinitions>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="25"></RowDefinition>
                 <RowDefinition Height="25"></RowDefinition>
                 <RowDefinition Height="25"></RowDefinition>
@@ -64,55 +64,55 @@
                 <ColumnDefinition Width="120"></ColumnDefinition>
                 <ColumnDefinition Width="120"/>
             </Grid.ColumnDefinitions>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Row="1">
-                <TextBlock Grid.Row="1" Text="A" HorizontalAlignment="Center" FontSize="12" Height="14" Margin="0,6"   Foreground="White" />
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="1">
+                <TextBlock Grid.Row="1" Text="A" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Row="2">
-                <TextBlock Grid.Row="2" Text="B" HorizontalAlignment="Center" FontSize="12" Height="14" Margin="0,6"  Foreground="White"  />
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="2">
+                <TextBlock Grid.Row="2" Text="B" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Row="3">
-                <TextBlock Grid.Row="3" Text="C" HorizontalAlignment="Center" FontSize="12" Height="14" Margin="0,6"   Foreground="White" />
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="3">
+                <TextBlock Grid.Row="3" Text="C" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"   Foreground="White" />
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Row="4">
-                <TextBlock Grid.Row="4" Text="D" HorizontalAlignment="Center" FontSize="12" Height="14" Margin="0,6"  Foreground="White"  />
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Row="4">
+                <TextBlock Grid.Row="4" Text="D" HorizontalAlignment="Center" FontSize="12" Height="25" Margin="0,6"  Foreground="White"  />
             </Border>
  
 
 
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25">
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30">
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Column="1">
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Column="1">
                 <TextBlock Grid.Row="0" Text="Wave Length(nm)" HorizontalAlignment="Center" FontSize="12" Height="15" Margin="0" Width="104" Grid.Column="1" Foreground="White"  />
             </Border>
-            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="25" Grid.Column="2">
+            <Border BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0" Height="30" Grid.Column="2">
                 <TextBlock Grid.Row="0" Grid.Column="2" Text="Binning(nm)" HorizontalAlignment="Center" FontSize="12" Height="15" Margin="0" Width="74"  Foreground="White" />
             </Border>
 
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="1" Grid.Row="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding WaveLengthA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding WaveLengthA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center" FontSize="12"  Width="115"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="1" Grid.Row="2" >
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthB, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthB, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="25" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="1" Grid.Row="3">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthC, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthC, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="25" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="1" Grid.Row="4">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" TextAlignment="Center"  FontSize="12"  Width="115"  Height="20" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding WaveLengthD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" TextAlignment="Center"  FontSize="12"  Width="115"  Height="25" Margin="2" Grid.ColumnSpan="2" Foreground="Black"/>
             </Border>
  
 
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Grid.Column="2" Margin="0" Grid.Row="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningA, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center" FontSize="12"  Width="115"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Grid.Column="2" Margin="0" Grid.Row="2">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningB, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningB, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="2" Grid.Row="3" >
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningC, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"   Text="{Binding BinningC, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch"  TextAlignment="Center"  FontSize="12" Width="115"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0" Grid.Column="2" Grid.Row="4" >
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding BinningD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" TextAlignment="Center"  FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding BinningD, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Stretch" TextAlignment="Center"  FontSize="12"  Width="115"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
 
  
@@ -120,68 +120,68 @@
 
         <Grid Grid.Row="1" Grid.RowSpan="3" Grid.Column="1" Margin="0,0,0,0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="0"></RowDefinition>
                 <RowDefinition Height="0"></RowDefinition>
                 <RowDefinition Height="0"></RowDefinition>
-                <RowDefinition Height="25"></RowDefinition>
+                <RowDefinition Height="30"></RowDefinition>
                 <RowDefinition Height="25"></RowDefinition>
             </Grid.RowDefinitions>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="200"></ColumnDefinition>
-                <ColumnDefinition Width="120"></ColumnDefinition>
+                <ColumnDefinition Width="160"></ColumnDefinition>
             </Grid.ColumnDefinitions>
 
             <Border Grid.Row="0" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Text="F(d)" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White" />
+                <TextBlock Text="F(d)" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12" Foreground="White" />
             </Border>
             <Border Grid.Row="1" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Text="Pre-filter time window(ms)" HorizontalAlignment="Right"  Margin="0,0,10,0" FontSize="12" Foreground="White"/>
+                <TextBlock Text="Pre-filter time window(ms)" HorizontalAlignment="Right"  Margin="0,6,10,0" FontSize="12" Foreground="White"/>
             </Border>
             <Border Grid.Row="2" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="2" Text="Post-filter time window(ms)" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White"/>
+                <TextBlock Grid.Row="2" Text="Post-filter time window(ms)" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12" Foreground="White"/>
             </Border>
             <Border Grid.Row="3" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="3" Text="Algorithm Type" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White"/>
+                <TextBlock Grid.Row="3" Text="Algorithm Type" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12" Foreground="White"/>
             </Border>
             <Border Grid.Row="4" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="4" Text="Criteria" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White"/>
+                <TextBlock Grid.Row="4" Text="Criteria" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12" Foreground="White"/>
             </Border>
             <Border Grid.Row="5" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="5" Text="Delay Time(ms)" HorizontalAlignment="Right"  Margin="0,0,10,0" FontSize="12" Foreground="White" />
+                <TextBlock Grid.Row="5" Text="Delay Time(ms)" HorizontalAlignment="Right"  Margin="0,6,10,0" FontSize="12" Foreground="White" />
             </Border>
             <Border Grid.Row="6" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="6" Text="Validation Time(ms)" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="6" Text="Validation Time(ms)" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <Border Grid.Row="7" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="7" Text="Validation Value" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="7" Text="Validation Value" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <Border Grid.Row="8" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="8" Text="Time window(ms)" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="8" Text="Time window(ms)" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <Border Grid.Row="9" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="9" Text="Minimal EP Time(ms)" HorizontalAlignment="Right"  Margin="0,0,10,0" FontSize="12" Foreground="White" />
+                <TextBlock Grid.Row="9" Text="Minimal EP Time(ms)" HorizontalAlignment="Right"  Margin="0,6,10,0" FontSize="12" Foreground="White" />
             </Border>
             <Border Grid.Row="10" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="10" Text="Postpone Time(ms)" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="10" Text="Postpone Time(ms)" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <Border Grid.Row="11" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="11" Text="Control" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="11" Text="Control" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <Border Grid.Row="12" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="12" Text="Normalization" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12"  Foreground="White" />
+                <TextBlock Grid.Row="12" Text="Normalization" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12"  Foreground="White" />
             </Border>
             <!--<Border Grid.Row="13" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
                 <TextBlock Grid.Row="13" Text="Postpone Percent" HorizontalAlignment="Right"  Margin="0,0,10,0" FontSize="12" Foreground="White" />
@@ -193,52 +193,52 @@
                 <TextBlock Grid.Row="15" Text="Trigger Mode" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White"  />
             </Border>-->
             <Border Grid.Row="16" BorderBrush="White" BorderThickness="1" Background="#376092" Margin="0">
-                <TextBlock Grid.Row="16" Text="Fault if no EP recognized" HorizontalAlignment="Right" Margin="0,0,10,0" FontSize="12" Foreground="White"  />
+                <TextBlock Grid.Row="16" Text="Fault if no EP recognized" HorizontalAlignment="Right" Margin="0,6,10,0" FontSize="12" Foreground="White"  />
             </Border>
 
             <Border Grid.Row="0" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding Fd, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding Fd, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"
                                     PreviewMouseLeftButtonUp="TextBoxEx_PreviewMouseLeftButtonUp"
                                     TextChanged="TextBoxEx_TextChanged"/>
             </Border>
             <Border Grid.Row="1" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding PrefilterTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding PrefilterTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="2" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding PostfilterTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2"  Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding PostfilterTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="155"  Height="25" Margin="2"  Foreground="Black"/>
             </Border>
             <ComboBox Grid.Column="1" Grid.Row="3" HorizontalAlignment="Left" HorizontalContentAlignment="Left"
                       DisplayMemberPath="AlogarithmName"
                       SelectedValuePath="AlogarithmName" ItemsSource="{Binding AlgorithmTypes, RelativeSource={RelativeSource AncestorType={x:Type Window}}}"
-                      SelectedValue="{Binding AlgorithmType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   FontSize="12" Width="121"  Height="25" Margin="0"  >
+                      SelectedValue="{Binding AlgorithmType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   FontSize="12" Width="155"  Height="25" Margin="0"  >
 
             </ComboBox>
             <Border Grid.Row="4" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding Criteria, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center" TextAlignment="Center"  FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black" />
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding Criteria, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center" TextAlignment="Center"  FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black" />
             </Border>
             <Border Grid.Row="5" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding DelayTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding DelayTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="6" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding ValidationTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding ValidationTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="7" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding ValidationValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding ValidationValue, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="8" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding TimeWindow, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch"  Text="{Binding TimeWindow, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center"  FontSize="12" Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="9" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding MinimalTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center" TextAlignment="Center"  FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding MinimalTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center" TextAlignment="Center"  FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="10" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding PostponeTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="115"  Height="20" Margin="2" Foreground="Black"/>
+                <controls:TextBoxEx HorizontalContentAlignment="Stretch" Text="{Binding PostponeTime, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Center"  TextAlignment="Center" FontSize="12"  Width="155"  Height="25" Margin="2" Foreground="Black"/>
             </Border>
             <Border Grid.Row="11" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <CheckBox  IsChecked="{Binding Control, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="23"   />
+                <CheckBox  IsChecked="{Binding Control, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="25"   />
             </Border>
             <Border Grid.Row="12" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <CheckBox  IsChecked="{Binding Normalization, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="23"   />
+                <CheckBox  IsChecked="{Binding Normalization, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="25"   />
             </Border>
             <!--<Border Grid.Row="13" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
                 <CheckBox  IsChecked="{Binding EnablePostponePercent, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="23"   />
@@ -251,7 +251,7 @@
             </Border>-->
  
             <Border Grid.Row="16" BorderBrush="White" BorderThickness="1" Background="#95B3D7" Margin="0,0,0,0" Grid.Column="1">
-                <CheckBox  IsChecked="{Binding IsFaultIfNoTrigger, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"    HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="23"   />
+                <CheckBox  IsChecked="{Binding IsFaultIfNoTrigger, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"    HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"  VerticalAlignment="Center"   FontSize="12"  Height="25"   />
             </Border>
 
 

VirgoUI/Models/History/DataHistory/DataView.xaml

@@ -18,9 +18,9 @@
         <converters:LineColorConverter x:Key="colorConverter"/>
         <DataTemplate x:Key="SeriesInfoTemplate" DataType="s:SeriesInfo">
             <StackPanel  Margin="0 1" Orientation="Vertical">
-                <TextBlock Text="{Binding SeriesName, StringFormat='{}{0}:'}"/>
-                <TextBlock Text="{Binding FormattedXValue, StringFormat='X: {0}'}" />
-                <TextBlock Text="{Binding FormattedYValue, StringFormat='Y: {0}'}" />
+                <TextBlock Text="{Binding SeriesName, StringFormat='{}{0}:'}" Foreground="White"/>
+                <TextBlock Text="{Binding FormattedXValue, StringFormat='X: {0}'}" Foreground="White"/>
+                <TextBlock Text="{Binding FormattedYValue, StringFormat='Y: {0}'}" Foreground="White"/>
             </StackPanel>
         </DataTemplate>
         <!-- Demonstrates a custom cursor tooltip style -->

VirgoUI/Models/Operate/Overview/OverView.xaml

@@ -112,7 +112,7 @@
                                     <TextBlock Text="Pressure (mTorr)" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                                 </Border>
                                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="6" Grid.Column="1" Padding="5,1">
-                                    <TextBlock Text="{Binding PMAChamberPressure, StringFormat={}{0:F0}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{Binding PMAChamberPressure, StringFormat={}{0:F1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                                 </Border>
                                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="7" Padding="5,1">
                                     <TextBlock Text="Heater (℃)" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
@@ -175,7 +175,7 @@
                                     <TextBlock Text="Pressure (mTorr)" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                                 </Border>
                                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="6" Grid.Column="1" Padding="5,1">
-                                    <TextBlock Text="{Binding PMBChamberPressure, StringFormat={}{0:F0}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
+                                    <TextBlock Text="{Binding PMBChamberPressure, StringFormat={}{0:F1}}" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>
                                 </Border>
                                 <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Title}" Grid.Row="7" Padding="5,1">
                                     <TextBlock Text="Heater (℃)" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="14" FontFamily="Arial" VerticalAlignment="Center"/>

VirgoUI/Models/Platform/EFEM/EFEMView.xaml

@@ -451,7 +451,7 @@
                                 <TextBlock Text="Is Clamped" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
                             </Border>
                             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1" Padding="5,1,0,1">
-                                <deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsClampedLP1}"></deviceControl:AITSensor>
+                                <deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsClampedLP1}" Visibility="Collapsed"></deviceControl:AITSensor>
                             </Border>
                             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="2" Padding="5,1">
                                 <StackPanel   Orientation="Horizontal"  >
@@ -658,7 +658,7 @@
                                 <TextBlock Text="Is Clamped" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="12" FontFamily="Arial" VerticalAlignment="Center" />
                             </Border>
                             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="0,0,0,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="1" Padding="5,1,0,1">
-                                <deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsClampedLP2}"></deviceControl:AITSensor>
+                                <deviceControl:AITSensor Margin="5,0" GreenColor="True" LightOnValue="{Binding IsClampedLP2}" Visibility="Collapsed"></deviceControl:AITSensor>
                             </Border>
                             <Border BorderBrush="{DynamicResource Table_BD}" BorderThickness="1,0,1,1" Background="{DynamicResource Table_BG_Content}" Grid.Row="4" Grid.Column="2" Padding="5,1">
                                 <StackPanel   Orientation="Horizontal"  >