Browse Source

Merge branch 'master' of http://git.jetplasma-oa.com/JetPlasma/Venus

chenkui 1 year ago
parent
commit
8696faac36

+ 15 - 0
Venus/Venus_MainPages/Unity/WaferAssociationInfo.cs

@@ -76,5 +76,20 @@ namespace Venus_MainPages.Unity
         {
             get { return string.IsNullOrEmpty(_JobStatus); }
         }
+
+        private string _PreCleanRecipeName="";
+        public string PreCleanRecipeName
+        {
+            get { return _PreCleanRecipeName; }
+            set { _PreCleanRecipeName = value; RaisePropertyChanged("PreCleanRecipeName"); }
+        }
+
+        private string _PostCleanRecipeName="";
+        public string PostCleanRecipeName
+        {
+            get { return _PostCleanRecipeName; }
+            set { _PostCleanRecipeName = value; RaisePropertyChanged("PostCleanRecipeName"); }
+        }
+
     }
 }

+ 1 - 14
Venus/Venus_MainPages/ViewModels/GasLeakCheckViewModel.cs

@@ -512,17 +512,6 @@ namespace Venus_MainPages.ViewModels
         {
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.{RtOperation.Abort}");
         }
-        //private void OnExport()
-        //{
-        //    OpenFileDialog dialog = new OpenFileDialog();
-        //    dialog.Filter = ".json|*.json";
-        //    dialog.InitialDirectory = Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "LeakCheck");
-        //    if (dialog.ShowDialog() == true)
-        //    {
-        //        string SelectedPath = dialog.FileName;
-        //        LeakCheckResultList.Add (SerializeHelper.Instance.ReadFromJsonFile<PMLeakCheckResult>(SelectedPath));
-        //    }
-        //}
         
         private void OnControlValve(object obj)
         {
@@ -678,9 +667,7 @@ namespace Venus_MainPages.ViewModels
             m_RtDataKeys.Add($"{ModuleName}.FsmState");
             m_RtDataKeys.Add($"{ModuleName}.GasLeakCheck.Step");
             m_RtDataKeys.Add($"{ModuleName}.LeakCheck.Step");
-
-
-
+            m_RtDataKeys.Add($"{ModuleName}.IsOnline");
         }
         #endregion
     }

+ 0 - 2
Venus/Venus_MainPages/ViewModels/MFCVerificationViewModel.cs

@@ -259,8 +259,6 @@ namespace Venus_MainPages.ViewModels
 
         private void Timer_Tick(object sender, EventArgs e)
         {
-            //MFCCalibrationData =(ObservableCollection<MFCCalibrationData>) QueryDataClient.Instance.Service.GetData($"{ModuleName}.MFCCalibrationDatas");
-
             PMCurrentState = (PMState)QueryDataClient.Instance.Service.GetData($"{ModuleName}.FsmState");
         }
 

+ 2 - 0
Venus/Venus_MainPages/ViewModels/OperationOverViewModel.cs

@@ -650,6 +650,8 @@ namespace Venus_MainPages.ViewModels
                 {"Module", info.ModuleData.ModuleID},
                 {"SlotSequence", slotSequence.ToArray()},
                 {"AutoStart", true},
+                { "PreCleanRecipeName",info.PreCleanRecipeName},
+                { "PostCleanRecipeName",info.PostCleanRecipeName}
             };
             InvokeClient.Instance.Service.DoOperation("System.CreateJob", param);
         }

+ 11 - 3
Venus/Venus_MainPages/ViewModels/PartialPressureViewModel.cs

@@ -24,7 +24,7 @@ namespace Venus_MainPages.ViewModels
         #region 私有字段
        
         private Dictionary<int, object> m_GasFlows = new Dictionary<int, object>();
-        private object[] m_GasPressures = new object[10];
+        //private object[] m_GasPressures = new object[10];
 
         public string ModuleName;
         private int m_GasIndex;
@@ -39,6 +39,8 @@ namespace Venus_MainPages.ViewModels
         ObservableCollection<string> m_ReferenceFlow = new ObservableCollection<string>();
         private bool m_MFC7IsEnable;
         private bool m_MFC8IsEnable;
+        private bool m_IsAutoMode;
+
         #endregion
 
         #region 属性
@@ -82,6 +84,11 @@ namespace Venus_MainPages.ViewModels
             get { return m_MFC8IsEnable; }
             set { SetProperty(ref m_MFC8IsEnable, value); }
         }
+        public bool IsAutoMode
+        {
+            get { return m_IsAutoMode; }
+            set { SetProperty(ref m_IsAutoMode, value); }
+        }
         #endregion
 
         #region 命令
@@ -135,7 +142,7 @@ namespace Venus_MainPages.ViewModels
         }
         private  void OnStart()
         {
-            timer.Start();
+            //timer.Start();
             InvokeClient.Instance.Service.DoOperation($"{ModuleName}.PartialPressureTest", m_GasIndex,1000* GasTime);         
         }
 
@@ -193,8 +200,9 @@ namespace Venus_MainPages.ViewModels
 
             if (CurrentLineSeries.Count == 10)
             {
-                timer.Stop();
+                //timer.Stop();
             }
+            IsAutoMode = (bool)QueryDataClient.Instance.Service.GetData($"{ModuleName}.IsOnline");
         }
         public void Init()
         {                

+ 8 - 1
Venus/Venus_MainPages/ViewModels/VATPerformanceViewModel.cs

@@ -27,6 +27,8 @@ namespace Venus_MainPages.ViewModels
         VATPerformanceResult m_VATPerformanceResult;
         private bool m_MFC7IsEnable;
         private bool m_MFC8IsEnable;
+        private bool m_IsAutoMode;
+
         #endregion
 
         #region 属性
@@ -66,6 +68,11 @@ namespace Venus_MainPages.ViewModels
             get { return m_MFC8IsEnable; }
             set { SetProperty(ref m_MFC8IsEnable, value); }
         }
+        public bool IsAutoMode
+        {
+            get { return m_IsAutoMode; }
+            set { SetProperty(ref m_IsAutoMode, value); }
+        }
         #endregion
 
         #region 命令
@@ -186,7 +193,7 @@ namespace Venus_MainPages.ViewModels
             }
             MFC7IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas7.Enable");
             MFC8IsEnable = (bool)QueryDataClient.Instance.Service.GetConfig($"{ModuleName}.MfcGas8.Enable");
-
+            IsAutoMode = (bool)QueryDataClient.Instance.Service.GetData($"{ModuleName}.IsOnline");
         }
         #endregion
     }

+ 3 - 3
Venus/Venus_MainPages/Views/GasLeakCheckView.xaml

@@ -570,9 +570,9 @@
                 <TextBlock Grid.Row="17" Grid.Column="1"/>
                 
             </Grid>
-            <customControls:PathButton    Foreground="White"      Content="Leak Check"   Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="20"   Command="{Binding CheckCommand}"/>
-            <customControls:PathButton    Foreground="White"      Content="Gas Purge"    Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="70"   Command="{Binding GasPurgeCommand}"/>
-            <customControls:PathButton    Foreground="White"      Content="Abort"        Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="120"  Command="{Binding AbortCommand}"/>
+            <customControls:PathButton    Foreground="White"      Content="Leak Check"   Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="20"   Command="{Binding CheckCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton    Foreground="White"      Content="Gas Purge"    Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="70"   Command="{Binding GasPurgeCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton    Foreground="White"      Content="Abort"        Width="130"  Height="30" Canvas.Left="400"   Canvas.Top="120"  Command="{Binding AbortCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
             <!--<TextBlock Canvas.Left="80" Canvas.Top="460" Text="Leak Check Result" FontSize="15" FontWeight="Bold"/>-->
 

+ 1 - 1
Venus/Venus_MainPages/Views/OperationOverView.xaml

@@ -322,7 +322,7 @@
 
 
 
-            <Canvas Canvas.Left="280" Canvas.Top="-50">
+            <Canvas Canvas.Left="280" Canvas.Top="-90">
                 <RadioButton Content="Carrier" Name="CarrierRadioButton"   Canvas.Left="900"   Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="True"   />
                 <RadioButton Content="LP1"     Name="JobRadioButton1"      Canvas.Left="961"   Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="False"  />
                 <RadioButton Content="LP2"     Name="JobRadioButton2"      Canvas.Left="1022"  Canvas.Top="106" Width="60" Height="33" Style="{StaticResource Button_RadioButton}"   IsChecked="False"  />

+ 4 - 4
Venus/Venus_MainPages/Views/PartialPressureView.xaml

@@ -109,8 +109,8 @@
             </RadioButton>
 
 
-            <customControls:PathButton Content="Start" Canvas.Left="10" Canvas.Top="700"  Width="80" Height="25" Command="{Binding StartCommand}"/>
-            <customControls:PathButton Content="Abort" Canvas.Left="100" Canvas.Top="700" Width="80" Height="25" Command="{Binding AbortCommand}"/>
+            <customControls:PathButton Content="Start" Canvas.Left="10" Canvas.Top="700"  Width="90" Height="25" Command="{Binding StartCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton Content="Abort" Canvas.Left="110" Canvas.Top="700" Width="90" Height="25" Command="{Binding AbortCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
         </Canvas>
         <Canvas Grid.Column="1">
@@ -190,8 +190,8 @@
                 <TextBlock Text="{Binding ReferenceLineSeries[8]}"  Grid.Row="10" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 <TextBlock Text="{Binding ReferenceLineSeries[9]}" Grid.Row="11" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             </Grid>
-            <customControls:PathButton Content="Save"              Canvas.Left="10" Canvas.Top="700"  Width="150"  Height="26" Command="{Binding SaveCommand}"/>
-            <customControls:PathButton Content="Load Reference"    Canvas.Left="260" Canvas.Top="700" Width="150" Height="26" Command="{Binding LoadReferenceCommand}"/>
+            <customControls:PathButton Content="Save"   Canvas.Left="10"  Canvas.Top="700"  Width="100"  Height="26" Command="{Binding SaveCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton Content="Load Ref"   Canvas.Left="310" Canvas.Top="700"  Width="100"  Height="26" Command="{Binding LoadReferenceCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
         </Canvas>
         <Grid Grid.Column="2">

+ 6 - 5
Venus/Venus_MainPages/Views/VATPerformanceView.xaml

@@ -8,6 +8,7 @@
              xmlns:unity="clr-namespace:Venus_MainPages.Unity"
              xmlns:prism="http://prismlibrary.com/"
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
+             xmlns:customControls="clr-namespace:Venus_Themes.CustomControls;assembly=Venus_Themes"
              prism:ViewModelLocator.AutoWireViewModel="True"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -19,7 +20,7 @@
         </Grid.ColumnDefinitions>
         <Canvas>
             <TextBlock Text="Gas Select:" FontSize="15"  Canvas.Left="40" Canvas.Top="192"/>
-            <ComboBox Width="100" Canvas.Left="120" Canvas.Top="190" SelectedIndex="{Binding GasSelectedIndex}" >
+            <ComboBox Width="100" Canvas.Left="118" Canvas.Top="190" SelectedIndex="{Binding GasSelectedIndex}" Height="24">
                 <i:Interaction.Triggers>
                     <i:EventTrigger EventName="SelectionChanged">
                         <i:InvokeCommandAction Command="{Binding SelectGasCommand}"
@@ -44,8 +45,8 @@
             <TextBox    FontSize="15"  Canvas.Left="80"  Canvas.Top="280" Width="60" Text="{Binding GasTime,UpdateSourceTrigger=PropertyChanged}" BorderThickness="0,0,0,1" Background="Transparent" BorderBrush="Black" HorizontalContentAlignment="Center"/>
             <TextBlock  FontSize="15"  Canvas.Left="150" Canvas.Top="280" Text="(s)"/>
 
-            <Button Content="Start" Canvas.Left="30" Canvas.Top="320" Width="80"  Height="26"  Command="{Binding StartCommand}"/>
-            <Button Content="Abort" Canvas.Left="130" Canvas.Top="320" Width="80"  Height="26" Command="{Binding AbortCommand}"/>
+            <customControls:PathButton Content="Start" Canvas.Left="30" Canvas.Top="320" Width="80"  Height="26"  Command="{Binding StartCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton Content="Abort" Canvas.Left="130" Canvas.Top="320" Width="80"  Height="26" Command="{Binding AbortCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
 
         </Canvas>
@@ -180,8 +181,8 @@
                 <TextBlock Text="{Binding ReferenceLineSeries[19]}"  Grid.Row="21" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 <!--<TextBlock Text="{Binding ReferenceLineSeries[20]}"  Grid.Row="22" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Center"/>-->
             </Grid>
-            <Button Content="Save"              Canvas.Left="10"  Canvas.Top="740" Width="120"  Height="26" Command="{Binding SaveCommand}"/>
-            <Button Content="Load Reference"    Canvas.Left="290" Canvas.Top="740" Width="120" Height="26" Command="{Binding LoadReferenceCommand}"/>
+            <customControls:PathButton Content="Save"              Canvas.Left="10"  Canvas.Top="740" Width="120"  Height="26" Command="{Binding SaveCommand}"  IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
+            <customControls:PathButton Content="Load Ref"          Canvas.Left="290" Canvas.Top="740" Width="120" Height="26" Command="{Binding LoadReferenceCommand}" IsEnabled="{Binding IsAutoMode,Converter={StaticResource BoolToBool}}"/>
 
         </Canvas>
         <lvc:CartesianChart  LegendLocation="Right" Hoverable="False" Grid.Column="2" Height="700" DataTooltip="{x:Null}">

+ 15 - 5
Venus/Venus_MainPages/Views/WaferAssociationUnit.xaml

@@ -25,6 +25,8 @@
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
+                    <RowDefinition Height="30"></RowDefinition>
                     <RowDefinition Height="Auto"></RowDefinition>
                     <RowDefinition Height="Auto"></RowDefinition>
                 </Grid.RowDefinitions>
@@ -35,18 +37,26 @@
                 </StackPanel>
                 <StackPanel Grid.Row="1" Orientation="Horizontal">
                     
-                    <TextBlock Text="Sequence:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="75"></TextBlock>
+                    <TextBlock Text="Sequence:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
 
                     <ComboBox Width="240" x:Name="cb"  DropDownOpened="cb_DropDownOpened"  SelectionChanged="cb_SelectionChanged"/>
 
 
                 </StackPanel>
+                <StackPanel Grid.Row="2" Orientation="Horizontal">
+                    <TextBlock Text="Pre Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
+                    <ComboBox Width="240" x:Name="preComboBox"  DropDownOpened="preComboBox_DropDownOpened"  SelectionChanged="preComboBox_SelectionChanged"/>
+                </StackPanel>
+                <StackPanel Grid.Row="3" Orientation="Horizontal">
+                    <TextBlock Text="Post Clean:"  TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center" Width="80"></TextBlock>
+                    <ComboBox Width="240" x:Name="postComboBox" DropDownOpened="postComboBox_DropDownOpened"  SelectionChanged="postComboBox_SelectionChanged"/>
+                </StackPanel>
 
-                <StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
+                <StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="Select All"    Height="25"    Command="{Binding SelectAllCommand}"   CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125"/>
                     <Button Content="DeSelect All"  Height="25"    Command="{Binding UnSelectAllCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}" Width="125" />
                 </StackPanel>
-                <Grid Grid.Row="3">
+                <Grid Grid.Row="5">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="1*"/>
                         <ColumnDefinition Width="2*"/>
@@ -62,7 +72,7 @@
                     <TextBlock Text="Status" Grid.Column="2" TextWrapping="Wrap" Foreground="{DynamicResource FG_Black}" FontSize="15" FontFamily="Arial" VerticalAlignment="Center"></TextBlock>
                    
                 </Grid>
-                <StackPanel Grid.Row="4" Orientation="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Center">
+                <StackPanel Grid.Row="6" Orientation="Horizontal"  HorizontalAlignment="Center" VerticalAlignment="Center">
                     <Button Content="Create Job" Width="120" Height="25" Command="{Binding CreateJobCommand}" CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}">
                         <!--<i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">
@@ -82,7 +92,7 @@
                                 </i:Interaction.Triggers>-->
                     </Button>
                 </StackPanel>
-                <StackPanel Grid.Row="5" Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center">
+                <StackPanel Grid.Row="7" Orientation="Horizontal"  VerticalAlignment="Center" HorizontalAlignment="Center">
                     <Button Content="Start" Width="100" Height="25" Command="{Binding StartCommand}"  CommandParameter="{Binding ElementName=WaferUnit,Path=WAInfo}">
                         <!--<i:Interaction.Triggers>
                                     <i:EventTrigger EventName="Click">

+ 59 - 2
Venus/Venus_MainPages/Views/WaferAssociationUnit.xaml.cs

@@ -34,10 +34,9 @@ namespace Venus_MainPages.Views
             set { SetValue(WAInfoProperty, value); }
         }
         public static readonly DependencyProperty WAInfoProperty = DependencyProperty.Register("WAInfo", typeof(WaferAssociationInfo), typeof(WaferAssociationUnit));
+     
 
 
-       
-
         private void cb_DropDownOpened(object sender, EventArgs e)
         {
             cb.ItemsSource= GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "Sequence")).ToList();
@@ -52,5 +51,63 @@ namespace Venus_MainPages.Views
         {
             WAInfo.SequenceName = cb.SelectedValue.ToString();
         }
+
+        private void preComboBox_DropDownOpened(object sender, EventArgs e)
+        {
+            List<string> cleanRecipes=new List<string>();
+            string installModules = (string)QueryDataClient.Instance.Service.GetConfig("System.InstalledModules");
+            if (installModules.Contains("PMA"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMA","Clean")).ToList());
+            }
+            if (installModules.Contains("PMB"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMB", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMC"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMC", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMD"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMD", "Clean")).ToList());
+            }
+            cleanRecipes.Add("");
+            preComboBox.ItemsSource = cleanRecipes.Distinct();
+        }
+
+        private void preComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            WAInfo.PreCleanRecipeName= preComboBox.SelectedValue.ToString();
+        }
+        private void postComboBox_DropDownOpened(object sender, EventArgs e)
+        {
+            List<string> cleanRecipes = new List<string>();
+            string installModules = (string)QueryDataClient.Instance.Service.GetConfig("System.InstalledModules");
+            if (installModules.Contains("PMA"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMA", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMB"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMB", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMC"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMC", "Clean")).ToList());
+            }
+            if (installModules.Contains("PMD"))
+            {
+                cleanRecipes.AddRange(CommonFunction.GetFilesNames(System.IO.Path.Combine(QueryDataClient.Instance.Service.GetData("GetRTPath").ToString(), "Recipes", "PMD", "Clean")).ToList());
+            }
+            cleanRecipes.Add("");
+            postComboBox.ItemsSource = cleanRecipes.Distinct();
+        }
+
+        private void postComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            WAInfo.PostCleanRecipeName = postComboBox.SelectedValue.ToString();
+
+        }
     }
 }

+ 1 - 2
Venus/Venus_RT/Config/System.sccfg

@@ -22,7 +22,7 @@
 		<config default="10"  name="CheckResourceInterval" nameView="CheckResourceInterval" description="进程资源监视间隔,单位为分钟,0为不监视" max="60" min="0" paramter="" tag="" unit="min" type="Integer"/>
 		<config default="1"  name="SystemType" nameView="SystemType" description="0 = Venus;1 = Kepler 2300;2 = Kepler 2200A;3 = Kepler 2200B;4 = Venus SE;5 = Venus DE;" max="9" min="0" paramter="" tag="" unit="min" type="Integer"/>
 		<config default="1000"  name="DataCollectionInterval" nameView="DataCollectionInterval" description="插入数据时间间隔" max="2000" min="200" paramter="" tag="" unit="ms" type="Integer"/>
-
+		<config default="0" name="PressureUnitType"  nameView="Pressure Unit Type" description="0=>mtorr,1=>Pa" max="1" min="0" paramter="" tag=""  unit="" type="Integer"/>
 		<configs name="SetUp" nameView="Set Up" visible="false">
 			<config default="true" name="EPDInstalled" nameView="Is EPD installed" description="EPD是否安装" max="" min="" paramter="" tag="" unit="" type="Bool" />
 		</configs>
@@ -39,7 +39,6 @@
 
 		<configs name="WaferThickness" nameView="WaferThickness" visible="false">
 			<config default="true" name="EnableThickness" nameView="Is active thickness functions" description="是否有厚片薄片功能" max="" min="" paramter="" tag="" unit="" type="Bool" />
-
 			<config default="Thin" name="LP1WaferThicknessType" nameView="LP1 wafer thickness type" description="Thin;Thick" max="" min="" paramter="" tag="" unit="0" type="String" />
 			<config default="Thick" name="LP2WaferThicknessType" nameView="LP2 wafer thickness type" description="Thin;Thick" max="" min="" paramter="" tag="" unit="0" type="String" />
 		</configs>