소스 검색

初始化字段值
N2PurgeEditViewModel 图标展示为折线
隐藏ffu配置项

git-svn-id: http://10.4.3.168:50001/svn/Furnace@74 dbcde07d-dcf5-c148-8a84-ac3097b7778e

Jiangjinyuan 1 개월 전
부모
커밋
dc2ebbbbe6

+ 1 - 1
Furnace/FurnaceRT/Config/ELK/System.sccfg

@@ -51,7 +51,7 @@
 			<config default="true" name="IsRunInParallelMode"  description="IsRunInParallelMode" max="0" min="0" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		</configs>
 
-		<configs name="FFU">
+		<configs name="FFU" visible="false">
 			<config default="350" name="LSPEED" description="" max="9999" min="0" paramter="" tag="" unit=""  type="Double"   />
 			<config default="2500" name="HSPEED" description="" max="9999" min="0" paramter="" tag="" unit=""  type="Double"   />
 			<configs name="FFU1">

+ 1 - 1
Furnace/FurnaceRT/Config/System.sccfg

@@ -51,7 +51,7 @@
 			<config default="true" name="IsRunInParallelMode"  description="IsRunInParallelMode" max="0" min="0" paramter="" tag="" unit="" type="Bool" visible="false"/>
 		</configs>
 
-		<configs name="FFU">
+		<configs name="FFU" visible="false">
 			<config default="350" name="LSPEED" description="" max="9999" min="0" paramter="" tag="" unit=""  type="Double"   />
 			<config default="2500" name="HSPEED" description="" max="9999" min="0" paramter="" tag="" unit=""  type="Double"   />
 			<configs name="FFU1">

+ 4 - 4
Furnace/FurnaceRT/Equipments/PMs/PMModule.cs

@@ -196,7 +196,7 @@ namespace FurnaceRT.Equipments.PMs
         private SerializableDictionary<string, bool> _conditionCheckDic = new SerializableDictionary<string, bool>();
         private Dictionary<string, string> _conditionCheckItemDic = new Dictionary<string, string>();
         private Stopwatch _waitTimer = new Stopwatch();
-        public string StringProcessFlowState { get; set; }
+        public string StringProcessFlowState { get; set; } = ProcessFlowState.Standby.ToString();
 
         public bool IsExcuteRoutineFailed { get; set; }
 
@@ -392,7 +392,7 @@ namespace FurnaceRT.Equipments.PMs
                 {
                     foreach (var item in mfcs)
                     {
-                        if (item==null) continue;
+                        if (item == null) continue;
                         if (item.IsMFCInstalled)
                         {
                             aITMfcDataList.Add(item.DeviceData);
@@ -1207,7 +1207,7 @@ namespace FurnaceRT.Equipments.PMs
                 !RecipeParser.Parse(recipeName, ModuleName.PM1.ToString(), out var recipeHead, out var recipeSteps, out reason, "Abort"))
             {
                 recipeName = SC.GetStringValue("System.Recipe.Abort Recipe");
-                if (!File.Exists($"{PathManager.GetRecipeDir()}\\{SC.GetStringValue("System.Recipe.SupportedChamberType")}\\Abort\\{recipeName}.rcp") || 
+                if (!File.Exists($"{PathManager.GetRecipeDir()}\\{SC.GetStringValue("System.Recipe.SupportedChamberType")}\\Abort\\{recipeName}.rcp") ||
                     !RecipeParser.Parse(SC.GetStringValue("System.Recipe.Abort Recipe"), ModuleName.PM1.ToString(), out recipeHead, out recipeSteps, out reason, "Abort"))
                 {
                     PostMsg(MSG.Error);
@@ -1547,7 +1547,7 @@ namespace FurnaceRT.Equipments.PMs
         }
         private double GetWaitTime()
         {
-            if (StringFsmStatus=="Idle")
+            if (StringFsmStatus == "Idle")
             {
                 _waitTimer.Reset();
             }

+ 0 - 2
Furnace/FurnaceUI/Views/Parameter/N2PurgeEditViewModel.cs

@@ -173,7 +173,6 @@ namespace FurnaceUI.Views.Parameter
             {
                 Color = OxyColors.Blue,
                 MarkerType = MarkerType.Circle,
-                InterpolationAlgorithm = InterpolationAlgorithms.CanonicalSpline
             });
             this.O2Model = tmp;
             Task.Run(() =>
@@ -210,7 +209,6 @@ namespace FurnaceUI.Views.Parameter
             {
                 Color = OxyColors.Blue,
                 MarkerType = MarkerType.Circle,
-                InterpolationAlgorithm = InterpolationAlgorithms.CanonicalSpline
             });
             this.N2Model = tmp;
             Task.Run(() =>