Sic-Software
/
Sic06
Archived
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

移除UICore中的RecipeEditor窗口控件。

This commit is contained in:
DESKTOP-GPE37UV\THINKAPD 2023-03-30 15:40:59 +08:00
parent 94a3f565cf
commit dda2e55b9c
15 changed files with 63 additions and 3862 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
FrameworkLocal/UIClient/CenterViews/Configs/Roles/RoleManager.cs
View File

@ -5,6 +5,7 @@ using System.Linq;
using Aitex.Core.RT.Log;
using MECF.Framework.Common.Account.Extends;
using MECF.Framework.Common.DataCenter;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.ClientBase;

16
FrameworkLocal/UIClient/CenterViews/Core/ChamberTypeItem.cs Normal file
View File

@ -0,0 +1,16 @@
using MECF.Framework.Common.CommonData;
using System.Collections.ObjectModel;
namespace MECF.Framework.UI.Client.CenterViews.Core
{
public class ChamberTypeItem : NotifiableItem
{
public string ChamberType { get; set; }
public ObservableCollection<ProcessTypeFileItem> FileListByChamberType { get; set; }
public ChamberTypeItem()
{
FileListByChamberType = new ObservableCollection<ProcessTypeFileItem>();
}
}
}

30
FrameworkLocal/UIClient/CenterViews/Core/ProcessTypeFileItem.cs Normal file
View File

@ -0,0 +1,30 @@
using MECF.Framework.Common.CommonData;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using System.Collections.ObjectModel;
namespace MECF.Framework.UI.Client.CenterViews.Core
{
public class ProcessTypeFileItem : NotifiableItem
{
public string ProcessType { get; set; }
public ObservableCollection<FileNode> FileListByProcessType { get; set; }
private ObservableCollection<FileNode> filterFileListByProcessType;
public ObservableCollection<FileNode> FilterFileListByProcessType
{
get => filterFileListByProcessType;
set
{
filterFileListByProcessType = value;
InvokePropertyChanged(nameof(FilterFileListByProcessType));
}
}
public ProcessTypeFileItem()
{
FileListByProcessType = new ObservableCollection<FileNode>();
FilterFileListByProcessType = new ObservableCollection<FileNode>();
}
}
}

1200
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorView.xaml
View File

File diff suppressed because it is too large Load Diff

53
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorView.xaml.cs
View File

@ -1,53 +0,0 @@
using OpenSEMI.Controls.Controls;
using System.Windows.Controls;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
namespace MECF.Framework.UI.Client.CenterViews.Editors.Recipe
{
/// <summary>
/// Interaction logic for RecipePM1View.xaml
/// </summary>
public partial class RecipeEditorView : UserControl
{
public RecipeEditorView()
{
InitializeComponent();
}
EditorDataGridTemplateColumnBase _PreColumn = null;
private void dgCustom_CurrentCellChanged(object sender, System.EventArgs e)
{
var datagrid = sender as XDataGrid;
if (datagrid == null) return;
var column = datagrid.CurrentColumn as EditorDataGridTemplateColumnBase;
if (column == null) return;
if (_PreColumn == datagrid.CurrentColumn) return;
if (_PreColumn != null)
{
_PreColumn.IsColumnSelected = false;
foreach (var item in datagrid.Items)
{
var list = item as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
if (list == null) continue;
foreach (var p in list)
{
if (p.Name == _PreColumn.ControlName) p.IsColumnSelected = false;
}
}
}
column.IsColumnSelected = true;
_PreColumn = column;
//var jj = datagrid.Items as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
foreach (var item in datagrid.Items)
{
var list = item as System.Collections.ObjectModel.ObservableCollection<RecipeEditorLib.RecipeModel.Params.Param>;
if (list == null) continue;
foreach (var p in list)
{
if (p.Name == column.ControlName) p.IsColumnSelected = true;
}
}
}
}
}

2554
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeEditorViewModel.cs
View File

File diff suppressed because it is too large Load Diff

1
FrameworkLocal/UIClient/CenterViews/Editors/Recipe/RecipeSelectDialogViewModel.cs
View File

@ -1,4 +1,5 @@
using System.Collections.ObjectModel;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using OpenSEMI.ClientBase;

1
FrameworkLocal/UIClient/CenterViews/Editors/RecipeConfig/RecipeConfigViewModel.cs
View File

@ -11,6 +11,7 @@ using Caliburn.Micro;
using Caliburn.Micro.Core;
using MECF.Framework.Common.CommonData;
using MECF.Framework.Common.DataCenter;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;

1
FrameworkLocal/UIClient/CenterViews/Editors/SlotEditorDialogBox.xaml.cs
View File

@ -17,6 +17,7 @@ using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using System.Collections.ObjectModel;
using Caliburn.Micro;
using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
namespace MECF.Framework.UI.Client.CenterViews.Editors

10
FrameworkLocal/UIClient/UIClient.csproj
View File

@ -214,7 +214,9 @@
</Compile>
<Compile Include="CenterViews\Configs\DataConfig\DataConfigViewModel.cs" />
<Compile Include="CenterViews\Core\BusyIndicateableUiViewModelBase.cs" />
<Compile Include="CenterViews\Core\ChamberTypeItem.cs" />
<Compile Include="CenterViews\Core\Charting\ChartingLineSeriesCollection.cs" />
<Compile Include="CenterViews\Core\ProcessTypeFileItem.cs" />
<Compile Include="CenterViews\Core\UserControls\DataViewChart.xaml.cs">
<DependentUpon>DataViewChart.xaml</DependentUpon>
</Compile>
@ -743,10 +745,6 @@
<Compile Include="RecipeEditorLib\RecipeModel\Params\StringParam.cs" />
<Compile Include="CenterViews\Editors\Recipe\RecipeFormatBuilder.cs" />
<Compile Include="RecipeEditorLib\RecipeModel\RecipeData.cs" />
<Compile Include="CenterViews\Editors\Recipe\RecipeEditorView.xaml.cs">
<DependentUpon>RecipeEditorView.xaml</DependentUpon>
</Compile>
<Compile Include="CenterViews\Editors\Recipe\RecipeEditorViewModel.cs" />
<Compile Include="CenterViews\Editors\Recipe\RecipeProvider.cs" />
<Compile Include="RecipeEditorLib\RecipeModel\RecipeGlobalDefs.cs" />
<Compile Include="RecipeEditorLib\RecipeModel\RecipeStep.cs" />
@ -1019,10 +1017,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="CenterViews\Editors\Recipe\RecipeEditorView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Ctrlib\UnitControls\AITMicrowaveSettingDialogView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>

1
SicUI/Models/PMs/PMOperationViewModel.cs
View File

@ -20,6 +20,7 @@ using SicUI.Controls;
using SicUI.Client;
using System.Windows.Media;
using Aitex.Core.RT.IOCore;
using MECF.Framework.UI.Client.CenterViews.Core;
namespace SicUI.Models.PMs
{

9
SicUI/Models/PMs/PMProcessViewModel.cs
View File

@ -17,6 +17,7 @@ using Caliburn.Micro.Core;
using System.Windows.Media;
using SicUI.Client;
using System.Windows.Threading;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel.Params;
@ -293,7 +294,9 @@ namespace SicUI.Models.PMs
base.OnActivate();
}
catch (Exception ex)
{ }
{
// ignored
}
}
protected override void OnDeactivate(bool close)
{
@ -373,7 +376,7 @@ namespace SicUI.Models.PMs
}
catch (Exception ex)
{
// ignored
}
}
@ -393,7 +396,7 @@ namespace SicUI.Models.PMs
}
catch (Exception ex)
{
// ignored
}
}

2
SicUI/Models/RecipeEditors/EditorPassChangeView.xaml.cs
View File

@ -132,8 +132,6 @@ namespace SicUI
{
return false;
}
//
return true;
}
}
}

36
SicUI/Models/RecipeEditors/RecipeEditorViewModel.cs
View File

@ -26,6 +26,7 @@ using System.Windows.Threading;
using Aitex.Core.Util;
using MECF.Framework.Common.OperationCenter;
using MECF.Framework.UI.Client.CenterViews.Configs.Roles;
using MECF.Framework.UI.Client.CenterViews.Core;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension;
using MECF.Framework.UI.Client.RecipeEditorLib.DGExtension.CustomColumn;
using MECF.Framework.UI.Client.RecipeEditorLib.RecipeModel;
@ -38,41 +39,6 @@ using Sicentury.Core.Collections;
namespace SicUI.Models.RecipeEditors
{
public class ProcessTypeFileItem : NotifiableItem
{
public string ProcessType { get; set; }
public ObservableCollection<FileNode> FileListByProcessType { get; set; }
private ObservableCollection<FileNode> filterFileListByProcessType;
public ObservableCollection<FileNode> FilterFileListByProcessType
{
get => filterFileListByProcessType;
set
{
filterFileListByProcessType = value;
InvokePropertyChanged(nameof(FilterFileListByProcessType));
}
}
public ProcessTypeFileItem()
{
FileListByProcessType = new ObservableCollection<FileNode>();
FilterFileListByProcessType = new ObservableCollection<FileNode>();
}
}
public class ChamberTypeItem : NotifiableItem
{
public string ChamberType { get; set; }
public ObservableCollection<ProcessTypeFileItem> FileListByChamberType { get; set; }
public ChamberTypeItem()
{
FileListByChamberType = new ObservableCollection<ProcessTypeFileItem>();
}
}
public class RecipeEditorViewModel : UiViewModelBase, IHandle<UserMode> //BaseModel
{

10
SicUI/Models/RecipeEditors/RoutineConfigViewModel.cs
View File

@ -5,12 +5,8 @@ using MECF.Framework.UI.Client.CenterViews.Editors.Recipe;
using MECF.Framework.UI.Client.CenterViews.Editors.Sequence;
using MECF.Framework.UI.Client.ClientBase;
using System;
using System.CodeDom;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using MECF.Framework.UI.Client.CenterViews.Core;
namespace SicUI.Models.RecipeEditors
{
@ -64,12 +60,12 @@ namespace SicUI.Models.RecipeEditors
//这里只需要Routine,不需要Recipe
var processType = "Routine";
var ProcessTypeFileList = new ObservableCollection<MECF.Framework.UI.Client.CenterViews.Editors.Recipe.ProcessTypeFileItem>();
var ProcessTypeFileList = new ObservableCollection<ProcessTypeFileItem>();
string[] recipeProcessType = ((string)processType).Split(',');
for (int i = 0; i < recipeProcessType.Length; i++)
{
var type = new MECF.Framework.UI.Client.CenterViews.Editors.Recipe.ProcessTypeFileItem();
var type = new ProcessTypeFileItem();
type.ProcessType = recipeProcessType[i];
var prefix = $"Sic\\{recipeProcessType[i]}";
var recipes = recipeProvider.GetXmlRecipeList(prefix);