Browse Source

fix manualSet界面 TempPID/TempCorrect按钮点击无效

jiangjy 2 months ago
parent
commit
bb606cd2e3

+ 3 - 1
Furnace/FurnaceUI/Views/Editors/TempOffsetTableViewModel.cs

@@ -287,7 +287,8 @@ namespace FurnaceUI.Views.Editors
             }
             }
             else
             else
             {
             {
-                var defaultTempPID = SystemConfigProvider.Instance.GetValueByName("PM1.TempPID");
+                //var defaultTempPID = SystemConfigProvider.Instance.GetValueByName("PM1.TempPID");
+                var defaultTempPID = SystemConfigProvider.Instance.GetValueByName("PM1.Heater.PID");
                 if (string.IsNullOrEmpty(defaultTempPID))
                 if (string.IsNullOrEmpty(defaultTempPID))
                 {
                 {
                     DialogBox.ShowDialog(DialogButton.Cancel, DialogType.INFO, "Please set the default file first");
                     DialogBox.ShowDialog(DialogButton.Cancel, DialogType.INFO, "Please set the default file first");
@@ -296,6 +297,7 @@ namespace FurnaceUI.Views.Editors
                 int last = defaultTempPID.LastIndexOf('\\');
                 int last = defaultTempPID.LastIndexOf('\\');
                 var pix = defaultTempPID.Substring(0, last);
                 var pix = defaultTempPID.Substring(0, last);
                 var file = defaultTempPID.Substring(last + 1, defaultTempPID.Length - last - 1);
                 var file = defaultTempPID.Substring(last + 1, defaultTempPID.Length - last - 1);
+                file = file.Split(',').FirstOrDefault();
                 CurrentParameter.PrefixPath = pix;
                 CurrentParameter.PrefixPath = pix;
                 CurrentParameter.Name = file;
                 CurrentParameter.Name = file;
                 CurrentParameter.Permission = "";
                 CurrentParameter.Permission = "";

+ 5 - 4
Furnace/FurnaceUI/Views/Parameter/TempCorrectionEditViewModel.cs

@@ -395,11 +395,12 @@ namespace FurnaceUI.Views.Parameter
             }
             }
             if (string.IsNullOrEmpty(CurrentParameter.Name) && CurrentRecipe == null)
             if (string.IsNullOrEmpty(CurrentParameter.Name) && CurrentRecipe == null)
             {
             {
-               
+
                 var defaultTempCorrectionFile = (string)QueryDataClient.Instance.Service.GetConfig("PM1.TempCorrection");
                 var defaultTempCorrectionFile = (string)QueryDataClient.Instance.Service.GetConfig("PM1.TempCorrection");
                 if (!string.IsNullOrEmpty(defaultTempCorrectionFile))
                 if (!string.IsNullOrEmpty(defaultTempCorrectionFile))
                 {
                 {
-                    CurrentParameter.Name = defaultTempCorrectionFile.Split('\\').LastOrDefault();
+                    var fileName = defaultTempCorrectionFile.Split('\\').LastOrDefault();
+                    CurrentParameter.Name = fileName.Split(',').FirstOrDefault();
                 }
                 }
             }
             }
 
 
@@ -468,7 +469,7 @@ namespace FurnaceUI.Views.Parameter
                 {
                 {
                     var strList = ResultString.Split(',');
                     var strList = ResultString.Split(',');
                     var selecteNo = strList.Skip(1).Take(1).FirstOrDefault();
                     var selecteNo = strList.Skip(1).Take(1).FirstOrDefault();
-                  //  var selectedName = strList.LastOrDefault();
+                    //  var selectedName = strList.LastOrDefault();
                     if (selecteNo != null)
                     if (selecteNo != null)
                     {
                     {
                         SelectedStepNo = int.Parse(selecteNo);
                         SelectedStepNo = int.Parse(selecteNo);
@@ -675,7 +676,7 @@ namespace FurnaceUI.Views.Parameter
             base.InvokeAfterUpdateProperty(data);
             base.InvokeAfterUpdateProperty(data);
             if (CurrentParameter.Steps != null && CurrentParameter.Steps.Count > 0 && CheckValueChange(data))
             if (CurrentParameter.Steps != null && CurrentParameter.Steps.Count > 0 && CheckValueChange(data))
             {
             {
-              
+
             }
             }
             oldresult = data;
             oldresult = data;
         }
         }