diff --git a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
index b18310d..27e9a63 100644
--- a/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
+++ b/App/Modules/SicModules/Config/PM/PM1/DeviceModelPM1.xml
@@ -83,4 +83,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/App/SicRT/Config/System.sccfg b/App/SicRT/Config/System.sccfg
index e6e19af..4bcc893 100644
--- a/App/SicRT/Config/System.sccfg
+++ b/App/SicRT/Config/System.sccfg
@@ -826,12 +826,6 @@
-
-
-
-
-
-
@@ -844,13 +838,6 @@
-
-
-
-
-
-
-
@@ -983,12 +970,6 @@
-
-
-
-
-
-
@@ -1037,36 +1018,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/App/SicSimulator/Config/DevicePM.xml b/App/SicSimulator/Config/DevicePM.xml
index 13efcc5..7f2b938 100644
--- a/App/SicSimulator/Config/DevicePM.xml
+++ b/App/SicSimulator/Config/DevicePM.xml
@@ -155,6 +155,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/App/SicUI/Models/PMs/PMOperationView.xaml b/App/SicUI/Models/PMs/PMOperationView.xaml
index 05918bb..e3eeeb7 100644
--- a/App/SicUI/Models/PMs/PMOperationView.xaml
+++ b/App/SicUI/Models/PMs/PMOperationView.xaml
@@ -4790,7 +4790,7 @@
diff --git a/App/SicUI/Models/PMs/PMOperationViewModel.cs b/App/SicUI/Models/PMs/PMOperationViewModel.cs
index 88c1da6..0ded127 100644
--- a/App/SicUI/Models/PMs/PMOperationViewModel.cs
+++ b/App/SicUI/Models/PMs/PMOperationViewModel.cs
@@ -94,33 +94,18 @@ namespace SicUI.Models.PMs
//PT4Data.OpenDegree >
- public double BCountMFC => (V25.IsOpen || V72.IsOpen) ? Mfc3Data.FeedBack + Mfc4Data.FeedBack - Mfc6Data.FeedBack : 0;//PT1Data.OpenDegree > 0 ? Mfc3Data.FeedBack + Mfc4Data.FeedBack - Mfc6Data.FeedBack : 0;
-
- //public double PC7Count => PT7Data.OpenDegree > 0 ? (V63.IsOpen ? Mfc15Data.FeedBack + (V59.IsOpen ? Mfc16Data.FeedBack : 0) - Mfc25Data.FeedBack - Mfc26Data.FeedBack : 0) : 0;
-
- //public double PC6Count => PT6Data.OpenDegree > 0 ? (V62.IsOpen ? Mfc9Data.FeedBack + (V54.IsOpen ? Mfc13Data.FeedBack : 0) + (V55.IsOpen ? Mfc14Data.FeedBack : 0)
- // + (V53.IsOpen ? (PT3Data.OpenDegree > 0 ? Mfc11Data.FeedBack + Mfc10Data.FeedBack + Mfc12Data.FeedBack : 0) : 0) - Mfc22Data.FeedBack - Mfc23Data.FeedBack : 0) : 0;
-
- //public double PC5Count => PT5Data.OpenDegree > 0 ? (V61.IsOpen ? Mfc2Data.FeedBack + (V39.IsOpen ? Mfc6Data.FeedBack : 0) + (V40.IsOpen ? Mfc5Data.FeedBack : 0) + (V41.IsOpen ? (PT2Data.OpenDegree > 0 ? Mfc7Data.FeedBack + Mfc8Data.FeedBack : 0) : 0) - Mfc19Data.FeedBack - Mfc20Data.FeedBack : 0) : 0;
-
[Subscription("Mfc1.DeviceData")]
public AITMfcData Mfc1Data { get; set; }
- [Subscription("Mfc2.DeviceData")]
- public AITMfcData Mfc2Data { get; set; }
-
[Subscription("Mfc3.DeviceData")]
public AITMfcData Mfc3Data { get; set; }
[Subscription("Mfc4.DeviceData")]
public AITMfcData Mfc4Data { get; set; }
- [Subscription("Mfc5.DeviceData")]
- public AITMfcData Mfc5Data { get; set; }
-
[Subscription("Mfc6.DeviceData")]
public AITMfcData Mfc6Data { get; set; }
@@ -175,7 +160,8 @@ namespace SicUI.Models.PMs
[Subscription("Mfc23.DeviceData")]
public AITMfcData Mfc23Data { get; set; }
-
+ [Subscription("Mfc24.DeviceData")]
+ public AITMfcData Mfc24Data { get; set; }
[Subscription("Mfc25.DeviceData")]
public AITMfcData Mfc25Data { get; set; }
@@ -192,26 +178,15 @@ namespace SicUI.Models.PMs
[Subscription("Mfc29.DeviceData")]
public AITMfcData Mfc29Data { get; set; }
- [Subscription("Mfc30.DeviceData")]
- public AITMfcData Mfc30Data { get; set; }
-
-
- [Subscription("Mfc40.DeviceData")]
- public AITMfcData Mfc40Data { get; set; }
-
[Subscription("Mfc31.DeviceData")]
public AITMfcData Mfc31Data { get; set; }
-
-
[Subscription("Mfc32.DeviceData")]
public AITMfcData Mfc32Data { get; set; }
[Subscription("Mfc33.DeviceData")]
public AITMfcData Mfc33Data { get; set; }
-
-
[Subscription("Mfc35.DeviceData")]
public AITMfcData Mfc35Data { get; set; }
@@ -224,20 +199,9 @@ namespace SicUI.Models.PMs
[Subscription("Mfc38.DeviceData")]
public AITMfcData Mfc38Data { get; set; }
- [Subscription("Mfc41.DeviceData")]
- public AITMfcData Mfc41Data { get; set; }
+ [Subscription("Mfc40.DeviceData")]
+ public AITMfcData Mfc40Data { get; set; }
- [Subscription("Mfc42.DeviceData")]
- public AITMfcData Mfc42Data { get; set; }
-
- [Subscription("Mfc43.DeviceData")]
- public AITMfcData Mfc43Data { get; set; }
-
- [Subscription("Mfc44.DeviceData")]
- public AITMfcData Mfc44Data { get; set; }
-
- [Subscription("Mfc45.DeviceData")]
- public AITMfcData Mfc45Data { get; set; }
#endregion
@@ -710,8 +674,7 @@ namespace SicUI.Models.PMs
+ (V89.IsOpen ? Mfc20Data.FeedBack : 0)
+ (V88.IsOpen ? Mfc28Data.FeedBack : 0)
+ (V88.IsOpen ? Mfc15Data.FeedBack : 0)
- + (V88.IsOpen ? Mfc9Data.FeedBack : 0)
- + (V88.IsOpen ? Mfc2Data.FeedBack : 0);
+ + (V88.IsOpen ? Mfc9Data.FeedBack : 0);
public double InputGasFlowCount2 => V92.IsOpen ? Mfc32Data.FeedBack : 0;
diff --git a/Framework/MECF.Framework.UI.Client/Ctrlib/UnitControls/MfcSettingDialogViewModel.cs b/Framework/MECF.Framework.UI.Client/Ctrlib/UnitControls/MfcSettingDialogViewModel.cs
index 0631433..33bec26 100644
--- a/Framework/MECF.Framework.UI.Client/Ctrlib/UnitControls/MfcSettingDialogViewModel.cs
+++ b/Framework/MECF.Framework.UI.Client/Ctrlib/UnitControls/MfcSettingDialogViewModel.cs
@@ -73,9 +73,9 @@ namespace MECF.Framework.UI.Client.Ctrlib.UnitControls
{
InvokeClient.Instance.Service.DoOperation($"{DeviceData.UniqueName}.{AITMfcOperation.Ramp}", InputSetPoint, 0);
- //this.DialogResult = string.Empty;
- //IsCancel = false;
- //TryClose(true);
+ this.DialogResult = string.Empty;
+ IsCancel = false;
+ TryClose(true);
}
}
}