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

修改mfc配置界面

This commit is contained in:
SIC1016\caipeilun 2024-07-02 15:31:22 +08:00
parent 74e06c94cb
commit bc9416d7c7
6 changed files with 93 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Modules/Mainframe/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseTag": "----multiplate-develop.598",
"PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"PreReleaseNumber": 598,
"WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"SemVer": "23.9.2-----multiplate-develop.598",
"LegacySemVer": "23.9.2-----multiplate-de598",
"LegacySemVerPadded": "23.9.2-----multiplate-d0598",
"AssemblySemVer": "23.9.2.598",
"AssemblySemFileVer": "23.9.2.598",
"FullSemVer": "23.9.2-----multiplate-develop.598",
"InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
"ShortSha": "74e06c9",
"NuGetVersionV2": "23.9.2-----multiplate-d0598",
"NuGetVersion": "23.9.2-----multiplate-d0598",
"NuGetPreReleaseTagV2": "----multiplate-d0598",
"NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 598,
"CommitsSinceVersionSourcePadded": "0598",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

8
SicRT/Config/System.sccfg
View File

@ -521,6 +521,10 @@
<config default="500*10,2000*10,2500*10,3500*10,5500*10,7500*10,9500*10,11500*10,13000*10,2000*10" name="MFC29DynamicFlow" description="MFC29 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="1000*10,3000*10,5000*10,6000*10,8000*10,10000*10,12000*10,14000*10,16000*10,4000*10" name="MFC31DynamicFlow" description="MFC31 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC40DynamicFlow" description="MFC40 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC27DynamicFlow" description="MFC27 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC35DynamicFlow" description="MFC35 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC41DynamicFlow" description="MFC41 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC42DynamicFlow" description="MFC42 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="false" name="PreTransferPSUEnable" description="传盘是否开启PSU加热" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="true" name="PreTransferSCREnable" description="传盘是否开启SCR加热" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="ReactorSuspectorCheckEnable" description="传盘后是否检查ReactorSuspectorCheck Sensor" max="" min="" paramter="" tag="" unit="" type="Bool" />
@ -1119,6 +1123,10 @@
<config default="500*10,2000*10,2500*10,3500*10,5500*10,7500*10,9500*10,11500*10,13000*10,2000*10" name="MFC29DynamicFlow" description="MFC29 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="1000*10,3000*10,5000*10,6000*10,8000*10,10000*10,12000*10,14000*10,16000*10,4000*10" name="MFC31DynamicFlow" description="MFC31 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC40DynamicFlow" description="MFC40 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC27DynamicFlow" description="MFC27 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC35DynamicFlow" description="MFC35 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC41DynamicFlow" description="MFC41 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="4000*10,7000*10,11000*10,13000*10,16000*10,19000*10,23000*10,28000*10,34000*10,11000*10" name="MFC42DynamicFlow" description="MFC42 动态流量" max="" min="" paramter="" tag="" visible="false" unit="" type="String" />
<config default="false" name="PreTransferPSUEnable" description="传盘是否开启PSU加热" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="true" name="PreTransferSCREnable" description="传盘是否开启SCR加热" max="" min="" paramter="" tag="" unit="" type="Bool" />
<config default="false" name="ReactorSuspectorCheckEnable" description="传盘后是否检查ReactorSuspectorCheck Sensor" max="" min="" paramter="" tag="" unit="" type="Bool" />

42
SicRT/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseTag": "----multiplate-develop.598",
"PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"PreReleaseNumber": 598,
"WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"SemVer": "23.9.2-----multiplate-develop.598",
"LegacySemVer": "23.9.2-----multiplate-de598",
"LegacySemVerPadded": "23.9.2-----multiplate-d0598",
"AssemblySemVer": "23.9.2.598",
"AssemblySemFileVer": "23.9.2.598",
"FullSemVer": "23.9.2-----multiplate-develop.598",
"InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
"ShortSha": "74e06c9",
"NuGetVersionV2": "23.9.2-----multiplate-d0598",
"NuGetVersion": "23.9.2-----multiplate-d0598",
"NuGetPreReleaseTagV2": "----multiplate-d0598",
"NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 598,
"CommitsSinceVersionSourcePadded": "0598",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

42
SicSimulator/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseTag": "----multiplate-develop.598",
"PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"PreReleaseNumber": 598,
"WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"SemVer": "23.9.2-----multiplate-develop.598",
"LegacySemVer": "23.9.2-----multiplate-de598",
"LegacySemVerPadded": "23.9.2-----multiplate-d0598",
"AssemblySemVer": "23.9.2.598",
"AssemblySemFileVer": "23.9.2.598",
"FullSemVer": "23.9.2-----multiplate-develop.598",
"InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
"ShortSha": "74e06c9",
"NuGetVersionV2": "23.9.2-----multiplate-d0598",
"NuGetVersion": "23.9.2-----multiplate-d0598",
"NuGetPreReleaseTagV2": "----multiplate-d0598",
"NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 598,
"CommitsSinceVersionSourcePadded": "0598",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}

2
SicUI/Models/PMs/PMMfcDynamicFlowViewModel.cs
View File

@ -116,7 +116,7 @@ namespace SicUI.Models.PMs
}
private List<string> _MFCGroup = new List<string>() { "MFC28", "MFC29", "MFC31","MFC40" };
private List<string> _MFCGroup = new List<string>() { "MFC27", "MFC28", "MFC29", "MFC31", "MFC35", "MFC40", "MFC41", "MFC42" };
public List<string> MFCGroup
{
get { return _MFCGroup; }

42
SicUI/gitversion.json
View File

@ -2,34 +2,34 @@
"Major": 23,
"Minor": 9,
"Patch": 2,
"PreReleaseTag": "----multiplate-develop.597",
"PreReleaseTagWithDash": "-----multiplate-develop.597",
"PreReleaseTag": "----multiplate-develop.598",
"PreReleaseTagWithDash": "-----multiplate-develop.598",
"PreReleaseLabel": "----multiplate-develop",
"PreReleaseLabelWithDash": "-----multiplate-develop",
"PreReleaseNumber": 597,
"WeightedPreReleaseNumber": 597,
"PreReleaseNumber": 598,
"WeightedPreReleaseNumber": 598,
"BuildMetaData": null,
"BuildMetaDataPadded": "",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"FullBuildMetaData": "Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"MajorMinorPatch": "23.9.2",
"SemVer": "23.9.2-----multiplate-develop.597",
"LegacySemVer": "23.9.2-----multiplate-de597",
"LegacySemVerPadded": "23.9.2-----multiplate-d0597",
"AssemblySemVer": "23.9.2.597",
"AssemblySemFileVer": "23.9.2.597",
"FullSemVer": "23.9.2-----multiplate-develop.597",
"InformationalVersion": "23.9.2-----multiplate-develop.597+Branch.----multiplate-develop.Sha.e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"SemVer": "23.9.2-----multiplate-develop.598",
"LegacySemVer": "23.9.2-----multiplate-de598",
"LegacySemVerPadded": "23.9.2-----multiplate-d0598",
"AssemblySemVer": "23.9.2.598",
"AssemblySemFileVer": "23.9.2.598",
"FullSemVer": "23.9.2-----multiplate-develop.598",
"InformationalVersion": "23.9.2-----multiplate-develop.598+Branch.----multiplate-develop.Sha.74e06c94cbe3bbbd7003683d12dbea9420831cec",
"BranchName": "多片机/multiplate-develop",
"EscapedBranchName": "----multiplate-develop",
"Sha": "e0bf983e50ae4881780e6b895de2c45cb0e9cd68",
"ShortSha": "e0bf983",
"NuGetVersionV2": "23.9.2-----multiplate-d0597",
"NuGetVersion": "23.9.2-----multiplate-d0597",
"NuGetPreReleaseTagV2": "----multiplate-d0597",
"NuGetPreReleaseTag": "----multiplate-d0597",
"Sha": "74e06c94cbe3bbbd7003683d12dbea9420831cec",
"ShortSha": "74e06c9",
"NuGetVersionV2": "23.9.2-----multiplate-d0598",
"NuGetVersion": "23.9.2-----multiplate-d0598",
"NuGetPreReleaseTagV2": "----multiplate-d0598",
"NuGetPreReleaseTag": "----multiplate-d0598",
"VersionSourceSha": "c29389314a6af8abb1346677a53be6fe6b00379e",
"CommitsSinceVersionSource": 597,
"CommitsSinceVersionSourcePadded": "0597",
"UncommittedChanges": 1,
"CommitsSinceVersionSource": 598,
"CommitsSinceVersionSourcePadded": "0598",
"UncommittedChanges": 0,
"CommitDate": "2024-07-02"
}