|
@@ -29,8 +29,7 @@ namespace PunkHPX8_Themes.UserControls
|
|
public RecipeControlMetal()
|
|
public RecipeControlMetal()
|
|
{
|
|
{
|
|
InitializeComponent();
|
|
InitializeComponent();
|
|
- CheckBoxA.IsChecked = false;
|
|
|
|
- CheckBoxB.IsChecked = false;
|
|
|
|
|
|
+ DummyLoadCheck.IsChecked = false;
|
|
}
|
|
}
|
|
#region 属性
|
|
#region 属性
|
|
public static readonly DependencyProperty ModuleNameProperty = DependencyProperty.Register(
|
|
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>
|
|
/// <summary>
|
|
- /// SelectedSide
|
|
|
|
|
|
+ /// IsDummyLoadSelected
|
|
/// </summary>
|
|
/// </summary>
|
|
- public string SelectedSide
|
|
|
|
|
|
+ public bool IsDummyLoadSelected
|
|
{
|
|
{
|
|
get
|
|
get
|
|
{
|
|
{
|
|
- return (string)this.GetValue(SelectedSideProperty);
|
|
|
|
|
|
+ return (bool)this.GetValue(IsDummyLoadSelectedProperty);
|
|
}
|
|
}
|
|
set
|
|
set
|
|
{
|
|
{
|
|
- this.SetValue(SelectedSideProperty, value);
|
|
|
|
|
|
+ this.SetValue(IsDummyLoadSelectedProperty, value);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -378,7 +377,7 @@ namespace PunkHPX8_Themes.UserControls
|
|
}
|
|
}
|
|
else
|
|
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);
|
|
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;
|
|
}
|
|
}
|
|
|
|
+
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|