Преглед на файлове

add platingcell run recipe module

chenzk преди 6 часа
родител
ревизия
c8569fc20e

+ 2 - 2
PunkHPX8_MainPages/Views/PlatingCellHomePageView.xaml

@@ -68,7 +68,7 @@
                                      />
             </Grid>
             <Grid Grid.Row="1" Grid.Column="2" Grid.RowSpan="2">
-                <UserControls:RecipeControl HorizontalAlignment="Center" Margin="10,0,0,0" VerticalAlignment="Center" Name="rcpControl"
+                <UserControls:RecipeControlMetal HorizontalAlignment="Center" Margin="10,0,0,0" VerticalAlignment="Center" Name="rcpControl"
                      ModuleName="{Binding Module}" IsEnabled="{Binding IsEnabled}"
                      ModuleTitle="{Binding RecipeModuleName}"
                      RecipeType="{Binding RecipeType}"
@@ -225,7 +225,7 @@
 
                 </Grid>
             </GroupBox>
-            <UserControls:PlatingCellUIControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Grid.RowSpan="3" HorizontalAlignment="Center" Margin="-320,5,0,0"
+            <UserControls:PlatingCellUIControl Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Grid.RowSpan="3" HorizontalAlignment="Center" Margin="-320,15,0,0"
                                                 ModuleName="{Binding Module}"
                                                 ReservoirName="{Binding ReservoirName}"
                                                 IsLeftEnable="{Binding IsLeftEnabled}"

+ 4 - 0
PunkHPX8_Themes/UserControls/PlatingCellUIControl.xaml

@@ -35,6 +35,10 @@
         <Canvas.RenderTransform>
             <ScaleTransform ScaleX="1.2" ScaleY="1.2" />
         </Canvas.RenderTransform>
+
+        <Rectangle Visibility="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource boolToVisibility}}" Width="270" Height="228" Fill="LightGray" Canvas.Top="176" Canvas.Left="64" Stroke="LightGray" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="3" Opacity="0.5"/>
+        <Rectangle Visibility="{Binding ElementName=self,Path=IsLeftEnable,Converter={StaticResource boolToVisibility2}}" Width="270" Height="228" Fill="LightGray" Canvas.Top="176" Canvas.Left="414" Stroke="LightGray" StrokeThickness="1" HorizontalAlignment="Center" VerticalAlignment="Top" Panel.ZIndex="3" Opacity="0.5"/>
+
         <Canvas Width="125" Height="75" Canvas.Left="199" Canvas.Top="234" HorizontalAlignment="Left" VerticalAlignment="Center">
             <Canvas.RenderTransform>
                 <ScaleTransform ScaleX="0.6667" ScaleY="0.6667" />

+ 1 - 2
PunkHPX8_Themes/UserControls/RecipeControlMetal.xaml

@@ -53,8 +53,7 @@
                                  />
             <Grid Grid.Row="8" Grid.Column="1" Grid.RowSpan="2" Grid.ColumnSpan="2">
                 <StackPanel VerticalAlignment="Center" HorizontalAlignment="Center" Orientation="Horizontal">
-                    <CheckBox Margin="0,0,0,0" x:Name="CheckBoxA" Checked="Side_Checked" Unchecked="Side_Checked" Content="A" VerticalAlignment="Center"/>
-                    <CheckBox Margin="20,0,0,0" x:Name="CheckBoxB" Checked="Side_Checked" Unchecked="Side_Checked" Content="B" VerticalAlignment="Center"/>
+                    <CheckBox Margin="0,0,0,0" x:Name="DummyLoadCheck" Checked="DummyLoad_Checked" Unchecked="DummyLoad_Checked" Content="Dummy Load" VerticalAlignment="Center"/>
                 </StackPanel>
             </Grid>
         </Grid>

+ 14 - 17
PunkHPX8_Themes/UserControls/RecipeControlMetal.xaml.cs

@@ -29,8 +29,7 @@ namespace PunkHPX8_Themes.UserControls
         public RecipeControlMetal()
         {
             InitializeComponent();
-            CheckBoxA.IsChecked = false;
-            CheckBoxB.IsChecked = false;
+            DummyLoadCheck.IsChecked = false;
         }
         #region 属性
         public static readonly DependencyProperty ModuleNameProperty = DependencyProperty.Register(
@@ -250,20 +249,20 @@ namespace PunkHPX8_Themes.UserControls
             }
         }
        
-        public static readonly DependencyProperty SelectedSideProperty = DependencyProperty.Register(
-    "SelectedSide", typeof(string), typeof(RecipeControlMetal), new FrameworkPropertyMetadata("", FrameworkPropertyMetadataOptions.AffectsRender));
+        public static readonly DependencyProperty IsDummyLoadSelectedProperty = DependencyProperty.Register(
+    "IsDummyLoadSelected", typeof(bool), typeof(RecipeControlMetal), new FrameworkPropertyMetadata(false, FrameworkPropertyMetadataOptions.AffectsRender));
         /// <summary>
-        /// SelectedSide
+        /// IsDummyLoadSelected
         /// </summary>
-        public string SelectedSide
+        public bool IsDummyLoadSelected
         {
             get
             {
-                return (string)this.GetValue(SelectedSideProperty);
+                return (bool)this.GetValue(IsDummyLoadSelectedProperty);
             }
             set
             {
-                this.SetValue(SelectedSideProperty, value);
+                this.SetValue(IsDummyLoadSelectedProperty, value);
             }
         }
 
@@ -378,7 +377,7 @@ namespace PunkHPX8_Themes.UserControls
                     }
                     else
                     {                        
-                        InvokeClient.Instance.Service.DoOperation($"{ModuleName}.CycleManualProcessRecipe", SelectedRecipeNode.RecipeFullFileName, SelectedSide, InputCycleTimes);
+                        InvokeClient.Instance.Service.DoOperation($"{ModuleName}.CycleManualProcessRecipe", SelectedRecipeNode.RecipeFullFileName, IsDummyLoadSelected, InputCycleTimes);
                     }
                 }
             }
@@ -388,20 +387,18 @@ namespace PunkHPX8_Themes.UserControls
             }
         }
 
-        private void Side_Checked(object sender, RoutedEventArgs e)
+        private void DummyLoad_Checked(object sender, RoutedEventArgs e)
         {
             CheckBox checkBox = (sender as CheckBox);
-            if ((bool)CheckBoxA.IsChecked && (bool)!CheckBoxB.IsChecked)
+            if ((bool)DummyLoadCheck.IsChecked)
             {
-                SelectedSide = "SideA";
+                IsDummyLoadSelected = true;
             }
-            else if ((bool)!CheckBoxA.IsChecked && (bool)CheckBoxB.IsChecked)
-            {
-                SelectedSide = "SideB";
-            }else
+            else
             {
-                SelectedSide = "";
+                IsDummyLoadSelected = false;
             }
+         
         }
     }
 }