修改wafer样式

Venus/Venus_MainPages/Views/MFCVerificationView.xaml

@@ -166,78 +166,27 @@
             </Border>
 
             <Label Content="Verification History:" Grid.Row="2" Height="25"/>
-            <ScrollViewer Grid.Row="3" Grid.ColumnSpan="2" HorizontalScrollBarVisibility="Visible" Height="400" Width="800" VerticalScrollBarVisibility="Auto" Margin="-700,0,0,0">
+            <ScrollViewer Grid.Row="3" Grid.ColumnSpan="2" HorizontalScrollBarVisibility="Visible" Height="400" Width="1600" VerticalScrollBarVisibility="Auto" >
                 <DataGrid AutoGenerateColumns="False" Name="dataGrid_VerificationHistory"  CanUserAddRows="False"
                   ItemsSource="{Binding VerificationDataRecords}" 
                   FontFamily="Arial" FontSize="14" >
-                    <DataGrid.Resources>
-                        <!--<Style TargetType="DataGridRow" >
-                            <Setter Property="Height" Value="45" />
-                        </Style>-->
-    
-                        <Style TargetType="DataGridCell">
-                            <!--<Setter Property="Height" Value="20"/>-->
-                            <!--<Setter Property="IsEnabled" Value="False"/>-->
-                            <Setter Property="LayoutTransform">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <ScaleTransform ScaleX="1" ScaleY="-1"/>
-                                        <RotateTransform Angle="90"/>
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                        <Style TargetType="DataGridColumnHeader">
-                            <!--<Setter Property="Height" Value="20"/>-->
-                            <!--<Setter Property="IsEnabled" Value="False"/>-->
-                            <!--<Setter Property="Background" Value="#6A82AD"/>-->
-                            <Setter Property="LayoutTransform">
-                                <Setter.Value>
-                                    <TransformGroup>
-                                        <RotateTransform Angle="-90"/>
-                                        <ScaleTransform ScaleX="1" ScaleY="-1"/>
-                                    </TransformGroup>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </DataGrid.Resources>
-                    <DataGrid.LayoutTransform>
-                        <TransformGroup>
-                            <RotateTransform Angle="-90"/>
-                            <ScaleTransform ScaleX="1" ScaleY="-1"/>
-                        </TransformGroup>
-                    </DataGrid.LayoutTransform>
+                   
+                   
                     <DataGrid.Columns>
-                        <DataGridTextColumn  Binding="{Binding Module,Mode=OneWay}"   CanUserSort="True" CanUserReorder="False" IsReadOnly="True" CanUserResize="False" >
-                            <DataGridTextColumn.HeaderTemplate >
-                                <DataTemplate>
-                                    <TextBlock Text="Module" />
-                                </DataTemplate>
-                            </DataGridTextColumn.HeaderTemplate>
-                            <!--<DataGridTextColumn.CellStyle>
-                                <Style TargetType="DataGridCell">
-                                    <Setter Property="ToolTip" Value="{Binding Module}" />
-                                </Style>
-                            </DataGridTextColumn.CellStyle>-->
-                        </DataGridTextColumn>
+                 
 
                         <DataGridTextColumn  Binding="{Binding Name,Mode=OneWay}"   CanUserSort="True" CanUserReorder="False" IsReadOnly="True" CanUserResize="False" >
                             <DataGridTextColumn.HeaderTemplate >
                                 <DataTemplate>
-                                    <TextBlock Text="Name" />
+                                    <TextBlock Text="Gas1 Setpoint" />
                                 </DataTemplate>
                             </DataGridTextColumn.HeaderTemplate>
-                            <!--<DataGridTextColumn.CellStyle>
-                                <Style TargetType="DataGridCell">
-                                    <Setter Property="ToolTip" Value="{Binding Name}" />
-                                </Style>
-                            </DataGridTextColumn.CellStyle>-->
                         </DataGridTextColumn>
 
                         <DataGridTextColumn  Binding="{Binding Time,Mode=OneWay}" CanUserSort="True" CanUserReorder="False" IsReadOnly="True" CanUserResize="False" >
                             <DataGridTextColumn.HeaderTemplate >
                                 <DataTemplate>
-                                    <TextBlock Text="StartTime" />
+                                    <TextBlock Text="Gas1 Cal" />
                                 </DataTemplate>
                             </DataGridTextColumn.HeaderTemplate>
                             <!--<DataGridTextColumn.CellStyle>

Venus/Venus_MainPages/Views/OverVenusView.xaml

@@ -593,8 +593,8 @@
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
 
-            <ctrls:FlowPipe   Height="8"  Width="70" Canvas.Left="1050"  Canvas.Top="610" IsFlowing="{Binding PVHe3ValveIsOpen}"/>
-            <ctrls:FlowPipe   Height="8"  Width="65" Canvas.Left="1126"  Canvas.Top="615" RotateTransformValue="90" IsFlowing="{Binding PVHe3ValveIsOpen}"/>
+            <ctrls:FlowPipe   Height="8"  Width="90" Canvas.Left="1050"  Canvas.Top="610" IsFlowing="{Binding PVHe3ValveIsOpen}"/>
+            <ctrls:FlowPipe   Height="8"  Width="65" Canvas.Left="1146"  Canvas.Top="615" RotateTransformValue="90" IsFlowing="{Binding PVHe3ValveIsOpen}"/>
             <ctrls:FlowPipe   Height="8"  Width="56" Canvas.Left="1055"  Canvas.Top="610" RotateTransformValue="90" IsReverse="{Binding PVHe1ValveIsOpen}">
                 <ctrls:FlowPipe.IsFlowing>
                     <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
@@ -603,18 +603,18 @@
                     </MultiBinding>
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
-            <ctrls:Pipe2    Canvas.Left="1113"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
+            <ctrls:Pipe2    Canvas.Left="1133"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
             <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="604" Canvas.Left="1066" Status="{Binding PVHe3ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="30" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
             <TextBlock Text="VHe3" Canvas.Top="588" Canvas.Left="1060"/>
 
-            <Viewbox Stretch="Uniform" Width="60" Height="50"  Canvas.Top="578" Canvas.Left="1078">
+            <!--<Viewbox Stretch="Uniform" Width="60" Height="50"  Canvas.Top="578" Canvas.Left="1078">
                 <Canvas  LayoutTransform="Identity" Width="999" Height="997">
                     <Polyline Points="640,272 327,272" Stroke="#FF000000" StrokeThickness="15" />
                     <Polygon Points="358,451 642,970 359,970 640,451 358,451" Fill="#FF00FFFF" Stroke="#FF000000" StrokeThickness="3" />
                     <Polyline Points="499,272 499,451" Stroke="#FF000000" StrokeThickness="15" />
                 </Canvas>
-            </Viewbox>
-
+            </Viewbox>-->
+            <ctrls:ZhenValve Width="34" Height="34" Canvas.Top="585.5" Canvas.Left="1095"/>
             <ctrls:FlowPipe   Height="8"  Width="17"  Canvas.Left="1055"  Canvas.Top="659" RotateTransformValue="90" IsFlowing="{Binding PVHe2ValveIsOpen}"/>
             <ctrls:FlowPipe   Height="8"  Width="66" Canvas.Left="1057"  Canvas.Top="680" IsFlowing="{Binding PVHe2ValveIsOpen}"/>
             <ctrls:FlowPipe   Height="8"  Width="140" Canvas.Left="1120"  Canvas.Top="680" >

Venus/Venus_MainPages/Views/PlatformView.xaml

@@ -219,11 +219,14 @@
                 </ctrls:FlowPipe.IsFlowing>
             </ctrls:FlowPipe>
             
-            <ctrls:FlowPipe   Height="8"  Width="70" Canvas.Left="1050"  Canvas.Top="610"/>
-            <ctrls:FlowPipe   Height="8"  Width="65" Canvas.Left="1126"  Canvas.Top="615" RotateTransformValue="90"/>
+            <ctrls:FlowPipe   Height="8"  Width="90" Canvas.Left="1050"  Canvas.Top="610"/>
+            <ctrls:FlowPipe   Height="8"  Width="65" Canvas.Left="1146"  Canvas.Top="615" RotateTransformValue="90"/>
             <ctrls:FlowPipe   Height="8"  Width="56" Canvas.Left="1055"  Canvas.Top="610" RotateTransformValue="90"/>
-            <ctrls:Pipe2    Canvas.Left="1113"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
+            <ctrls:Pipe2    Canvas.Left="1133"  Canvas.Top="610" HorizontalAlignment="Left" VerticalAlignment="Top"  />
             <customControls:CommonValveControl   ValveOrientation="Horizontal" Height="20" Width="20"  Canvas.Top="604" Canvas.Left="1074" Status="{Binding PVHe3ValveIsOpen,Mode=TwoWay}" IsCanEdit="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}" Tag="20" Command="{Binding ControlValveCommand}" CommandParameter="{Binding RelativeSource={x:Static RelativeSource.Self}}"/>
+            <ctrls:ZhenValve Width="34" Height="34" Canvas.Top="585.6" Canvas.Left="1100"/>
+
+
             <TextBlock Text="VHe3" Canvas.Top="588" Canvas.Left="1068"/>
             
             <ctrls:FlowPipe   Height="8"  Width="17"  Canvas.Left="1055"  Canvas.Top="659" RotateTransformValue="90" IsFlowing="{Binding PVHe2ValveIsOpen}"/>

Venus/Venus_Themes/UserControls/Chamber.xaml

@@ -272,22 +272,13 @@
                         </Style>
                     </Grid.Style>
 
-                    <!--<Border BorderThickness="1" BorderBrush="Black" CornerRadius="4" VerticalAlignment="Top"  Height="6" Margin="0,4,0,0" Width="70" Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}">
-                        <Border.Background>
-                            <RadialGradientBrush >
-                                <GradientStop Color="DimGray" Offset="0" />
-                                <GradientStop Color="Silver" Offset="0.5" />
-                                <GradientStop Color="DimGray" Offset="1" />
-
-                            </RadialGradientBrush>
-                        </Border.Background>
-                    </Border>-->
+                    
                    
                     <Rectangle HorizontalAlignment="Left" Fill="{DynamicResource Lid_BG3}" Stroke="{DynamicResource Lid_BD}" Width="8" Margin="48,10,0,4"/>
                     <Rectangle HorizontalAlignment="Right" Fill="{DynamicResource Lid_BG3}" Stroke="{DynamicResource Lid_BD}" Width="8" Margin="0,10,48,4"/>
                     <Rectangle Stroke="{DynamicResource Lid_BD}" Fill="{DynamicResource Lid_BG3}" StrokeThickness="1" VerticalAlignment="Bottom" Height="8" Margin="5,0" Width="64" />
                     <Rectangle  HorizontalAlignment="Center" Margin="-100,0"  Width="{Binding WaferLength}" Height="10" VerticalAlignment="Top"/>
-                    <Ellipse    Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}"  
+                    <!--<Ellipse    Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}"  
                      Width = "70"     Height = "30"    Stroke="DarkGray"   StrokeThickness="1" Margin="0,0,0,20">
                         <Ellipse.Fill>
                             <RadialGradientBrush>
@@ -295,7 +286,17 @@
                                 <GradientStop Offset = "1" Color = "LightBlue"/>
                             </RadialGradientBrush>
                         </Ellipse.Fill>
-                    </Ellipse>
+                    </Ellipse>-->
+                    <Border BorderThickness="1" BorderBrush="DarkGray" CornerRadius="4" VerticalAlignment="Top"  Height="10" Margin="0,0,0,0" Width="140" Visibility="{Binding ElementName=chamber,Path=IsHasWafer,Converter={StaticResource bool2VisibilityConverter}}">
+                        <Border.Background>
+                            <RadialGradientBrush >
+                                <GradientStop Color="AliceBlue" Offset="0" />
+                                <!--<GradientStop Color="Silver" Offset="0.5" />-->
+                                <GradientStop Color="LightGreen" Offset="1" />
+
+                            </RadialGradientBrush>
+                        </Border.Background>
+                    </Border>
                 </Grid>
 
                 <!--左边slit door-->

Venus/Venus_Themes/UserControls/ZhenValve.xaml

@@ -0,0 +1,95 @@
+<UserControl x:Class="Venus_Themes.UserControls.ZhenValve"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Venus_Themes.UserControls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Viewbox Stretch="Uniform"  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:s="clr-namespace:System;assembly=mscorlib">
+        <Viewbox.Tag>
+            <s:Int64>1895787370</s:Int64>
+        </Viewbox.Tag>
+        <Canvas UseLayoutRounding="False" Name="Group_3_D_Valve_with_long_shaft" Tag="#00000000,#FF008000,Original,0,None" LayoutTransform="Identity" Width="75.76" Height="112.5" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <Canvas Name="Group_Pipe" Tag="#00000000,#FF008000,Original,0,None" Width="7.53" Height="63.664" Canvas.Left="34.685" Canvas.Top="29.395">
+                <Path Data="M42.215,93.059L34.685,93.059 34.685,29.395 42.215,29.395z" Stretch="Fill" Width="7.53" Height="63.664" Canvas.Left="0" Canvas.Top="0">
+                    <Path.Fill>
+                        <LinearGradientBrush StartPoint="0,0.5" EndPoint="1,0.5">
+                            <LinearGradientBrush.GradientStops>
+                                <GradientStop Color="#FF474747" Offset="0" />
+                                <GradientStop Color="#FFEDEDED" Offset="0.45" />
+                                <GradientStop Color="#FFAFAFAF" Offset="0.77" />
+                                <GradientStop Color="#FF474747" Offset="1" />
+                            </LinearGradientBrush.GradientStops>
+                        </LinearGradientBrush>
+                    </Path.Fill>
+                </Path>
+            </Canvas>
+            <Canvas Name="Group_Handle" Tag="#00000000,#FF008000,Original,0,None" Width="61.81" Height="30.848" Canvas.Left="6.736" Canvas.Top="-0.5">
+                <Path Data="F1M6.736,30.348L37.943,30.257 37.852,-0.472999999999999C20.663,-0.472999999999999,6.736,13.44,6.736,30.348" Stretch="Fill" Width="31.207" Height="30.821" Canvas.Left="0" Canvas.Top="0.027">
+                    <Path.Fill>
+                        <RadialGradientBrush Center="1.47,1.425" RadiusX="1.644" RadiusY="1.638" GradientOrigin="1.47,1.425">
+                            <RadialGradientBrush.GradientStops>
+                                <GradientStop Color="#FF5B5B5B" Offset="0" />
+                                <GradientStop Color="sc#1, 0.354912877, 0.354912877, 0.354912877" Offset="0.04" />
+                                <GradientStop Color="sc#1, 0.5707349, 0.5707349, 0.5707349" Offset="0.08" />
+                                <GradientStop Color="sc#1, 0.745240152, 0.745240152, 0.745240152" Offset="0.15" />
+                                <GradientStop Color="sc#1, 0.86409986, 0.86409986, 0.86409986" Offset="0.25" />
+                                <GradientStop Color="sc#1, 0.8879231, 0.8879231, 0.8879231" Offset="0.5" />
+                                <GradientStop Color="#FFF2F2F2" Offset="0.5" />
+                                <GradientStop Color="sc#1, 0.4962698, 0.4962698, 0.4962698" Offset="0.86" />
+                                <GradientStop Color="#FF5B5B5B" Offset="1" />
+                            </RadialGradientBrush.GradientStops>
+                        </RadialGradientBrush>
+                    </Path.Fill>
+                </Path>
+                <Path Data="F1M37.428,-0.5L37.338,30.204 68.546,30.295C68.546,13.811,55.308,0.174000000000007,38.715,-0.5L38.715,-0.5z" Stretch="Fill" Width="31.208" Height="30.795" Canvas.Left="30.602" Canvas.Top="0">
+                    <Path.Fill>
+                        <RadialGradientBrush Center="-0.47,1.425" RadiusX="-1.644" RadiusY="1.639" GradientOrigin="-0.47,1.425">
+                            <RadialGradientBrush.GradientStops>
+                                <GradientStop Color="#FF5B5B5B" Offset="0" />
+                                <GradientStop Color="sc#1, 0.354912877, 0.354912877, 0.354912877" Offset="0.04" />
+                                <GradientStop Color="sc#1, 0.5707349, 0.5707349, 0.5707349" Offset="0.08" />
+                                <GradientStop Color="sc#1, 0.745240152, 0.745240152, 0.745240152" Offset="0.15" />
+                                <GradientStop Color="sc#1, 0.86409986, 0.86409986, 0.86409986" Offset="0.25" />
+                                <GradientStop Color="sc#1, 0.8879231, 0.8879231, 0.8879231" Offset="0.5" />
+                                <GradientStop Color="#FFF2F2F2" Offset="0.5" />
+                                <GradientStop Color="sc#1, 0.4962698, 0.4962698, 0.4962698" Offset="0.86" />
+                                <GradientStop Color="#FF5B5B5B" Offset="1" />
+                            </RadialGradientBrush.GradientStops>
+                        </RadialGradientBrush>
+                    </Path.Fill>
+                </Path>
+            </Canvas>
+            <Canvas Name="Group_Port1" Tag="#00000000,#FF008000,Original,0,None" Width="37.879" Height="37.879" Canvas.Left="37.879" Canvas.Top="74.119">
+                <Path Data="F1M37.879,93.059L75.758,111.998 75.758,74.119" Stretch="Fill" Width="37.879" Height="37.879" Canvas.Left="0" Canvas.Top="0">
+                    <Path.Fill>
+                        <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
+                            <LinearGradientBrush.GradientStops>
+                                <GradientStop Color="#FF474747" Offset="0" />
+                                <GradientStop Color="#FFEDEDED" Offset="0.45" />
+                                <GradientStop Color="#FFAFAFAF" Offset="0.77" />
+                                <GradientStop Color="#FF474747" Offset="1" />
+                            </LinearGradientBrush.GradientStops>
+                        </LinearGradientBrush>
+                    </Path.Fill>
+                </Path>
+            </Canvas>
+            <Canvas Name="Group_Port" Tag="#00000000,#FF008000,Original,0,None" Width="37.879" Height="37.879" Canvas.Left="0" Canvas.Top="74.119">
+                <Path Data="F1M0,111.998L37.879,93.059 0,74.119z" Stretch="Fill" Width="37.879" Height="37.879" Canvas.Left="0" Canvas.Top="0">
+                    <Path.Fill>
+                        <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
+                            <LinearGradientBrush.GradientStops>
+                                <GradientStop Color="#FF474747" Offset="0" />
+                                <GradientStop Color="#FFEDEDED" Offset="0.45" />
+                                <GradientStop Color="#FFAFAFAF" Offset="0.77" />
+                                <GradientStop Color="#FF474747" Offset="1" />
+                            </LinearGradientBrush.GradientStops>
+                        </LinearGradientBrush>
+                    </Path.Fill>
+                </Path>
+            </Canvas>
+        </Canvas>
+    </Viewbox>
+
+</UserControl>

Venus/Venus_Themes/UserControls/ZhenValve.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace Venus_Themes.UserControls
+{
+    /// <summary>
+    /// ZhenValve.xaml 的交互逻辑
+    /// </summary>
+    public partial class ZhenValve : UserControl
+    {
+        public ZhenValve()
+        {
+            InitializeComponent();
+        }
+    }
+}

Venus/Venus_Themes/Venus_Themes.csproj

@@ -183,6 +183,9 @@
     <Compile Include="UserControls\WPFMessageBox.xaml.cs">
       <DependentUpon>WPFMessageBox.xaml</DependentUpon>
     </Compile>
+    <Compile Include="UserControls\ZhenValve.xaml.cs">
+      <DependentUpon>ZhenValve.xaml</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <Page Include="CustomControls\AduRadioButton.xaml">
@@ -365,6 +368,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="UserControls\ZhenValve.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\Arrow.png">