优化漏气check界面

Venus/RecipeEditorControl/View/RecipeEditorControl.xaml

@@ -50,7 +50,7 @@
         </Grid.Resources>
         <Grid Grid.Row="0">
             <StackPanel Orientation="Horizontal">
-                <toolkit:SplitButton Width="70" Focusable="False" BorderThickness="0" Command="{Binding OpenLocalRecipeCommand}" Visibility="{Binding SingleAppElementVisibility}">
+                <!--<toolkit:SplitButton Width="70" Focusable="False" BorderThickness="0" Command="{Binding OpenLocalRecipeCommand}" >
                     <toolkit:SplitButton.Content>
                         <WrapPanel>
                             <Image Height="16" Source="/RecipeEditorControl;component/Images/open.png" />
@@ -83,7 +83,7 @@
                             </ListBox.ItemTemplate>
                         </ListBox>
                     </toolkit:DropDownButton.DropDownContent>
-                </toolkit:DropDownButton>
+                </toolkit:DropDownButton>-->
                 <Button Width="60" Focusable="False" BorderThickness="0" Command="{Binding SaveRecipeCommand}"  Visibility="{Binding SingleAppElementVisibility}">
                     <Button.Content>
                         <WrapPanel>
@@ -135,7 +135,7 @@
                     </toolkit:SplitButton.DropDownContent>
                 </toolkit:SplitButton>
                 
-                <Button Width="80" Focusable="False" BorderThickness="0" Command="{Binding ExpandGroupCommand}">
+                <!--<Button Width="80" Focusable="False" BorderThickness="0" Command="{Binding ExpandGroupCommand}">
                     <Button.Content>
                         <WrapPanel>
                             <Image Height="13" Source="/RecipeEditorControl;component/Images/expand.png" />
@@ -166,7 +166,7 @@
                             <TextBlock Text="{DynamicResource GlobalLableButtonExport}" FontFamily="Arial,SimSun" />
                         </WrapPanel>
                     </Button.Content>
-                </Button>
+                </Button>-->
                 <Button Width="100" Focusable="False" BorderThickness="0" Command="{Binding EditRecipeInfoCommand}"
                         ToolTip="{Binding RecipeHead,Converter={StaticResource RecipeHeadStringConverter}}">
                     <Button.Content>
@@ -186,55 +186,15 @@
                         </WrapPanel>
                     </Button.Content>
                 </Button>
-                <Button Width="80" Focusable="False" BorderThickness="0" Command="{Binding RecipeHelpDocCommand}" Visibility="{Binding SingleAppElementVisibility}">
+                <!--<Button Width="80" Focusable="False" BorderThickness="0" Command="{Binding RecipeHelpDocCommand}" Visibility="{Binding SingleAppElementVisibility}">
                     <Button.Content>
                         <WrapPanel>
                             <Image Height="16" Source="/RecipeEditorControl;component/Images/help.png" />
                             <TextBlock Text=" Help" FontFamily="Arial,SimSun" />
                         </WrapPanel>
                     </Button.Content>
-                </Button>
-                <Grid Visibility="{Binding IsBarcodeVisibility}">
-                    <TextBox Foreground="White" FontSize="30" InputMethod.PreferredImeState="Off" 
-InputMethod.IsInputMethodEnabled="False"  Text="{Binding RecipeHead.Barcode}"  PreviewTextInput="UIElement_OnPreviewTextInput"  TabIndex="0" BorderThickness="1" Margin="0" Width="230"  HorizontalAlignment="Center" TextAlignment="Center" VerticalContentAlignment="Center"  >
-                        <TextBox.Background>
-                            <ImageBrush  Stretch="Fill" x:Name="BarcodeBrushName" Opacity="0.1" AlignmentX="Center" AlignmentY="Center">
-                                <ImageBrush.ImageSource>
-                                    <BitmapImage UriSource="/RecipeEditorControl;component/Images/barcode.png"/>
-                                </ImageBrush.ImageSource>
-                            </ImageBrush>
-                        </TextBox.Background>
-
-                        <TextBox.Triggers>
-                            <!-- Animates the color of the brush used to paint 
-             the second button from red to blue . -->
-                            <EventTrigger RoutedEvent="TextBox.GotFocus">
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation  
-                  Storyboard.TargetName="BarcodeBrushName"
-                  Storyboard.TargetProperty="Opacity"
-                                         AutoReverse="True"
-                                        RepeatBehavior="Forever"
-                  From="0" To="0.3" Duration="0:0:0.5" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </EventTrigger>
-                            <EventTrigger RoutedEvent="TextBox.LostFocus">
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <DoubleAnimation  
-                  Storyboard.TargetName="BarcodeBrushName"
-                  Storyboard.TargetProperty="Opacity"
-                                        AutoReverse="False"
-                  From="0.3" To="0.1" Duration="0:0:0.1" />
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </EventTrigger>
-                        </TextBox.Triggers>
- 
-                    </TextBox>
-                </Grid>
+                </Button>-->
+             
             </StackPanel>
             <TextBlock Text="{Binding RecipeInfo}" Margin="0,5,17,5" HorizontalAlignment="Right" VerticalAlignment="Center" TextAlignment="Right" Width="142" Visibility="{Binding RecipeInfoTextVisibility}" />
         </Grid>

Venus/RecipeEditorControl/View/RecipeEditorControl.xaml.cs

@@ -125,7 +125,7 @@ namespace Aitex.UI.RecipeEditor
             try
             {
                 string variation = (string)((Button)sender).Tag;
-                newButton.IsOpen = false;
+                //newButton.IsOpen = false;
                 XmlDocument doc = new XmlDocument();
                 var dir = new System.IO.FileInfo(Process.GetCurrentProcess().MainModule.FileName).Directory;
                 string xmlPath = dir + "\\Config\\" + variation + ".xml";

Venus/Venus_MainPages/ViewModels/GasLeakCheckViewModel.cs

@@ -1,4 +1,5 @@
-using Prism.Mvvm;
+using Prism.Commands;
+using Prism.Mvvm;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -12,6 +13,9 @@ namespace Venus_MainPages.ViewModels
         #region 私有字段
         private List<string> m_LeakCheckMode;
         private int m_LeakCheckModeSelectedIndex;
+        private int m_VentTime;
+        private int m_CheckTime;
+        private bool[] m_GasIsCheck=new bool[8];
         #endregion
 
         #region  属性
@@ -26,15 +30,47 @@ namespace Venus_MainPages.ViewModels
             get { return m_LeakCheckModeSelectedIndex; }
             set { SetProperty(ref m_LeakCheckModeSelectedIndex, value); }
         }
+
+        public int VentTime
+        {
+            get { return m_VentTime; }
+            set { SetProperty(ref m_VentTime, value); }
+        }
+
+        public int CheckTime
+        {
+            get { return m_CheckTime; }
+            set { SetProperty(ref m_CheckTime, value); }
+        }
+
+        public bool[] GasIsCheck
+        {
+            get { return m_GasIsCheck; }
+            set { SetProperty(ref m_GasIsCheck, value); }
+        }
+        #endregion
+
+        #region 命令
+        private DelegateCommand _CheckCommand;
+        public DelegateCommand CheckCommand =>
+            _CheckCommand ?? (_CheckCommand = new DelegateCommand(OnCheck));
         #endregion
 
         #region 构造函数
         public GasLeakCheckViewModel()
         {
-            m_LeakCheckMode = new List<string>() { "ChamberOnly","ChamberAndGasLine", "ChamberAndGasLineAndFAC" };
+            m_LeakCheckMode = new List<string>() { "ChamberOnly", "ChamberAndGasLine", "ChamberAndGasLineAndFAC" };
             m_LeakCheckModeSelectedIndex = 0;
+            m_VentTime = 120;
+            m_CheckTime = 180;
+        }
+        #endregion
 
+        #region 命令方法
+        private void OnCheck()
+        {
+            
+        }
+        #endregion
     }
-    #endregion
-}
 }

Venus/Venus_MainPages/ViewModels/OverViewModel.cs

@@ -1,4 +1,5 @@
-using Aitex.Core.RT.SCCore;
+using Aitex.Core.Common.DeviceData;
+using Aitex.Core.RT.SCCore;
 using Prism.Commands;
 using Prism.Mvvm;
 using System;
@@ -46,6 +47,8 @@ namespace Venus_MainPages.ViewModels
         private bool m_SoftPumpValveIsOpen;
         private bool m_FastPumpValveIsOpen;
 
+        private AITPumpData m_MainPumpData=new AITPumpData ();
+
         #endregion
 
         #region  属性
@@ -204,28 +207,38 @@ namespace Venus_MainPages.ViewModels
             get { return m_FastPumpValveIsOpen; }
             set { SetProperty(ref m_FastPumpValveIsOpen, value); }
         }
+
+        public AITPumpData MainPumpData
+        {
+            get { return m_MainPumpData; }
+            set { SetProperty(ref m_MainPumpData, value); }
+        }
         #endregion
 
         #region 命令
         private DelegateCommand _GasCommand;
         public DelegateCommand GasCommand =>
-            _GasCommand ?? (_GasCommand = new DelegateCommand(OnGasCommand));
+            _GasCommand ?? (_GasCommand = new DelegateCommand(OnGas));
 
         private DelegateCommand _RfCommand;
         public DelegateCommand RfCommand =>
-            _RfCommand ?? (_RfCommand = new DelegateCommand(OnRfCommand));
+            _RfCommand ?? (_RfCommand = new DelegateCommand(OnRf));
 
         private DelegateCommand _PurgeCommand;
         public DelegateCommand PurgeCommand =>
-            _PurgeCommand ?? (_PurgeCommand = new DelegateCommand(OnPurgeCommand));
+            _PurgeCommand ?? (_PurgeCommand = new DelegateCommand(OnPurge));
 
         private DelegateCommand _VentCommand;
         public DelegateCommand VentCommand =>
-            _VentCommand ?? (_VentCommand = new DelegateCommand(OnVentCommand));
+            _VentCommand ?? (_VentCommand = new DelegateCommand(OnVent));
 
         private DelegateCommand _PumpCommand;
         public DelegateCommand PumpCommand =>
-            _PumpCommand ?? (_PumpCommand = new DelegateCommand(OnPumpCommand));
+            _PumpCommand ?? (_PumpCommand = new DelegateCommand(OnPump));
+
+        private DelegateCommand _OpenPumpCommand;
+        public DelegateCommand OpenPumpCommand =>
+            _OpenPumpCommand ?? (_OpenPumpCommand = new DelegateCommand(OnOpenPump));
 
 
         #endregion
@@ -242,11 +255,13 @@ namespace Venus_MainPages.ViewModels
             m_Gas7Name = (string)MECF.Framework.Common.DataCenter.QueryDataClient.Instance.Service.GetConfig("PMA.MfcGas7.GasName");
             m_Gas8Name = (string)MECF.Framework.Common.DataCenter.QueryDataClient.Instance.Service.GetConfig("PMA.MfcGas8.GasName");
 
+            //m_MainPumpData.IsOn = true;
+
         }
         #endregion
 
         #region 命令方法
-        private void OnGasCommand()
+        private void OnGas()
         {
             closeAllValve();
             Task.Run(() =>
@@ -277,12 +292,12 @@ namespace Venus_MainPages.ViewModels
 
         }
 
-        private void OnRfCommand()
+        private void OnRf()
         {
             closeAllValve();
         }
 
-        private void OnPurgeCommand()
+        private void OnPurge()
         {
             closeAllValve();
             Task.Run(() => 
@@ -291,7 +306,7 @@ namespace Venus_MainPages.ViewModels
             });
         }
 
-        private void OnVentCommand()
+        private void OnVent()
         {
             closeAllValve();
 
@@ -306,9 +321,18 @@ namespace Venus_MainPages.ViewModels
 
         }
 
-        private void OnPumpCommand()
-        { 
-        FastPumpValveIsOpen = true;
+        private void OnPump()
+        {
+            if (MainPumpData.IsOn == true)
+            { 
+              FastPumpValveIsOpen = true;
+            }
+        }
+
+        private void OnOpenPump()
+        {
+            MainPumpData.IsError = true;
+            
         }
         #endregion
 

Venus/Venus_MainPages/Views/GasLeakCheckView.xaml

@@ -9,6 +9,7 @@
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:ctrls="clr-namespace:Venus_Themes.UserControls;assembly=Venus_Themes"
              xmlns:unity="clr-namespace:Venus_MainPages.Unity"
+             xmlns:converters="clr-namespace:Venus_Themes.Converters;assembly=Venus_Themes"
              d:DesignHeight="450" d:DesignWidth="2000">
     <UserControl.Resources>
         <LinearGradientBrush x:Key="buttonBrush" StartPoint="0.5,0" EndPoint="0.5,1">
@@ -16,6 +17,7 @@
             <GradientStop Color="Gray" Offset="0.1" />
             <GradientStop Color="White" Offset="1" />
         </LinearGradientBrush>
+        <converters:IntToIsEnableConverter  x:Key="intToIsEnableConverter"/>
     </UserControl.Resources>
     <Grid>
         <Grid.ColumnDefinitions>
@@ -203,7 +205,7 @@
         </Canvas>
 
         <Canvas Grid.Column="2">
-            <Grid Width="350" Height="400" Canvas.Left="80" Canvas.Top="40" Background="#A1C9F5"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="Black" unity:GridOptions.LineThickness="1">
+            <Grid Width="350" Height="400" Canvas.Left="80" Canvas.Top="40" Background="#A1C9F5"  unity:GridOptions.ShowBorder="True" unity:GridOptions.LineBrush="Black"  unity:GridOptions.LineThickness="1">
                 <Grid.RowDefinitions>
                     <RowDefinition/>
                     <RowDefinition/>
@@ -243,21 +245,21 @@
                 <TextBlock Grid.Row="14" Text="检漏时间" FontSize="15"   VerticalAlignment="Center" Padding="10" />
                 <TextBlock Grid.Row="15" Text="当前压力" FontSize="15"   VerticalAlignment="Center" Padding="10" />
 
-                <TextBox Grid.Row="1" Grid.Column="1" BorderThickness="0" VerticalContentAlignment="Center"/>
-                <TextBox Grid.Row="2" Grid.Column="1" BorderThickness="0" VerticalContentAlignment="Center"/>
+                <TextBox Grid.Row="1" Grid.Column="1" BorderThickness="0" VerticalContentAlignment="Center" Text="{Binding VentTime}"/>
+                <TextBox Grid.Row="2" Grid.Column="1" BorderThickness="0" VerticalContentAlignment="Center" Text="{Binding CheckTime}"/>
                 <TextBox Grid.Row="3" Grid.Column="1" BorderThickness="0" VerticalContentAlignment="Center"/>
                 <ComboBox Grid.Row="4" Grid.Column="1"  BorderBrush="Transparent" Margin="-2,-2,-2,-1" ItemsSource="{Binding LeakCheckMode}" SelectedIndex="{Binding LeakCheckModeSelectedIndex}"/>
-                <CheckBox  Grid.Row="5" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="6" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="7" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="8" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="9" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="10" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="11" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                <CheckBox  Grid.Row="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <CheckBox  Grid.Row="5" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[0]}"/>
+                <CheckBox  Grid.Row="6" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[1]}"/>
+                <CheckBox  Grid.Row="7" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[2]}"/>
+                <CheckBox  Grid.Row="8" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[3]}"/>
+                <CheckBox  Grid.Row="9" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}"  IsChecked="{Binding GasIsCheck[4]}"/>
+                <CheckBox  Grid.Row="10" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}" IsChecked="{Binding GasIsCheck[5]}"/>
+                <CheckBox  Grid.Row="11" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}" IsChecked="{Binding GasIsCheck[6]}"/>
+                <CheckBox  Grid.Row="12" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" IsEnabled="{Binding LeakCheckModeSelectedIndex}" IsChecked="{Binding GasIsCheck[7]}"/>
                
             </Grid>
-            <Button  FontSize="15"  Foreground="White"  FontWeight="Bold"   Content="Leak Check"       Width="150" Height="30" Canvas.Left="480" Canvas.Top="40" />
+            <Button  FontSize="15"  Foreground="White"  FontWeight="Bold"   Content="Leak Check"       Width="150" Height="30" Canvas.Left="480" Canvas.Top="40" Command="{Binding CheckCommand}"/>
             <Button  FontSize="15"  Foreground="White"  FontWeight="Bold"   Content="Gas Pump Purge"   Width="150" Height="30" Canvas.Left="480" Canvas.Top="90" />
             <Button  FontSize="15"  Foreground="White"  FontWeight="Bold"    Content="Abort"            Width="150" Height="30" Canvas.Left="480" Canvas.Top="140" />
 

Venus/Venus_MainPages/Views/OverView.xaml

@@ -307,7 +307,7 @@
         </ctrls:FlowPipe>
 
         <!--pump-->
-        <deviceControl:AITPump Canvas.Top="698" DeviceData="{Binding MainPumpData}" EnableControl="True" IsShowSensor="False" Canvas.Left="1054" IsAutoMode="{Binding IsAutoMode}"/>
+        <deviceControl:AITPump Canvas.Top="698" DeviceData="{Binding MainPumpData}" EnableControl="True" IsShowSensor="False" Canvas.Left="1054" />
 
         <!--阀-->
 
@@ -781,7 +781,7 @@
                        
                         </Button>
                         <Button Content="启动泵" Width="85" Height="25" Margin="0,10,0,0" IsEnabled="{Binding Path=IsManualMode}" Grid.Column="0" 
-                            Background="{Binding Path=PumpButtonBackground}">
+                            Background="{Binding Path=PumpButtonBackground}" Command="{Binding OpenPumpCommand}">
                           
                         </Button>
                     </Grid>

Venus/Venus_Themes/Converters/IntToIsEnableConverter.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Data;
+
+namespace Venus_Themes.Converters
+{
+    public class IntToIsEnableConverter : IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+
+            if ((int)value == 0)
+            {
+                return false;
+            }
+            else
+            { 
+                return true;
+            }
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
+        {
+            return null;
+        }
+    }
+}

Venus/Venus_Themes/UserControls/Pump.xaml

@@ -5,170 +5,8 @@
              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" x:Name="pump">
-    <UserControl.Resources>
-        <Style  TargetType="{x:Type Canvas}" x:Key="pumpstyle">
-            <Style.Triggers>
-                <DataTrigger Binding="{Binding ElementName=pump,Path=IsOpen}" Value="True">
-                    <DataTrigger.EnterActions>
-                        <BeginStoryboard Name="FlowStoryboard">
-                            <Storyboard >
-                                <DoubleAnimation Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)" Duration="0:0:1" To="360" RepeatBehavior="Forever" FillBehavior="Stop"/>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </DataTrigger.EnterActions>
-                    <DataTrigger.ExitActions>
-                        <BeginStoryboard>
-                            <Storyboard>
-                                <DoubleAnimation Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)" Duration="0:0:0.5" To="0"/>
-                            </Storyboard>
-                        </BeginStoryboard>
-                        <StopStoryboard BeginStoryboardName="FlowStoryboard" />
-                    </DataTrigger.ExitActions>
-                </DataTrigger>
-                
-            </Style.Triggers>
-        </Style>
-    </UserControl.Resources>
-    <Viewbox Stretch="Uniform"   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-        <Canvas UseLayoutRounding="False" Name="Group_Cool_pump" Tag="#00000000,#FF008000,Original,0,None" LayoutTransform="Identity" Width="125.921" Height="121.105" HorizontalAlignment="Left" VerticalAlignment="Top">
-            <Canvas Name="Group_OutletPort" Tag="#00000000,#FF008000,Original,0,None" Width="72.687" Height="50.409" Canvas.Left="52.851" Canvas.Top="0.351">
-                <Path Data="M112.437,0.350999999999999L125.538,0.350999999999999 125.538,50.76 112.437,50.76z" Stretch="Fill" Stroke="#FFB3B3B3" StrokeThickness="0.5" Width="13.601" Height="50.909" Canvas.Left="59.336" Canvas.Top="-0.25">
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF4C4C4C" Offset="0" />
-                                <GradientStop Color="#FF707070" Offset="0.21" />
-                                <GradientStop Color="#FFA6A6A6" Offset="0.54" />
-                                <GradientStop Color="#FF9F9F9F" Offset="0.64" />
-                                <GradientStop Color="#FF8C8C8C" Offset="0.79" />
-                                <GradientStop Color="#FF6C6C6C" Offset="0.97" />
-                                <GradientStop Color="#FF656565" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-                <Path Data="F1M52.851,5.816L112.522,5.816 112.522,44.817 102.134,44.817" Stretch="Fill" Width="59.671" Height="39.001" Canvas.Left="0" Canvas.Top="5.465">
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF4C4C4C" Offset="0" />
-                                <GradientStop Color="#FFBCBEC0" Offset="0.52" />
-                                <GradientStop Color="#FF656565" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-            </Canvas>
-            <Canvas Name="Group_Legs" Tag="#00000000,#FF008000,Original,0,None" Width="82.414" Height="35.881" Canvas.Left="10.937" Canvas.Top="84.135">
-                <Path Data="F1M10.937,120.016L21.191,84.135 83.099,84.135 93.351,120.016 72.582,120.016 52.078,89.129 31.309,120.016z" Stretch="Fill" Width="82.414" Height="35.881" Canvas.Left="0" Canvas.Top="0">
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.5,1" EndPoint="0.5,0">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF999999" Offset="0" />
-                                <GradientStop Color="#FF656565" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-                <Path Data="M10.937,120.0156L21.191,84.1346 83.099,84.1346 93.351,120.0156 72.582,120.0156 52.078,89.1286 31.309,120.0156 10.937,120.0156z" Stretch="Fill" Stroke="#FF999999" StrokeThickness="0.396" Width="82.81" Height="36.277" Canvas.Left="-0.198" Canvas.Top="-0.198" />
-            </Canvas>
-            <Canvas Name="Group_LegBase" Tag="#00000000,#FF008000,Original,0,None" Width="103.772" Height="5.254" Canvas.Left="0.376" Canvas.Top="115.482">
-                <Path Data="F1M0.376,115.482L37.909,115.482 37.909,120.736 0.376,120.736z" Stretch="Fill" Fill="#FF999999" Width="37.533" Height="5.254" Canvas.Left="0" Canvas.Top="0" />
-                <Path Data="M0.376,115.482L37.909,115.482 37.909,120.736 0.376,120.736z" Stretch="Fill" Stroke="#FFB3B3B3" StrokeThickness="0.5" Width="38.033" Height="5.754" Canvas.Left="-0.25" Canvas.Top="-0.25" />
-                <Path Data="F1M66.219,115.482L104.148,115.482 104.148,120.736 66.219,120.736z" Stretch="Fill" Fill="#FF999999" Width="37.929" Height="5.254" Canvas.Left="65.843" Canvas.Top="0" />
-                <Path Data="M66.219,115.482L104.148,115.482 104.148,120.736 66.219,120.736z" Stretch="Fill" Stroke="#FFB3B3B3" StrokeThickness="0.5" Width="38.429" Height="5.754" Canvas.Left="65.593" Canvas.Top="-0.25" />
-            </Canvas>
-            <Canvas Name="Group_PumpBody" Tag="#00000000,#FF008000,Original,0,None" Width="103.123" Height="103.123" Canvas.Left="0.748" Canvas.Top="5.789">
-                <Path Data="F1M0.749,56.997C0.553,85.473,23.478,108.718,51.956,108.911L51.956,108.911C80.43,109.106,103.675,86.182,103.87,57.707L103.87,57.707C104.065,29.229,81.139,5.985,52.663,5.79000000000001L52.663,5.79000000000001C52.542,5.789,52.424,5.789,52.302,5.789L52.302,5.789C23.995,5.791,0.941,28.643,0.749,56.997" Stretch="Fill" Width="103.123" Height="103.123" Canvas.Left="0" Canvas.Top="0">
-                    <Path.Fill>
-                        <RadialGradientBrush Center="0.5,0.5" RadiusX="0.5" RadiusY="-0.5" GradientOrigin="0.5,0.5">
-                            <RadialGradientBrush.GradientStops>
-                                <GradientStop Color="#FF57585A" Offset="0.18" />
-                                <GradientStop Color="sc#1, 0.3495674, 0.350707352, 0.353034556" Offset="0.61" />
-                                <GradientStop Color="#FFCCCCCC" Offset="0.72" />
-                                <GradientStop Color="#FF656565" Offset="1" />
-                            </RadialGradientBrush.GradientStops>
-                        </RadialGradientBrush>
-                    </Path.Fill>
-                </Path>
-            </Canvas>
-            <Canvas Name="Group_CenterShade" Tag="#00000000,#FF008000,Original,0,None" Width="54.488" Height="54.488" Canvas.Left="24.818" Canvas.Top="30.219">
-                <Path Data="F1M28.726,43.412C20.965,56.302,25.124,73.039,38.014,80.8L38.014,80.8C50.902,88.559,67.638,84.402,75.4,71.519L75.4,71.519C83.158,58.625,79.002,41.887,66.111,34.127L66.111,34.127C61.717,31.48,56.873,30.219,52.091,30.219L52.091,30.219C42.853,30.219,33.841,34.921,28.726,43.412" Stretch="Fill" Width="54.488" Height="54.488" Canvas.Left="0" Canvas.Top="0">
-                    <Path.Fill>
-                        <RadialGradientBrush Center="0.5,0.5" RadiusX="0.5" RadiusY="0.5" GradientOrigin="0.5,0.5">
-                            <RadialGradientBrush.GradientStops>
-                                <GradientStop Color="#FF000000" Offset="0" />
-                                <GradientStop Color="#FF323232" Offset="1" />
-                            </RadialGradientBrush.GradientStops>
-                        </RadialGradientBrush>
-                    </Path.Fill>
-                </Path>
-            </Canvas>
-            <Canvas Style="{StaticResource pumpstyle}" Name="Group_Impeller"  Width="48.782" Height="53.016" Canvas.Left="27.398" Canvas.Top="30.863">
-                <Canvas.RenderTransform>
-                    <RotateTransform  Angle="0" CenterX="24.5" CenterY="26.5"></RotateTransform>
-                </Canvas.RenderTransform>
-                <!--<Canvas.Triggers>
-                    <EventTrigger RoutedEvent="Loaded">
-                        <BeginStoryboard >
-                            <Storyboard >
-                                <DoubleAnimation Storyboard.TargetProperty="(Canvas.RenderTransform).(RotateTransform.Angle)" Duration="0:0:10" To="7200" RepeatBehavior="Forever" FillBehavior="Stop"/>
-                            </Storyboard>
-                        </BeginStoryboard>
-                    </EventTrigger>
-                </Canvas.Triggers>-->
-                <Path Data="F1M52.449,38.019L46.576,76.003 46.562,76.084C45.92,80.222,46.326,83.708,47.464,83.873L47.464,83.873C48.606,84.037,49.989,80.826,50.63,76.687L50.63,76.687 56.441,38.63C57.082,34.493,56.716,31.032,55.575,30.869L55.575,30.869C55.547,30.865,55.518,30.863,55.49,30.863L55.49,30.863C54.369,30.864,53.073,33.984,52.449,38.019" Stretch="Fill" Width="10.498" Height="53.016" Canvas.Left="18.859" Canvas.Top="0">
-
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.304,0.494" EndPoint="0.695,0.506">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF808285" Offset="0.01" />
-                                <GradientStop Color="#FFC0C2C4" Offset="0.51" />
-                                <GradientStop Color="#FF808285" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-                <Path Data="F1M31.342,40.793C30.62,41.688,32.666,44.465,35.9,47.125L35.9,47.125 65.588,71.537 65.65,71.59C68.882,74.25,72.09,75.678,72.813,74.783L72.813,74.783C73.534,73.883,71.476,71.056,68.243,68.397L68.243,68.397 38.459,44.002C35.877,41.878,33.339,40.526,32.055,40.526L32.055,40.526C31.731,40.526,31.487,40.612,31.342,40.793" Stretch="Fill" Width="41.76" Height="34.524" Canvas.Left="3.799" Canvas.Top="9.663">
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.468,0.547" EndPoint="0.531,0.454">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF808285" Offset="0.01" />
-                                <GradientStop Color="#FFC0C2C4" Offset="0.51" />
-                                <GradientStop Color="#FF808285" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-                <Path Data="F1M68.435,47.16L33.527,63.242 33.45,63.276C29.65,65.026,26.965,67.291,27.456,68.332L27.456,68.332C27.95,69.373,31.393,68.752,35.195,67L35.195,67 70.131,50.822C73.933,49.072,76.615,46.855,76.121,45.815L76.121,45.815C75.96,45.473,75.485,45.312,74.785,45.312L74.785,45.312C73.356,45.312,70.989,45.983,68.435,47.16" Stretch="Fill" Width="48.782" Height="23.527" Canvas.Left="0" Canvas.Top="14.449">
-                    <Path.Fill>
-                        <LinearGradientBrush StartPoint="0.482,0.419" EndPoint="0.518,0.579">
-                            <LinearGradientBrush.GradientStops>
-                                <GradientStop Color="#FF808285" Offset="0.01" />
-                                <GradientStop Color="#FFC0C2C4" Offset="0.51" />
-                                <GradientStop Color="#FF808285" Offset="1" />
-                            </LinearGradientBrush.GradientStops>
-                        </LinearGradientBrush>
-                    </Path.Fill>
-                </Path>
-                <Path Data="F1M45.185,56.013C44.465,59.553,46.754,63.005,50.29,63.724L50.29,63.724C53.834,64.439,57.284,62.154,58.001,58.61L58.001,58.61C58.719,55.069,56.433,51.619,52.89,50.901L52.89,50.901C52.453,50.812,52.018,50.77,51.588,50.77L51.588,50.77C48.543,50.77,45.812,52.912,45.185,56.013" Stretch="Fill" Width="13.08" Height="13.085" Canvas.Left="17.655" Canvas.Top="19.907">
-                    <Path.Fill>
-                        <RadialGradientBrush Center="0.5,0.5" RadiusX="0.5" RadiusY="0.5" GradientOrigin="0.5,0.5">
-                            <RadialGradientBrush.GradientStops>
-                                <GradientStop Color="#FFC0C2C4" Offset="0" />
-                                <GradientStop Color="sc#1, 0.500433564, 0.512369633, 0.5247979" Offset="0.61" />
-                                <GradientStop Color="sc#1, 0.4424241, 0.453428835, 0.465631723" Offset="0.77" />
-                                <GradientStop Color="sc#1, 0.36546874, 0.375238061, 0.387141943" Offset="0.88" />
-                                <GradientStop Color="sc#1, 0.273434371, 0.281726152, 0.293272465" Offset="0.96" />
-                                <GradientStop Color="sc#1, 0.215860486, 0.223227978, 0.2345506" Offset="1" />
-                                <GradientStop Color="#FF808285" Offset="1" />
-                            </RadialGradientBrush.GradientStops>
-                        </RadialGradientBrush>
-                    </Path.Fill>
-                </Path>
-            </Canvas>
-        </Canvas>
-    </Viewbox>
-
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
 </UserControl>

Venus/Venus_Themes/UserControls/Pump.xaml.cs

@@ -24,19 +24,5 @@ namespace Venus_Themes.UserControls
         {
             InitializeComponent();
         }
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register(
-          "IsOpen", typeof(bool), typeof(Pump));
-
-        public bool IsOpen
-        {
-            get
-            {
-                return (bool)this.GetValue(IsOpenProperty);
-            }
-            set
-            {
-                this.SetValue(IsOpenProperty, value);
-            }
-        }
     }
 }

Venus/Venus_Themes/Venus_Themes.csproj

@@ -65,6 +65,7 @@
     <Compile Include="Converters\boolToVisibility2.cs" />
     <Compile Include="Converters\FOUPStatusConverter.cs" />
     <Compile Include="Converters\IntPlusConverter.cs" />
+    <Compile Include="Converters\IntToIsEnableConverter.cs" />
     <Compile Include="Converters\ToBoolMultiValueConverter.cs" />
     <Compile Include="Converters\ToBoolMultiValueConverter2.cs" />
     <Compile Include="Converters\ToBoolMultiValueConverter3.cs" />