UI界面修改，将bottomview中button换成自定义togglebutton

Venus/Framework/Common/DataCollection/DataCollectionManager.cs

@@ -136,6 +136,9 @@ namespace Aitex.Core.RT.DataCollection
                 _conn.ChangeDatabase(_callback.GetDBName());
 
                 EV.PostInfoLog("DataCollection", "Connected with database");
+                //Invoke operation
+                //EV.PostMessage("DataCollection", EventEnum.da, "Connected with database");
+
             }
             catch (Exception ex)
             {

Venus/Framework/UICore/Control/SCItemEditor.xaml

@@ -39,7 +39,7 @@
                 <DataGridTemplateColumn Header="Description" Width="200"  >
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <TextBox Text="{Binding Description, Mode=OneWay }" TextWrapping="Wrap"  FontSize="12"/>
+                            <TextBlock Text="{Binding Description, Mode=OneWay }" TextWrapping="Wrap"  FontSize="12"/>
                         </DataTemplate>
                     </DataGridTemplateColumn.CellTemplate>
                 </DataGridTemplateColumn>

Venus/Framework/UICore/View/Common/EventViewModel.cs

@@ -19,6 +19,7 @@ namespace Aitex.Core.UI.View.Common
     /// </summary>
     public class SystemLogItem
     {
+        public int ID { get; set; }
         /// <summary>
         /// 时间
         /// </summary>

Venus/Venus_MainPages/Converters/EventItemToStringConverter.cs

@@ -14,15 +14,21 @@ namespace Venus_MainPages.Converters
         public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
         {
             var item = (EventItem)value;
+            StringBuilder stringBuilder = new StringBuilder();
+
             if (item == null) return null;
-            return item?.OccuringTime.ToString() + "  =>  " + item.Description;
-            //var itemList =  value as ObservableCollection<EventItem>;
-            //ObservableCollection<string> outValue = new ObservableCollection<string>();
-            //itemList.ToList().ForEach(item => 
-            //{
-            // outValue.Add(item?.OccuringTime.ToString() + "  =>  " + item.Description);
-            //});
-            //return outValue;
+            var item1 = item.Id.ToString().PadRight(6);
+            var item2 = item.Level.ToString().PadRight(15);
+            var item3 = item.OccuringTime.ToString();
+            var item4 = item.Description;
+            stringBuilder.Append(item1);
+            stringBuilder.Append(item2);
+            stringBuilder.Append(item3);
+            stringBuilder.Append("  ");
+            stringBuilder.Append(item4);
+
+            return stringBuilder.ToString();   
+
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)

Venus/Venus_MainPages/ViewModels/ButterflyValveViewModel.cs

@@ -28,7 +28,14 @@ namespace Venus_MainPages.ViewModels
         public bool IsPositionMode
         { 
         get { return m_IsPositionMode; }
-        set { SetProperty(ref m_IsPositionMode, value); }
+        set 
+            {
+                if (SetValue > 1000&&value==true)
+                {
+                    SetValue = 1000;
+                }
+                SetProperty(ref m_IsPositionMode, value); 
+            }
         }
 
         public int SetValue
@@ -36,11 +43,11 @@ namespace Venus_MainPages.ViewModels
             get { return m_SetValue; }
             set 
             {
-                if (value > 1000)
+                if (value > 1000 && IsPositionMode==true)
                 { 
                 value = 1000;
                 }
-                if (value < 0)
+                if (value < 0 && IsPositionMode == true)
                 { 
                 value = 0;
                 }

Venus/Venus_MainPages/ViewModels/EventViewModel.cs

@@ -303,13 +303,14 @@ namespace Venus_MainPages.ViewModels
 
                                 SearchedResult.Add(new Aitex.Core.UI.View.Common.SystemLogItem()
                                 {
+                                    ID = ev.Id,
                                     Time = ((DateTime)ev.OccuringTime).ToString("yyyy/MM/dd HH:mm:ss.fff"),
                                     LogType = logTypeStr,
                                     Detail = ev.Description,
                                     TargetChamber = ev.Source,
                                     Initiator = "",
                                     Icon = new BitmapImage(new Uri(string.Format("pack://application:,,,/MECF.Framework.Common;component/Resources/SystemLog/{0}.png", ev.Level.ToString()), UriKind.Absolute))
-                                });
+                                }); ;
                             }
                             RaisePropertyChanged("SearchedResult");
 

Venus/Venus_MainPages/Views/ButterflyValveView.xaml

@@ -31,34 +31,19 @@
         </Grid.ColumnDefinitions>
         <TextBlock Grid.Row="0" Grid.Column="1" Text="Device Name："  VerticalAlignment="Center" Block.TextAlignment="Right" Margin="0,10,0,0"/>
         <TextBlock Grid.Row="1" Grid.Column="1" Text="Work Mode：" VerticalAlignment="Center" Block.TextAlignment="Right" />
-        <!--<TextBlock Grid.Row="2" Grid.Column="1" Text="Max：" VerticalAlignment="Center" Block.TextAlignment="Right" Margin="0,10,0,0"/>-->
         <TextBlock Grid.Row="2" Grid.Column="1" Text="Unit：" VerticalAlignment="Center" Block.TextAlignment="Right" Margin="0,10,0,0"/>
         <TextBlock Grid.Row="3" Grid.Column="1" Text="Feedback：" VerticalAlignment="Center" Block.TextAlignment="Right" Margin="0,10,0,0"/>
         <TextBlock Grid.Row="4" Grid.Column="1" Text="Set Point：" VerticalAlignment="Center" Block.TextAlignment="Right" Margin="0,10,0,0"/>
-
         <Label  Grid.Row="0" Grid.Column="2" Content="{Binding Path=DeviceName}" Width="150" Height="28" HorizontalAlignment="Left"  FontSize="13" FontFamily="Arial,SimSun"  BorderThickness="0,0,0,1" BorderBrush="Black" Padding="10,12,0,0"/>
-        <!--<Label Grid.Row="1" Grid.Column="2" Grid.ColumnSpan="2" HorizontalAlignment="Left" Width="150" BorderThickness="0,0,0,1" BorderBrush="Black" FontSize="10" FontFamily="Arial,SimSun" Height="28" VerticalContentAlignment="Center" >
-            
-
-        </Label>-->
         <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="2">
             <RadioButton x:Name="ckPosition" IsChecked="{Binding IsPositionMode}"   VerticalContentAlignment="Center">Position</RadioButton>
             <RadioButton x:Name="ckPressure" IsChecked="{Binding IsPositionMode,Converter={StaticResource BoolToBool}}"   Margin="10,0,0,0" VerticalContentAlignment="Center">Pressure</RadioButton>
         </StackPanel>
-
-        <!--<TextBlock Grid.Row="2" Grid.Column="2" Text="{Binding Path=MaxValuePosition}" Width="150"  FontSize="13" FontFamily="Arial,SimSun" Height="28" />-->
-        <!--<Label Grid.Row="2" Grid.Column="2" VerticalContentAlignment="Bottom" Content="{Binding Path=MaxValuePressure}" Width="150"  FontSize="13" FontFamily="Arial,SimSun" Height="28" BorderThickness="0,0,0,1" BorderBrush="Black"/>-->
-
-        <!--<TextBlock Grid.Row="3" Grid.Column="2" Text="{Binding Path=UnitPosition}" Width="150"       FontSize="13" FontFamily="Arial,SimSun" Height="28" />-->
         <Label Grid.Row="2" Grid.Column="2" VerticalContentAlignment="Bottom"  Content="{Binding IsPositionMode,Converter={StaticResource BoolToUnitConverter}}" Width="150"       FontSize="13" FontFamily="Arial,SimSun" Height="28" BorderThickness="0,0,0,1" BorderBrush="Black" Padding="10,5,0,0"/>
-
-        <!--<TextBlock Grid.Row="4" Grid.Column="2" Text="{Binding Path=FeedbackPosition}"  FontFamily="Arial,SimSun" Height="28"/>-->
         <Label Grid.Row="3" Grid.Column="2" VerticalContentAlignment="Bottom" Content="{Binding FeedBackValue}"   Width="150"  FontSize="13" FontFamily="Arial,SimSun" Height="28" BorderThickness="0,0,0,1" BorderBrush="Black" Padding="10,5,0,0"/>
-
-        <!--<TextBox Grid.Row="5" Grid.Column="2" x:Name="inputBoxPosition" BorderBrush="Green" BorderThickness="0,0,0,1"  Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Center"/>-->
         <TextBox Grid.Row="4" Grid.Column="2"   Text="{Binding SetValue,UpdateSourceTrigger=PropertyChanged}" Width="150" HorizontalAlignment="Left" FontSize="13" FontFamily="Arial,SimSun" Height="30" VerticalContentAlignment="Bottom"  BorderThickness="0,0,0,1" BorderBrush="Black" Padding="10,0,0,0"/>
 
         <Button Grid.Row="5" Grid.Column="1"  Content="Set" x:Name="buttonSet" Width="80" Height="26" VerticalAlignment="Top"  Margin="5,3,0,0" Command="{Binding SetCommand}"/>
-        <Button Grid.Row="5" Grid.Column="2" Content="Cancel"  Width="80" Height="26" VerticalAlignment="Top" Margin="44,3,0,0" />
+        <Button Grid.Row="5" Grid.Column="2" Content="Cancel"  Width="80" Height="26" VerticalAlignment="Top" Margin="44,3,0,0" Click="Button_Click"/>
     </Grid>
 </Window>

Venus/Venus_MainPages/Views/ButterflyValveView.xaml.cs

@@ -24,5 +24,10 @@ namespace Venus_MainPages.Views
         {
             InitializeComponent();
         }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            this.Close();
+        }
     }
 }

Venus/Venus_MainPages/Views/EventView.xaml

@@ -134,7 +134,14 @@
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
+                        <DataGridTextColumn Width="70" Binding="{Binding ID,Mode=OneWay}"   CanUserSort="True" CanUserReorder="False" IsReadOnly="True" CanUserResize="False">
 
+                            <DataGridTextColumn.HeaderTemplate >
+                                <DataTemplate>
+                                    <TextBlock Text="ID" VerticalAlignment="Center" TextAlignment="Center"/>
+                                </DataTemplate>
+                            </DataGridTextColumn.HeaderTemplate>
+                        </DataGridTextColumn>
                         <DataGridTextColumn Width="70" Binding="{Binding LogType,Mode=OneWay}"   CanUserSort="True" CanUserReorder="False" IsReadOnly="True" CanUserResize="False">
 
                             <DataGridTextColumn.HeaderTemplate >

Venus/Venus_MainPages/Views/OverView.xaml

@@ -437,6 +437,9 @@
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="FastPumpValveIsOpen"/>
+                    <Binding Path="TurboPumpPumpingValveIsOpen"/>
+
+                    
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
@@ -449,6 +452,7 @@
                 <MultiBinding Converter="{StaticResource toBoolMultiValueConverter2}">
                     <Binding Path="SoftPumpValveIsOpen"/>
                     <Binding Path="FastPumpValveIsOpen"/>
+                    <Binding Path="TurboPumpPumpingValveIsOpen"/>
                 </MultiBinding>
             </ctrls:FlowPipe.IsFlowing>
         </ctrls:FlowPipe>
@@ -556,7 +560,6 @@
         <!--chamber管道标签-->
         <ctrls:TextboxWithLabel  Canvas.Top="156" Canvas.Left="1326" LabelValue="CM2(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ProcessHighPressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
         <ctrls:TextboxWithLabel  Canvas.Top="248" Canvas.Left="1318" LabelValue="CM1(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ProcessLowPressure],StringFormat='F1'}" TextBoxColor="#D7E4BD"/>
-        <!--<ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="800" LabelValue="Set(Torr)" TextBoxValue="0.0" TextBoxColor="White" />-->
         <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="870" LabelValue="Flow(sccm)" TextBoxValue="{Binding RtDataValues[PMA.MfcHe.FeedBack],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="633" Canvas.Left="1300" LabelValue="CM3(mTorr)" TextBoxValue="{Binding RtDataValues[PMA.ForelinePressure],StringFormat='F1'}" TextBoxColor="#D7E4BD" />
         <ctrls:TextboxWithLabel  Canvas.Top="464" Canvas.Left="1290" LabelValue="Position(%)" TextBoxValue="{Binding RtDataValues[PMA.GetPVPosition],StringFormat='F0'}" TextBoxColor="#D7E4BD" />

Venus/Venus_MainPages/Views/TopView.xaml

@@ -39,7 +39,7 @@
                 <!--<ColumnDefinition/>-->
             </Grid.ColumnDefinitions>
             <TextBlock Text="PMA" Foreground="White"   HorizontalAlignment="Center" VerticalAlignment="Center"/>
-            <TextBlock Text="{Binding RtDataValues[PMA.FsmState]}" Background="Yellow" Grid.Column="1" Grid.ColumnSpan="3"  Margin="2" Padding="0,5,0,0" Block.TextAlignment="Center" FontSize="20" VerticalAlignment="Stretch" TextBlock.TextAlignment="Center" />
+            <TextBlock Text="{Binding RtDataValues[PMA.FsmState]}" Background="Yellow" Grid.Column="1" Grid.ColumnSpan="3"  Margin="2" Padding="0,7,0,0" Block.TextAlignment="Center" FontSize="20" VerticalAlignment="Stretch" TextBlock.TextAlignment="Center" />
             <TextBlock Text="Log" Grid.Row="1" Foreground="White"  TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             <ComboBox Grid.Column="1"  Grid.Row="1" Grid.ColumnSpan="5" 
                                        ItemsSource="{Binding EventLogList}"   
@@ -48,7 +48,7 @@
                 <ComboBox.ItemTemplate>
                     <DataTemplate>
                         <StackPanel Orientation="Horizontal">
-                            <TextBlock Text="{Binding ElementName=topView,Path=DataContext.CurrentEventItem,Converter={StaticResource EventItemToStringConverter}}" Foreground="{Binding ElementName=topView,Path=DataContext.CurrentEventItem.Level,Converter={StaticResource StringToColorConverter}}"/>
+                            <TextBlock FontSize="20" Text="{Binding ElementName=topView,Path=DataContext.CurrentEventItem,Converter={StaticResource EventItemToStringConverter}}" Foreground="{Binding ElementName=topView,Path=DataContext.CurrentEventItem.Level,Converter={StaticResource StringToColorConverter}}"/>
                         </StackPanel>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
@@ -57,8 +57,9 @@
                         <Setter Property="Template">
                             <Setter.Value>
                                 <ControlTemplate TargetType="ComboBoxItem">
-                                    <TextBlock  Text="{Binding .,Converter={StaticResource EventItemToStringConverter}}" 
+                                    <TextBlock FontSize="20" Text="{Binding .,Converter={StaticResource EventItemToStringConverter}}"  FontFamily="宋体"
                                                    Foreground="{Binding Level,Converter={StaticResource StringToColorConverter}}">
+                                        
                                         <TextBlock.Style>
                                             <Style>
                                                 <Style.Triggers>
@@ -77,7 +78,7 @@
                 </ComboBox.ItemContainerStyle>
             </ComboBox>
             <StackPanel Orientation="Horizontal" Grid.Column="4" Grid.ColumnSpan="2" HorizontalAlignment="Center">
-                <TextBlock Text="版本号："  Foreground="White" FontSize="20" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <TextBlock Text="{DynamicResource Version}"  Foreground="White" FontSize="20" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 <TextBlock Text="{Binding SoftwareVersion}" Foreground="Black"    FontSize="20" TextAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center"/>
             </StackPanel>
            

Venus/Venus_RT/Instances/ToolLoader.cs

@@ -85,6 +85,7 @@ namespace Venus_RT.Instances
             string s1 = System.Diagnostics.FileVersionInfo.GetVersionInfo(Path.Combine(PathManager.GetAppDir(), "Venus_RT.exe")).ProductVersion;
 
             DATA.Subscribe("GetRTPath", () => AppDomain.CurrentDomain.BaseDirectory);
+
         }
         private void InstanceOnOnEvent(EventItem obj)
         {

Venus/Venus_Setup/Venus_RT.iss

@@ -34,7 +34,7 @@ Name: "chinesesimp"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "..\Venus_RT\bin\Release\*";Excludes:"Config,Recipes,Logs"; DestDir: "{app}"; Flags: recursesubdirs createallsubdirs
-Source: "..\Venus_RT\bin\Release\Config\*"; DestDir: "{app}\Config"; Flags: onlyifdoesntexist
+Source: "..\Venus_RT\bin\Release\Config\*"; Excludes:"_sc.data";DestDir: "{app}\Config"; 
 
 
 [Icons]

Venus/Venus_Themes/CustomControls/AduRadioButton.xaml

@@ -12,15 +12,15 @@
         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
         <Setter Property="Background" Value="White" />
         <Setter Property="BorderBrush" Value="Transparent" />
-        <Setter Property="FontSize"  Value="20" />
+        <Setter Property="FontSize"  Value="16" />
         <Setter Property="FontFamily"  Value="Arial" />
         <Setter Property="FontWeight"  Value="DemiBold" />
         <Setter Property="Foreground" Value="White" />
-        <Setter Property="Effect">
+        <!--<Setter Property="Effect">
             <Setter.Value>
                 <DropShadowEffect Color="LightBlue"></DropShadowEffect>
             </Setter.Value>
-        </Setter>
+        </Setter>-->
         <Setter Property="Attach:IconElement.Margin" Value="15,0"/>
         <Setter Property="Attach:IconElement.Width" Value="16"/>
         <Setter Property="Margin" Value="10,0,0,0"/>
@@ -68,6 +68,12 @@
                             <Setter TargetName="Icon" Property="Fill" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
                             <Setter TargetName="templateRoot" Property="BorderBrush" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
                             <Setter TargetName="contentPresenter" Property="Foreground" Value="{Binding SelectColor, RelativeSource={RelativeSource Mode=TemplatedParent}}" />
+                            <Setter Property="customControl:AduRadioButtonIcon.Effect">
+                                <Setter.Value>
+                                    <DropShadowEffect Color="Black"></DropShadowEffect>
+                                </Setter.Value>
+                            </Setter>
+                            <Setter Property="customControl:AduRadioButtonIcon.FontSize" Value="24"/>
                         </Trigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>

Venus/Venus_Themes/CustomControls/AduRadioButtonIcon.cs

@@ -15,7 +15,9 @@ namespace Venus_Themes.CustomControls
             DefaultStyleKeyProperty.OverrideMetadata(typeof(AduRadioButtonIcon), new FrameworkPropertyMetadata(typeof(AduRadioButtonIcon)));
         }
         public static readonly DependencyProperty SelectColorProperty = DependencyProperty.Register("SelectColor"
-            , typeof(Brush), typeof(AduRadioButtonIcon), new FrameworkPropertyMetadata(new SolidColorBrush(Color.FromRgb(0,255,255))));
+            //, typeof(Brush), typeof(AduRadioButtonIcon), new FrameworkPropertyMetadata(new SolidColorBrush(Color.FromRgb(0,255,255))));
+            , typeof(Brush), typeof(AduRadioButtonIcon), new FrameworkPropertyMetadata(new SolidColorBrush(Colors.Lime)));
+
         /// <summary>
         /// 选中时颜色
         /// </summary>

Venus/Venus_Themes/Languages/StringResources.en-US.xaml

@@ -30,4 +30,7 @@ xmlns:system="clr-namespace:System;assembly=mscorlib">
     <system:String x:Key="GlobalLableMenuImportRecipe">Import Recipe</system:String>
     <system:String x:Key="GlobalLableMenuNewFolder">New Folder</system:String>
     <system:String x:Key="GlobalLableMsgInputRecipeName" >Input Recipe Name</system:String>
+
+    <!--TopView-->
+    <system:String x:Key="Version">Version:</system:String>
 </ResourceDictionary>

Venus/Venus_Themes/Languages/StringResources.zh-CN.xaml

@@ -31,5 +31,7 @@
     <system:String x:Key="GlobalLableMenuImportRecipe">导入配方</system:String>
     <system:String x:Key="GlobalLableMenuNewFolder">新建文件夹</system:String>
     <system:String x:Key="GlobalLableMsgInputRecipeName" >输入配方名称</system:String>
-
+    
+    <!--TopView-->
+    <system:String x:Key="Version">版本号:</system:String>
 </ResourceDictionary>

Venus/Venus_UI/Views/ShellView.xaml.cs

@@ -50,23 +50,17 @@ namespace Venus_UI.Views
 
             for (int i = 0; i < VenusMenu.Count; i++)
             {
-                Button button = new Button();
-                button.Tag=i;
-                button.Width = 150;
-                button.Margin=new Thickness(20,10,0,10);
-                button.Content = VenusMenu[i].Id;
-                button.Click += Button_Click;
-                buttonList.Add(button);
+
+                AduRadioButtonIcon aduRadioButtonIcon = new AduRadioButtonIcon();
                 if (i == 0)
                 {
-                    button.Background= new SolidColorBrush(Colors.Green);
-                }
-                else
-                {
-                    button.Background = new SolidColorBrush(Colors.Silver);
+                    aduRadioButtonIcon.IsChecked = true;
                 }
-                
-                Bottom_Frame.Children.Add(button);
+                IconElement.SetPathData(aduRadioButtonIcon,(Geometry)aduRadioButtonIcon.FindResource($"Icon_{VenusMenu[i].Id}"));
+                aduRadioButtonIcon.Content = VenusMenu[i].Id;
+                aduRadioButtonIcon.Click += AduRadioButtonIcon_Click;
+                aduRadioButtonIcon.Tag = i;
+                Bottom_Frame.Children.Add(aduRadioButtonIcon);
                 TabControl tabControl = new TabControl();
                 for (int j = 0; j < VenusMenu[i].MenuItem.Count; j++)
                 {
@@ -83,16 +77,10 @@ namespace Venus_UI.Views
             Main_Frame.Content = centerTabViews[0];
         }
 
-        private void Button_Click(object sender, RoutedEventArgs e)
+        private void AduRadioButtonIcon_Click(object sender, RoutedEventArgs e)
         {
-            var currentButton = sender as Button;
+            var currentButton = sender as AduRadioButtonIcon;
             Main_Frame.Content = centerTabViews[Convert.ToInt32(currentButton.Tag)];
-
-            buttonList.ForEach(x => 
-            {
-                x.Background = new SolidColorBrush(Colors.Silver);
-            });
-            currentButton.Background = new SolidColorBrush(Colors.Green);
         }
 
     }